[ACPI] enhance intr-src-override parsing to handle ES7000

http://bugme.osdl.org/show_bug.cgi?id=2520

diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
index f46ad9ac5aa7cb002800cb012ffc3ce751f3fe33..561c565c22519834a80e362118d45fe3c58fbdbd 100644 (file)
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
@@ -653,9 +653,6 @@ acpi_parse_madt_ioapic_entries(void)
                return count;
        }
 
-       /* Build a default routing table for legacy (ISA) interrupts. */
-       mp_config_acpi_legacy_irqs();
-
        count = acpi_table_parse_madt(ACPI_MADT_INT_SRC_OVR, acpi_parse_int_src_ovr, NR_IRQ_VECTORS);
        if (count < 0) {
                printk(KERN_ERR PREFIX "Error parsing interrupt source overrides entry\n");
@@ -670,6 +667,9 @@ acpi_parse_madt_ioapic_entries(void)
        if (!acpi_sci_override_gsi)
                acpi_sci_ioapic_setup(acpi_fadt.sci_int, 0, 0);
 
+       /* Fill in identity legacy mapings where no override */
+       mp_config_acpi_legacy_irqs();
+
        count = acpi_table_parse_madt(ACPI_MADT_NMI_SRC, acpi_parse_nmi_src, NR_IRQ_VECTORS);
        if (count < 0) {
                printk(KERN_ERR PREFIX "Error parsing NMI SRC entry\n");

diff --git a/arch/i386/kernel/mpparse.c b/arch/i386/kernel/mpparse.c
index 17d1bb236547ecc789f6434d9c8189cbdf5762be..4c632e4e4b5b41796b68e6dd546b09b53a58f99c 100644 (file)
--- a/arch/i386/kernel/mpparse.c
+++ b/arch/i386/kernel/mpparse.c
@@ -929,8 +929,6 @@ void __init mp_override_legacy_irq (
        u32                     gsi)
 {
        struct mpc_config_intsrc intsrc;
-       int                     i = 0;
-       int                     found = 0;
        int                     ioapic = -1;
        int                     pin = -1;
 
@@ -963,23 +961,9 @@ void __init mp_override_legacy_irq (
                (intsrc.mpc_irqflag >> 2) & 3, intsrc.mpc_srcbus, 
                intsrc.mpc_srcbusirq, intsrc.mpc_dstapic, intsrc.mpc_dstirq);
 
-       /* 
-        * If an existing [IOAPIC.PIN -> IRQ] routing entry exists we override it.
-        * Otherwise create a new entry (e.g. gsi == 2).
-        */
-       for (i = 0; i < mp_irq_entries; i++) {
-               if ((mp_irqs[i].mpc_srcbus == intsrc.mpc_srcbus) 
-                       && (mp_irqs[i].mpc_srcbusirq == intsrc.mpc_srcbusirq)) {
-                       mp_irqs[i] = intsrc;
-                       found = 1;
-                       break;
-               }
-       }
-       if (!found) {
-               mp_irqs[mp_irq_entries] = intsrc;
-               if (++mp_irq_entries == MAX_IRQ_SOURCES)
-                       panic("Max # of irq sources exceeded!\n");
-       }
+       mp_irqs[mp_irq_entries] = intsrc;
+       if (++mp_irq_entries == MAX_IRQ_SOURCES)
+               panic("Max # of irq sources exceeded!\n");
 
        return;
 }
@@ -1010,13 +994,20 @@ void __init mp_config_acpi_legacy_irqs (void)
        intsrc.mpc_dstapic = mp_ioapics[ioapic].mpc_apicid;
 
        /* 
-        * Use the default configuration for the IRQs 0-15.  These may be
+        * Use the default configuration for the IRQs 0-15.  Unless
         * overriden by (MADT) interrupt source override entries.
         */
        for (i = 0; i < 16; i++) {
+               int idx;
+
+               for (idx = 0; idx < mp_irq_entries; idx++)
+                       if (mp_irqs[idx].mpc_srcbus == MP_ISA_BUS &&
+                               (mp_irqs[idx].mpc_srcbusirq == i ||
+                               mp_irqs[idx].mpc_dstirq == i))
+                                       break;
 
-               if (i == 2)
-                       continue;                       /* Don't connect IRQ2 */
+               if (idx != mp_irq_entries)
+                       continue;                         /* IRQ already used */
 
                intsrc.mpc_irqtype = mp_INT;
                intsrc.mpc_srcbusirq = i;                  /* Identity mapped */

diff --git a/arch/x86_64/kernel/mpparse.c b/arch/x86_64/kernel/mpparse.c
index 86bda87db99bb16cc91bf82e88bbe9ac5b179fff..dc350e088662e6b86377bf6a21507bab991627f5 100644 (file)
--- a/arch/x86_64/kernel/mpparse.c
+++ b/arch/x86_64/kernel/mpparse.c
@@ -780,8 +780,6 @@ void __init mp_override_legacy_irq (
        u32                     gsi)
 {
        struct mpc_config_intsrc intsrc;
-       int                     i = 0;
-       int                     found = 0;
        int                     ioapic = -1;
        int                     pin = -1;
 
@@ -814,23 +812,9 @@ void __init mp_override_legacy_irq (
                (intsrc.mpc_irqflag >> 2) & 3, intsrc.mpc_srcbus, 
                intsrc.mpc_srcbusirq, intsrc.mpc_dstapic, intsrc.mpc_dstirq);
 
-       /* 
-        * If an existing [IOAPIC.PIN -> IRQ] routing entry exists we override it.
-        * Otherwise create a new entry (e.g. gsi == 2).
-        */
-       for (i = 0; i < mp_irq_entries; i++) {
-               if ((mp_irqs[i].mpc_srcbus == intsrc.mpc_srcbus) 
-                       && (mp_irqs[i].mpc_srcbusirq == intsrc.mpc_srcbusirq)) {
-                       mp_irqs[i] = intsrc;
-                       found = 1;
-                       break;
-               }
-       }
-       if (!found) {
-               mp_irqs[mp_irq_entries] = intsrc;
-               if (++mp_irq_entries == MAX_IRQ_SOURCES)
-                       panic("Max # of irq sources exceeded!\n");
-       }
+       mp_irqs[mp_irq_entries] = intsrc;
+       if (++mp_irq_entries == MAX_IRQ_SOURCES)
+               panic("Max # of irq sources exceeded!\n");
 
        return;
 }
@@ -861,13 +845,22 @@ void __init mp_config_acpi_legacy_irqs (void)
        intsrc.mpc_dstapic = mp_ioapics[ioapic].mpc_apicid;
 
        /* 
-        * Use the default configuration for the IRQs 0-15.  These may be
+        * Use the default configuration for the IRQs 0-15.  Unless
         * overridden by (MADT) interrupt source override entries.
         */
        for (i = 0; i < 16; i++) {
+               int idx;
+
+               for (idx = 0; idx < mp_irq_entries; idx++)
+                       if (mp_irqs[idx].mpc_srcbus == MP_ISA_BUS &&
+                               (mp_irqs[idx].mpc_srcbusirq == i ||
+                               mp_irqs[idx].mpc_dstirq == i))
+                                       break;
 
-               if (i == 2)
-                       continue;                       /* Don't connect IRQ2 */
+               if (idx != mp_irq_entries) {
+                       printk(KERN_DEBUG "ACPI: IRQ%d used by override.\n", i);
+                       continue;                        /* IRQ already used */
+               }
 
                intsrc.mpc_irqtype = mp_INT;
                intsrc.mpc_srcbusirq = i;                  /* Identity mapped */