Revert "IO APIC: Assign pins dedicated to PCI in the early stage."

This reverts commit f41c43c19e17ca807a28ba60b32364f1a40438f4 in order
to allow ACPI interrupt routing.

diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c
index 35a28ab..acadbe1 100644 (file)
--- a/sys/kern/kern_intr.c
+++ b/sys/kern/kern_intr.c
@@ -304,8 +304,16 @@ register_int(int intr, inthand2_t *handler, void *arg, const char *name,
 
     /*
      * Setup the machine level interrupt vector
+     *
+     * XXX temporary workaround for some ACPI brokedness.  ACPI installs
+     * its interrupt too early, before the IOAPICs have been configured,
+     * which means the IOAPIC is not enabled by the registration of the
+     * ACPI interrupt.  Anything else sharing that IRQ will wind up not
+     * being enabled.  Temporarily work around the problem by always
+     * installing and enabling on every new interrupt handler, even
+     * if one has already been setup on that irq.
      */
-    if (intr < FIRST_SOFTINT && info->i_slow + info->i_fast == 1) {
+    if (intr < FIRST_SOFTINT /* && info->i_slow + info->i_fast == 1*/) {
        if (machintr_vector_setup(intr, intr_flags))
            kprintf("machintr_vector_setup: failed on irq %d\n", intr);
     }

diff --git a/sys/platform/pc32/apic/apic_abi.c b/sys/platform/pc32/apic/apic_abi.c
index 56285b0..a6efefe 100644 (file)
--- a/sys/platform/pc32/apic/apic_abi.c
+++ b/sys/platform/pc32/apic/apic_abi.c
@@ -237,8 +237,6 @@ apic_vectorctl(int op, int intr, int flags)
         * clear the IRR bit.
         */
        if (int_to_apicintpin[intr].ioapic >= 0) {
-           if (bootverbose)
-               kprintf("IOAPIC: try clearing IRR for irq %d\n", intr);
            imen_lock();
            select = int_to_apicintpin[intr].redirindex;
            value = io_apic_read(int_to_apicintpin[intr].ioapic, select);

diff --git a/sys/platform/pc32/i386/mp_machdep.c b/sys/platform/pc32/i386/mp_machdep.c
index b6c4e4d..67790ed 100644 (file)
--- a/sys/platform/pc32/i386/mp_machdep.c
+++ b/sys/platform/pc32/i386/mp_machdep.c
@@ -1254,6 +1254,7 @@ allocate_apic_irq(int intr)
        intpin = io_apic_ints[intr].dst_apic_int;
        
        assign_apic_irq(apic, intpin, irq);
+       io_apic_setup_intpin(apic, intpin);
 }
 
 
@@ -1559,14 +1560,7 @@ setup_apic_irq_mapping(void)
                        break;
                }
        }
-
-       /* Assign PCI interrupts */
-       for (x = 0; x < nintrs; ++x) {
-               if (io_apic_ints[x].int_type == 0 &&
-                   io_apic_ints[x].int_vector == 0xff && 
-                   apic_int_is_bus_type(x, PCI))
-                       allocate_apic_irq(x);
-       }
+       /* PCI interrupt assignment is deferred */
 }
 
 #endif
@@ -1773,11 +1767,10 @@ pci_apic_irq(int pciBus, int pciDevice, int pciInt)
                    && (SRCBUSDEVICE(intr) == pciDevice)
                    && (SRCBUSLINE(intr) == pciInt)) {  /* a candidate IRQ */
                        if (apic_int_is_bus_type(intr, PCI)) {
-                               if (INTIRQ(intr) == 0xff) {
-                                       kprintf("IOAPIC: pci_apic_irq() "
-                                               "failed\n");
+                               if (INTIRQ(intr) == 0xff)
+                                       allocate_apic_irq(intr);
+                               if (INTIRQ(intr) == 0xff)
                                        return -1;      /* unassigned */
-                               }
                                return INTIRQ(intr);    /* exact match */
                        }
                }