lkml.org 
[lkml]   [2020]   [Dec]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 46/75] genirq/irqdomain: Add an irq_create_mapping_affinity() function
    Date
    From: Laurent Vivier <lvivier@redhat.com>

    commit bb4c6910c8b41623104c2e64a30615682689a54d upstream.

    There is currently no way to convey the affinity of an interrupt
    via irq_create_mapping(), which creates issues for devices that
    expect that affinity to be managed by the kernel.

    In order to sort this out, rename irq_create_mapping() to
    irq_create_mapping_affinity() with an additional affinity parameter that
    can be passed down to irq_domain_alloc_descs().

    irq_create_mapping() is re-implemented as a wrapper around
    irq_create_mapping_affinity().

    No functional change.

    Fixes: e75eafb9b039 ("genirq/msi: Switch to new irq spreading infrastructure")
    Signed-off-by: Laurent Vivier <lvivier@redhat.com>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Reviewed-by: Greg Kurz <groug@kaod.org>
    Cc: Michael Ellerman <mpe@ellerman.id.au>
    Cc: stable@vger.kernel.org
    Link: https://lore.kernel.org/r/20201126082852.1178497-2-lvivier@redhat.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    include/linux/irqdomain.h | 12 ++++++++++--
    kernel/irq/irqdomain.c | 13 ++++++++-----
    2 files changed, 18 insertions(+), 7 deletions(-)

    --- a/include/linux/irqdomain.h
    +++ b/include/linux/irqdomain.h
    @@ -383,11 +383,19 @@ extern void irq_domain_associate_many(st
    extern void irq_domain_disassociate(struct irq_domain *domain,
    unsigned int irq);

    -extern unsigned int irq_create_mapping(struct irq_domain *host,
    - irq_hw_number_t hwirq);
    +extern unsigned int irq_create_mapping_affinity(struct irq_domain *host,
    + irq_hw_number_t hwirq,
    + const struct irq_affinity_desc *affinity);
    extern unsigned int irq_create_fwspec_mapping(struct irq_fwspec *fwspec);
    extern void irq_dispose_mapping(unsigned int virq);

    +static inline unsigned int irq_create_mapping(struct irq_domain *host,
    + irq_hw_number_t hwirq)
    +{
    + return irq_create_mapping_affinity(host, hwirq, NULL);
    +}
    +
    +
    /**
    * irq_linear_revmap() - Find a linux irq from a hw irq number.
    * @domain: domain owning this hardware interrupt
    --- a/kernel/irq/irqdomain.c
    +++ b/kernel/irq/irqdomain.c
    @@ -624,17 +624,19 @@ unsigned int irq_create_direct_mapping(s
    EXPORT_SYMBOL_GPL(irq_create_direct_mapping);

    /**
    - * irq_create_mapping() - Map a hardware interrupt into linux irq space
    + * irq_create_mapping_affinity() - Map a hardware interrupt into linux irq space
    * @domain: domain owning this hardware interrupt or NULL for default domain
    * @hwirq: hardware irq number in that domain space
    + * @affinity: irq affinity
    *
    * Only one mapping per hardware interrupt is permitted. Returns a linux
    * irq number.
    * If the sense/trigger is to be specified, set_irq_type() should be called
    * on the number returned from that call.
    */
    -unsigned int irq_create_mapping(struct irq_domain *domain,
    - irq_hw_number_t hwirq)
    +unsigned int irq_create_mapping_affinity(struct irq_domain *domain,
    + irq_hw_number_t hwirq,
    + const struct irq_affinity_desc *affinity)
    {
    struct device_node *of_node;
    int virq;
    @@ -660,7 +662,8 @@ unsigned int irq_create_mapping(struct i
    }

    /* Allocate a virtual interrupt number */
    - virq = irq_domain_alloc_descs(-1, 1, hwirq, of_node_to_nid(of_node), NULL);
    + virq = irq_domain_alloc_descs(-1, 1, hwirq, of_node_to_nid(of_node),
    + affinity);
    if (virq <= 0) {
    pr_debug("-> virq allocation failed\n");
    return 0;
    @@ -676,7 +679,7 @@ unsigned int irq_create_mapping(struct i

    return virq;
    }
    -EXPORT_SYMBOL_GPL(irq_create_mapping);
    +EXPORT_SYMBOL_GPL(irq_create_mapping_affinity);

    /**
    * irq_create_strict_mappings() - Map a range of hw irqs to fixed linux irqs

    \
     
     \ /
      Last update: 2020-12-10 16:12    [W:4.098 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site