x86, irq, SFI: Use common irqdomain map interface to program IOAPIC pins
authorJiang Liu <jiang.liu@linux.intel.com>
Mon, 9 Jun 2014 08:20:01 +0000 (16:20 +0800)
committerThomas Gleixner <tglx@linutronix.de>
Sat, 21 Jun 2014 21:05:43 +0000 (23:05 +0200)
Refine SFI to use common irqdomain map interface to program IOAPIC pins,
so we can unify the callsite to progam IOAPIC pins.

Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: H. Peter Anvin <hpa@linux.intel.com>
Cc: sfi-devel@simplefirmware.org
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Grant Likely <grant.likely@linaro.org>
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Len Brown <lenb@kernel.org>
Cc: David Cohen <david.a.cohen@linux.intel.com>
Cc: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Link: http://lkml.kernel.org/r/1402302011-23642-33-git-send-email-jiang.liu@linux.intel.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
arch/x86/pci/intel_mid_pci.c
arch/x86/platform/intel-mid/sfi.c
arch/x86/platform/sfi/sfi.c

index fcbdc5fac2c65efa9b5ffbbb3a94e47053ccb71d..337d165c64f1a70c77164e8cfc986cb9bf091226 100644 (file)
@@ -208,27 +208,22 @@ static int pci_write(struct pci_bus *bus, unsigned int devfn, int where,
 
 static int intel_mid_pci_irq_enable(struct pci_dev *dev)
 {
-       u8 pin;
-       struct io_apic_irq_attr irq_attr;
+       int polarity;
 
-       pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);
+       if (intel_mid_identify_cpu() == INTEL_MID_CPU_CHIP_TANGIER)
+               polarity = 0; /* active high */
+       else
+               polarity = 1; /* active low */
 
        /*
         * MRST only have IOAPIC, the PCI irq lines are 1:1 mapped to
         * IOAPIC RTE entries, so we just enable RTE for the device.
         */
+       if (mp_set_gsi_attr(dev->irq, 1, polarity, dev_to_node(&dev->dev)))
+               return -EBUSY;
        if (mp_map_gsi_to_irq(dev->irq, IOAPIC_MAP_ALLOC) < 0)
                return -EBUSY;
 
-       irq_attr.ioapic = mp_find_ioapic(dev->irq);
-       irq_attr.ioapic_pin = dev->irq;
-       irq_attr.trigger = 1; /* level */
-       if (intel_mid_identify_cpu() == INTEL_MID_CPU_CHIP_TANGIER)
-               irq_attr.polarity = 0; /* active high */
-       else
-               irq_attr.polarity = 1; /* active low */
-       io_apic_set_pci_routing(&dev->dev, dev->irq, &irq_attr);
-
        return 0;
 }
 
index 7161395e7de7e9e9de439d06b5c3f9cd7647cd8e..3c53a90fdb18b8d446bcb6ef3cc711ab543974d8 100644 (file)
@@ -432,9 +432,8 @@ static int __init sfi_parse_devs(struct sfi_table_header *table)
        struct sfi_table_simple *sb;
        struct sfi_device_table_entry *pentry;
        struct devs_id *dev = NULL;
-       int num, i;
-       int ioapic;
-       struct io_apic_irq_attr irq_attr;
+       int num, i, ret;
+       int polarity;
 
        sb = (struct sfi_table_simple *)table;
        num = SFI_GET_NUM_ENTRIES(sb, struct sfi_device_table_entry);
@@ -448,37 +447,30 @@ static int __init sfi_parse_devs(struct sfi_table_header *table)
                         * devices, but they have separate RTE entry in IOAPIC
                         * so we have to enable them one by one here
                         */
-                       ioapic = mp_find_ioapic(irq);
-                       if (ioapic >= 0) {
-                               irq_attr.ioapic = ioapic;
-                               irq_attr.ioapic_pin = irq;
-                               irq_attr.trigger = 1;
-                               if (intel_mid_identify_cpu() ==
-                                               INTEL_MID_CPU_CHIP_TANGIER) {
-                                       if (!strncmp(pentry->name,
-                                                       "r69001-ts-i2c", 13))
-                                               /* active low */
-                                               irq_attr.polarity = 1;
-                                       else if (!strncmp(pentry->name,
-                                                       "synaptics_3202", 14))
-                                               /* active low */
-                                               irq_attr.polarity = 1;
-                                       else if (irq == 41)
-                                               /* fast_int_1 */
-                                               irq_attr.polarity = 1;
-                                       else
-                                               /* active high */
-                                               irq_attr.polarity = 0;
-                               } else {
-                                       /* PNW and CLV go with active low */
-                                       irq_attr.polarity = 1;
-                               }
-                               WARN_ON(mp_map_gsi_to_irq(irq,
-                                               IOAPIC_MAP_ALLOC) < 0);
-                               io_apic_set_pci_routing(NULL, irq, &irq_attr);
+                       if (intel_mid_identify_cpu() ==
+                                       INTEL_MID_CPU_CHIP_TANGIER) {
+                               if (!strncmp(pentry->name, "r69001-ts-i2c", 13))
+                                       /* active low */
+                                       polarity = 1;
+                               else if (!strncmp(pentry->name,
+                                               "synaptics_3202", 14))
+                                       /* active low */
+                                       polarity = 1;
+                               else if (irq == 41)
+                                       /* fast_int_1 */
+                                       polarity = 1;
+                               else
+                                       /* active high */
+                                       polarity = 0;
+                       } else {
+                               /* PNW and CLV go with active low */
+                               polarity = 1;
                        }
-               } else {
-                       irq = 0; /* No irq */
+
+                       ret = mp_set_gsi_attr(irq, 1, polarity, NUMA_NO_NODE);
+                       if (ret == 0)
+                               ret = mp_map_gsi_to_irq(irq, IOAPIC_MAP_ALLOC);
+                       WARN_ON(ret < 0);
                }
 
                dev = get_device_id(pentry->type, pentry->name);
index 1fdaa57f41a5436cbb25260f64c73ea3477c3989..2a8a74f3bd76c1338e2378c26bc231cc5adf9bea 100644 (file)
@@ -71,7 +71,9 @@ static int __init sfi_parse_cpus(struct sfi_table_header *table)
 #endif /* CONFIG_X86_LOCAL_APIC */
 
 #ifdef CONFIG_X86_IO_APIC
-static struct irq_domain_ops sfi_ioapic_irqdomain_ops;
+static struct irq_domain_ops sfi_ioapic_irqdomain_ops = {
+       .map = mp_irqdomain_map,
+};
 
 static int __init sfi_parse_ioapic(struct sfi_table_header *table)
 {