lkml.org 
[lkml]   [2020]   [Aug]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch RFC 11/38] x86/irq: Consolidate DMAR irq allocation
    None of the DMAR specific fields are required.

    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    ---
    arch/x86/include/asm/hw_irq.h | 6 ------
    arch/x86/kernel/apic/msi.c | 10 +++++-----
    2 files changed, 5 insertions(+), 11 deletions(-)

    --- a/arch/x86/include/asm/hw_irq.h
    +++ b/arch/x86/include/asm/hw_irq.h
    @@ -83,12 +83,6 @@ struct irq_alloc_info {
    irq_hw_number_t msi_hwirq;
    };
    #endif
    -#ifdef CONFIG_DMAR_TABLE
    - struct {
    - int dmar_id;
    - void *dmar_data;
    - };
    -#endif
    #ifdef CONFIG_X86_UV
    struct {
    int uv_limit;
    --- a/arch/x86/kernel/apic/msi.c
    +++ b/arch/x86/kernel/apic/msi.c
    @@ -329,15 +329,15 @@ static struct irq_chip dmar_msi_controll
    static irq_hw_number_t dmar_msi_get_hwirq(struct msi_domain_info *info,
    msi_alloc_info_t *arg)
    {
    - return arg->dmar_id;
    + return arg->hwirq;
    }

    static int dmar_msi_init(struct irq_domain *domain,
    struct msi_domain_info *info, unsigned int virq,
    irq_hw_number_t hwirq, msi_alloc_info_t *arg)
    {
    - irq_domain_set_info(domain, virq, arg->dmar_id, info->chip, NULL,
    - handle_edge_irq, arg->dmar_data, "edge");
    + irq_domain_set_info(domain, virq, arg->devid, info->chip, NULL,
    + handle_edge_irq, arg->data, "edge");

    return 0;
    }
    @@ -384,8 +384,8 @@ int dmar_alloc_hwirq(int id, int node, v

    init_irq_alloc_info(&info, NULL);
    info.type = X86_IRQ_ALLOC_TYPE_DMAR;
    - info.dmar_id = id;
    - info.dmar_data = arg;
    + info.devid = id;
    + info.data = arg;

    return irq_domain_alloc_irqs(domain, 1, node, &info);
    }
    \
     
     \ /
      Last update: 2020-08-21 04:20    [W:4.138 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site