ACPI: Add missing ACPI_SERIAL_INIT()'s.

diff --git a/sys/dev/acpica5/acpi.c b/sys/dev/acpica5/acpi.c
index f681ade..e0e0315 100644 (file)
--- a/sys/dev/acpica5/acpi.c
+++ b/sys/dev/acpica5/acpi.c
@@ -416,7 +416,6 @@ acpi_attach(device_t dev)
 
     ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
-    //lwkt_serialize_init(&acpi_sxlock);
     sc = device_get_softc(dev);
     sc->acpi_dev = dev;
     callout_init(&sc->susp_force_to);
@@ -443,9 +442,8 @@ acpi_attach(device_t dev)
        panic("acpi rman_init memory failed");
 
     /* Initialise the ACPI mutex */
-#ifdef notyet
-    spin_init(&acpi_mutex);
-#endif
+    ACPI_LOCK_INIT(acpi, "acpi");
+    ACPI_SERIAL_INIT(acpi);
 
     /*
      * Set the globals from our tunables.  This is needed because ACPI-CA
@@ -2211,7 +2209,9 @@ acpi_sleep_force(void *arg)
 int
 acpi_ReqSleepState(struct acpi_softc *sc, int state)
 {
+#ifdef notyet
     struct apm_clone_data *clone;
+#endif
 
     if (state < ACPI_STATE_S1 || state > ACPI_STATE_S5)
        return (EINVAL);
@@ -2655,7 +2655,7 @@ acpi_wake_sysctl_walk(device_t dev)
            kfree(devlist, M_TEMP);
        return (error);
     }
-#ifdef notye
+#ifdef notyet
     for (i = 0; i < numdevs; i++) {
        child = devlist[i];
        acpi_wake_sysctl_walk(child);

diff --git a/sys/dev/acpica5/acpi_acad.c b/sys/dev/acpica5/acpi_acad.c
index 6fc7b7b..059045d 100644 (file)
--- a/sys/dev/acpica5/acpi_acad.c
+++ b/sys/dev/acpica5/acpi_acad.c
@@ -164,6 +164,8 @@ acpi_acad_attach(device_t dev)
     if (error != 0)
        return (error);
 
+    ACPI_SERIAL_INIT(acad);
+
     if (device_get_unit(dev) == 0) {
        acpi_sc = acpi_device_get_parent_softc(dev);
        SYSCTL_ADD_PROC(&acpi_sc->acpi_sysctl_ctx,

diff --git a/sys/dev/acpica5/acpi_battery.c b/sys/dev/acpica5/acpi_battery.c
index 93a58a9..5e66ab2 100644 (file)
--- a/sys/dev/acpica5/acpi_battery.c
+++ b/sys/dev/acpica5/acpi_battery.c
@@ -66,6 +66,7 @@ acpi_battery_register(device_t dev)
     int error;
 
     error = 0;
+    ACPI_SERIAL_INIT(battery);
     ACPI_SERIAL_BEGIN(battery);
     if (!acpi_batteries_initted)
        error = acpi_battery_init();

diff --git a/sys/dev/acpica5/acpi_cmbat.c b/sys/dev/acpica5/acpi_cmbat.c
index a69b4bc..bd8c781 100644 (file)
--- a/sys/dev/acpica5/acpi_cmbat.c
+++ b/sys/dev/acpica5/acpi_cmbat.c
@@ -133,6 +133,8 @@ acpi_cmbat_attach(device_t dev)
     handle = acpi_get_handle(dev);
     sc->dev = dev;
 
+    ACPI_SERIAL_INIT(cmbat);
+
     timespecclear(&sc->bst_lastupdated);
 
     error = acpi_battery_register(dev);

diff --git a/sys/dev/acpica5/acpi_ec.c b/sys/dev/acpica5/acpi_ec.c
index d5a7c86..b2dc22c 100644 (file)
--- a/sys/dev/acpica5/acpi_ec.c
+++ b/sys/dev/acpica5/acpi_ec.c
@@ -461,6 +461,7 @@ acpi_ec_attach(device_t dev)
     params = acpi_get_private(dev);
     sc->ec_dev = dev;
     sc->ec_handle = acpi_get_handle(dev);
+    ACPI_SERIAL_INIT(ec);
 
     /* Retrieve previously probed values via device ivars. */
     sc->ec_glk = params->glk;

diff --git a/sys/dev/acpica5/acpi_lid.c b/sys/dev/acpica5/acpi_lid.c
index 9633839..ba1ed01 100644 (file)
--- a/sys/dev/acpica5/acpi_lid.c
+++ b/sys/dev/acpica5/acpi_lid.c
@@ -108,6 +108,8 @@ acpi_lid_attach(device_t dev)
     sc->lid_dev = dev;
     sc->lid_handle = acpi_get_handle(dev);
 
+    ACPI_SERIAL_INIT(lid);
+
     /*
      * If a system does not get lid events, it may make sense to change
      * the type to ACPI_ALL_NOTIFY.  Some systems generate both a wake and

diff --git a/sys/dev/acpica5/acpi_pci.c b/sys/dev/acpica5/acpi_pci.c
index 895d6e0..a008f53 100644 (file)
--- a/sys/dev/acpica5/acpi_pci.c
+++ b/sys/dev/acpica5/acpi_pci.c
@@ -331,6 +331,8 @@ acpi_pci_attach(device_t dev)
               device_printf(dev, "domain=%d, physical bus=%d\n",
                     domain, busno);
 
+       ACPI_SERIAL_INIT(pci_powerstate);
+
        /*
         * First, PCI devices are added as in the normal PCI bus driver.
         * Afterwards, the ACPI namespace under the bridge driver is

diff --git a/sys/dev/acpica5/acpi_pci_link.c b/sys/dev/acpica5/acpi_pci_link.c
index 2e78cdf..986fa6f 100644 (file)
--- a/sys/dev/acpica5/acpi_pci_link.c
+++ b/sys/dev/acpica5/acpi_pci_link.c
@@ -434,6 +434,7 @@ acpi_pci_link_attach(device_t dev)
 
        sc = device_get_softc(dev);
        sc->pl_dev = dev;
+       ACPI_SERIAL_INIT(pci_link);
        ACPI_SERIAL_BEGIN(pci_link);
 
        /*

diff --git a/sys/dev/acpica5/acpi_pcib.c b/sys/dev/acpica5/acpi_pcib.c
index 425c6d5..03dddbd 100644 (file)
--- a/sys/dev/acpica5/acpi_pcib.c
+++ b/sys/dev/acpica5/acpi_pcib.c
@@ -146,6 +146,8 @@ acpi_pcib_attach(device_t dev, ACPI_BUFFER *prt, int busno)
     if (!acpi_DeviceIsPresent(dev))
        return_VALUE(ENXIO);
 
+    ACPI_SERIAL_INIT(pcib);
+
     /*
      * Get the PCI interrupt routing table for this bus.  If we can't
      * get it, this is not an error but may reduce functionality.  There

diff --git a/sys/dev/acpica5/acpi_powerres.c b/sys/dev/acpica5/acpi_powerres.c
index d5fee40..1263680 100644 (file)
--- a/sys/dev/acpica5/acpi_powerres.c
+++ b/sys/dev/acpica5/acpi_powerres.c
@@ -119,10 +119,11 @@ static struct acpi_powerconsumer
 static void
 acpi_pwr_init(void *junk)
 {
+    ACPI_SERIAL_INIT(powerres);
     TAILQ_INIT(&acpi_powerresources);
     TAILQ_INIT(&acpi_powerconsumers);
 }
-// SYSINIT(acpi_powerresource, SI_SUB_TUNABLES, SI_ORDER_ANY, acpi_pwr_init, NULL);
+SYSINIT(acpi_powerresource, SI_BOOT1_TUNABLES, SI_ORDER_ANY, acpi_pwr_init, NULL);
 
 /*
  * Register a power resource.