lkml.org 
[lkml]   [2020]   [Sep]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip: x86/irq] x86_irq_Rename_X86_IRQ_ALLOC_TYPE_MSI_to_reflect_PCI_dependency
    The following commit has been merged into the x86/irq branch of tip:

    Commit-ID: 801b5e4c4eec7b6c7f968d4bbce43da7cacffae4
    Gitweb: https://git.kernel.org/tip/801b5e4c4eec7b6c7f968d4bbce43da7cacffae4
    Author: Thomas Gleixner <tglx@linutronix.de>
    AuthorDate: Wed, 26 Aug 2020 13:16:35 +02:00
    Committer: Thomas Gleixner <tglx@linutronix.de>
    CommitterDate: Wed, 16 Sep 2020 16:52:29 +02:00

    x86_irq_Rename_X86_IRQ_ALLOC_TYPE_MSI_to_reflect_PCI_dependency

    No functional change.

    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Acked-by: Joerg Roedel <jroedel@suse.de>
    Link: https://lore.kernel.org/r/20200826112331.343103175@linutronix.de
    ---
    arch/x86/include/asm/hw_irq.h | 4 ++--
    arch/x86/kernel/apic/msi.c | 6 +++---
    drivers/iommu/amd/iommu.c | 24 ++++++++++++------------
    drivers/iommu/intel/irq_remapping.c | 18 +++++++++---------
    4 files changed, 26 insertions(+), 26 deletions(-)

    diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
    index 74c1243..3982a1e 100644
    --- a/arch/x86/include/asm/hw_irq.h
    +++ b/arch/x86/include/asm/hw_irq.h
    @@ -36,8 +36,8 @@ struct msi_desc;
    enum irq_alloc_type {
    X86_IRQ_ALLOC_TYPE_IOAPIC = 1,
    X86_IRQ_ALLOC_TYPE_HPET,
    - X86_IRQ_ALLOC_TYPE_MSI,
    - X86_IRQ_ALLOC_TYPE_MSIX,
    + X86_IRQ_ALLOC_TYPE_PCI_MSI,
    + X86_IRQ_ALLOC_TYPE_PCI_MSIX,
    X86_IRQ_ALLOC_TYPE_DMAR,
    X86_IRQ_ALLOC_TYPE_UV,
    };
    diff --git a/arch/x86/kernel/apic/msi.c b/arch/x86/kernel/apic/msi.c
    index f4ed814..7410d34 100644
    --- a/arch/x86/kernel/apic/msi.c
    +++ b/arch/x86/kernel/apic/msi.c
    @@ -187,7 +187,7 @@ int native_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
    struct irq_alloc_info info;

    init_irq_alloc_info(&info, NULL);
    - info.type = X86_IRQ_ALLOC_TYPE_MSI;
    + info.type = X86_IRQ_ALLOC_TYPE_PCI_MSI;
    info.msi_dev = dev;

    domain = irq_remapping_get_irq_domain(&info);
    @@ -219,9 +219,9 @@ int pci_msi_prepare(struct irq_domain *domain, struct device *dev, int nvec,
    init_irq_alloc_info(arg, NULL);
    arg->msi_dev = pdev;
    if (desc->msi_attrib.is_msix) {
    - arg->type = X86_IRQ_ALLOC_TYPE_MSIX;
    + arg->type = X86_IRQ_ALLOC_TYPE_PCI_MSIX;
    } else {
    - arg->type = X86_IRQ_ALLOC_TYPE_MSI;
    + arg->type = X86_IRQ_ALLOC_TYPE_PCI_MSI;
    arg->flags |= X86_IRQ_ALLOC_CONTIGUOUS_VECTORS;
    }

    diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c
    index db44ce6..cf26b73 100644
    --- a/drivers/iommu/amd/iommu.c
    +++ b/drivers/iommu/amd/iommu.c
    @@ -3528,8 +3528,8 @@ static int get_devid(struct irq_alloc_info *info)
    case X86_IRQ_ALLOC_TYPE_HPET:
    devid = get_hpet_devid(info->hpet_id);
    break;
    - case X86_IRQ_ALLOC_TYPE_MSI:
    - case X86_IRQ_ALLOC_TYPE_MSIX:
    + case X86_IRQ_ALLOC_TYPE_PCI_MSI:
    + case X86_IRQ_ALLOC_TYPE_PCI_MSIX:
    devid = get_device_id(&info->msi_dev->dev);
    break;
    default:
    @@ -3567,8 +3567,8 @@ static struct irq_domain *get_irq_domain(struct irq_alloc_info *info)
    return NULL;

    switch (info->type) {
    - case X86_IRQ_ALLOC_TYPE_MSI:
    - case X86_IRQ_ALLOC_TYPE_MSIX:
    + case X86_IRQ_ALLOC_TYPE_PCI_MSI:
    + case X86_IRQ_ALLOC_TYPE_PCI_MSIX:
    devid = get_device_id(&info->msi_dev->dev);
    if (devid < 0)
    return NULL;
    @@ -3629,8 +3629,8 @@ static void irq_remapping_prepare_irte(struct amd_ir_data *data,
    break;

    case X86_IRQ_ALLOC_TYPE_HPET:
    - case X86_IRQ_ALLOC_TYPE_MSI:
    - case X86_IRQ_ALLOC_TYPE_MSIX:
    + case X86_IRQ_ALLOC_TYPE_PCI_MSI:
    + case X86_IRQ_ALLOC_TYPE_PCI_MSIX:
    msg->address_hi = MSI_ADDR_BASE_HI;
    msg->address_lo = MSI_ADDR_BASE_LO;
    msg->data = irte_info->index;
    @@ -3674,15 +3674,15 @@ static int irq_remapping_alloc(struct irq_domain *domain, unsigned int virq,

    if (!info)
    return -EINVAL;
    - if (nr_irqs > 1 && info->type != X86_IRQ_ALLOC_TYPE_MSI &&
    - info->type != X86_IRQ_ALLOC_TYPE_MSIX)
    + if (nr_irqs > 1 && info->type != X86_IRQ_ALLOC_TYPE_PCI_MSI &&
    + info->type != X86_IRQ_ALLOC_TYPE_PCI_MSIX)
    return -EINVAL;

    /*
    * With IRQ remapping enabled, don't need contiguous CPU vectors
    * to support multiple MSI interrupts.
    */
    - if (info->type == X86_IRQ_ALLOC_TYPE_MSI)
    + if (info->type == X86_IRQ_ALLOC_TYPE_PCI_MSI)
    info->flags &= ~X86_IRQ_ALLOC_CONTIGUOUS_VECTORS;

    devid = get_devid(info);
    @@ -3714,9 +3714,9 @@ static int irq_remapping_alloc(struct irq_domain *domain, unsigned int virq,
    } else {
    index = -ENOMEM;
    }
    - } else if (info->type == X86_IRQ_ALLOC_TYPE_MSI ||
    - info->type == X86_IRQ_ALLOC_TYPE_MSIX) {
    - bool align = (info->type == X86_IRQ_ALLOC_TYPE_MSI);
    + } else if (info->type == X86_IRQ_ALLOC_TYPE_PCI_MSI ||
    + info->type == X86_IRQ_ALLOC_TYPE_PCI_MSIX) {
    + bool align = (info->type == X86_IRQ_ALLOC_TYPE_PCI_MSI);

    index = alloc_irq_index(devid, nr_irqs, align, info->msi_dev);
    } else {
    diff --git a/drivers/iommu/intel/irq_remapping.c b/drivers/iommu/intel/irq_remapping.c
    index 8f4ce72..33c4389 100644
    --- a/drivers/iommu/intel/irq_remapping.c
    +++ b/drivers/iommu/intel/irq_remapping.c
    @@ -1121,8 +1121,8 @@ static struct irq_domain *intel_get_ir_irq_domain(struct irq_alloc_info *info)
    case X86_IRQ_ALLOC_TYPE_HPET:
    iommu = map_hpet_to_ir(info->hpet_id);
    break;
    - case X86_IRQ_ALLOC_TYPE_MSI:
    - case X86_IRQ_ALLOC_TYPE_MSIX:
    + case X86_IRQ_ALLOC_TYPE_PCI_MSI:
    + case X86_IRQ_ALLOC_TYPE_PCI_MSIX:
    iommu = map_dev_to_ir(info->msi_dev);
    break;
    default:
    @@ -1141,8 +1141,8 @@ static struct irq_domain *intel_get_irq_domain(struct irq_alloc_info *info)
    return NULL;

    switch (info->type) {
    - case X86_IRQ_ALLOC_TYPE_MSI:
    - case X86_IRQ_ALLOC_TYPE_MSIX:
    + case X86_IRQ_ALLOC_TYPE_PCI_MSI:
    + case X86_IRQ_ALLOC_TYPE_PCI_MSIX:
    iommu = map_dev_to_ir(info->msi_dev);
    if (iommu)
    return iommu->ir_msi_domain;
    @@ -1312,8 +1312,8 @@ static void intel_irq_remapping_prepare_irte(struct intel_ir_data *data,
    break;

    case X86_IRQ_ALLOC_TYPE_HPET:
    - case X86_IRQ_ALLOC_TYPE_MSI:
    - case X86_IRQ_ALLOC_TYPE_MSIX:
    + case X86_IRQ_ALLOC_TYPE_PCI_MSI:
    + case X86_IRQ_ALLOC_TYPE_PCI_MSIX:
    if (info->type == X86_IRQ_ALLOC_TYPE_HPET)
    set_hpet_sid(irte, info->hpet_id);
    else
    @@ -1368,15 +1368,15 @@ static int intel_irq_remapping_alloc(struct irq_domain *domain,

    if (!info || !iommu)
    return -EINVAL;
    - if (nr_irqs > 1 && info->type != X86_IRQ_ALLOC_TYPE_MSI &&
    - info->type != X86_IRQ_ALLOC_TYPE_MSIX)
    + if (nr_irqs > 1 && info->type != X86_IRQ_ALLOC_TYPE_PCI_MSI &&
    + info->type != X86_IRQ_ALLOC_TYPE_PCI_MSIX)
    return -EINVAL;

    /*
    * With IRQ remapping enabled, don't need contiguous CPU vectors
    * to support multiple MSI interrupts.
    */
    - if (info->type == X86_IRQ_ALLOC_TYPE_MSI)
    + if (info->type == X86_IRQ_ALLOC_TYPE_PCI_MSI)
    info->flags &= ~X86_IRQ_ALLOC_CONTIGUOUS_VECTORS;

    ret = irq_domain_alloc_irqs_parent(domain, virq, nr_irqs, arg);
    \
     
     \ /
      Last update: 2020-09-16 17:43    [W:3.032 / U:0.224 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site