i386 - Get completely rid of APIC_IO

[dragonfly.git] / sys / platform / pc32 / acpica5 / acpi_machdep.c

diff --git a/sys/platform/pc32/acpica5/acpi_machdep.c b/sys/platform/pc32/acpica5/acpi_machdep.c
index 6985f1d..c0c06d1 100644 (file)
--- a/sys/platform/pc32/acpica5/acpi_machdep.c
+++ b/sys/platform/pc32/acpica5/acpi_machdep.c
@@ -51,15 +51,20 @@ static device_t     acpi_dev;
 #include <machine/apm_bios.h>
 #include <machine/pc/bios.h>
 #include <machine_base/apm/apm.h>
+#include <machine/smp.h>
 
 uint32_t acpi_reset_video = 1;
 TUNABLE_INT("hw.acpi.reset_video", &acpi_reset_video);
 
-#ifdef APIC_IO
-static int intr_model = ACPI_INTR_APIC;
+/*
+ * -1 == unset. Use acpi_GetDefaultIntrModel()
+ */
+#ifdef SMP /* APIC-IO */
+static int intr_model = -1;
 #else
 static int intr_model = ACPI_INTR_PIC;
 #endif
+
 static struct apm_softc        apm_softc;
 
 static d_open_t apmopen;
@@ -327,6 +332,25 @@ acpi_capm_init(struct acpi_softc *sc)
        kprintf("Warning: ACPI is disabling APM's device.  You can't run both\n");
 }
 
+/*
+ * Lazy initialize intr_model
+ */
+static int
+acpi_GetDefaultIntrModel(void)
+{
+       if (intr_model == -1) {
+#ifdef SMP /* APIC-IO */
+               if (apic_io_enable)
+                       intr_model = ACPI_INTR_APIC;
+               else
+                       intr_model = ACPI_INTR_PIC;
+#else
+               intr_model = ACPI_INTR_PIC;
+#endif
+       }
+       return intr_model;
+}
+
 int
 acpi_machdep_init(device_t dev)
 {
@@ -345,11 +369,11 @@ acpi_machdep_init(device_t dev)
 
        acpi_install_wakeup_handler(sc);
 
-       if (intr_model == ACPI_INTR_PIC)
+       if (acpi_GetDefaultIntrModel() == ACPI_INTR_PIC)
                BUS_CONFIG_INTR(dev, dev, AcpiGbl_FADT.SciInterrupt,
                    INTR_TRIGGER_LEVEL, INTR_POLARITY_LOW);
        else
-               acpi_SetIntrModel(intr_model);
+               acpi_SetIntrModel(acpi_GetDefaultIntrModel());
 
        SYSCTL_ADD_UINT(&sc->acpi_sysctl_ctx,
            SYSCTL_CHILDREN(sc->acpi_sysctl_tree), OID_AUTO,