lkml.org 
[lkml]   [2014]   [Nov]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[Patch Part2 v6 04/27] x86, MSI: Use new irqdomain interfaces to allocate/free IRQ
    Date
    Use new irqdomain interfaces to allocate/free IRQ for PCI MSI, so we
    could kill GENERIC_IRQ_LEGACY_ALLOC_HWIRQ later.

    Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
    ---
    arch/x86/kernel/apic/msi.c | 14 ++++++--------
    1 file changed, 6 insertions(+), 8 deletions(-)

    diff --git a/arch/x86/kernel/apic/msi.c b/arch/x86/kernel/apic/msi.c
    index 75f4f560f4c2..d5def489ca5b 100644
    --- a/arch/x86/kernel/apic/msi.c
    +++ b/arch/x86/kernel/apic/msi.c
    @@ -14,6 +14,7 @@
    #include <linux/dmar.h>
    #include <linux/hpet.h>
    #include <linux/msi.h>
    +#include <linux/irqdomain.h>
    #include <asm/msidef.h>
    #include <asm/hpet.h>
    #include <asm/hw_irq.h>
    @@ -146,23 +147,20 @@ int setup_msi_irq(struct pci_dev *dev, struct msi_desc *msidesc,
    int native_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
    {
    struct msi_desc *msidesc;
    - unsigned int irq;
    - int node, ret;
    + int irq, ret;

    /* Multiple MSI vectors only supported with interrupt remapping */
    if (type == PCI_CAP_ID_MSI && nvec > 1)
    return 1;

    - node = dev_to_node(&dev->dev);
    -
    list_for_each_entry(msidesc, &dev->msi_list, list) {
    - irq = irq_alloc_hwirq(node);
    - if (!irq)
    + irq = irq_domain_alloc_irqs(NULL, 1, NUMA_NO_NODE, NULL);
    + if (irq <= 0)
    return -ENOSPC;

    ret = setup_msi_irq(dev, msidesc, irq, 0);
    if (ret < 0) {
    - irq_free_hwirq(irq);
    + irq_domain_free_irqs(irq, 1);
    return ret;
    }

    @@ -172,7 +170,7 @@ int native_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)

    void native_teardown_msi_irq(unsigned int irq)
    {
    - irq_free_hwirq(irq);
    + irq_domain_free_irqs(irq, 1);
    }

    #ifdef CONFIG_DMAR_TABLE
    --
    1.7.10.4


    \
     
     \ /
      Last update: 2014-11-25 07:21    [W:4.024 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site