The attached patch implements setting power states for ACPI (i.e. ISA)
and PCI devices in the suspend/resume path. This may help with some
problems; it's quite likely it may introduce problems. That's why I'd
like it tested. If you have a system that suspends/resumes ok or that
fails, please try it. The likely failure case is a hang in suspend or
resume or a device that doesn't work afterwords. It's pretty
heavy-handed, only avoiding changing power for serial ports since those
are known to cause a hang (which can possibly be fixed by making
sio/uart more aware of power states.) I suspect devices like PCI
bridges may have problems with power changes.
If you have problems, please let me know the info it prints before the
hang so I can figure out what the problem device is.
-Nate
Here is some info from a successful suspend/resume with the patch:
acpi_button0: sleep button pressed
acpi: _SxD is D3
acpi: _SxD is D2
acpi: _SxD is D2
acpi: _SxD is D2
acpi: _SxD is D2
acpi: _SxD is D3
acpi: _SxD is D3
acpi: _SxD is D3
acpi: _SxD is D3
acpi: _SxD is D3
cbb0: bad Vcc request. ctrl=0xffffff88, status=0xffffffff
cbb_power: 0V
cbb1: bad Vcc request. ctrl=0xffffff88, status=0xffffffff
cbb_power: 0V
acpi attempting to switch \\_SB_.PCI0.LPC_.EC__ into D3 (if supported)
acpi attempting to switch \\_SB_.MEM_ into D3 (if supported)
acpi attempting to switch \\_SB_.PCI0.LPC_.SIO_ into D3 (if supported)
acpi attempting to switch \\_PR_.CPU_ into D3 (if supported)
acpi attempting to switch \\_TZ_.THM0 into D3 (if supported)
acpi attempting to switch \\_SB_.LID_ into D3 (if supported)
acpi attempting to switch \\_SB_.SLPB into D3 (if supported)
acpi: _SxD is D2
acpi attempting to switch \\_SB_.PCI0 into D2 (if supported)
acpi0: failed to set ACPI power state D2 on \\_SB_.PCI0: AE_BAD_PARAMETER
acpi attempting to switch \\_SB_.PCI0.LPC_.PIC_ into D3 (if supported)
acpi attempting to switch \\_SB_.PCI0.LPC_.TIMR into D3 (if supported)
acpi attempting to switch \\_SB_.PCI0.LPC_.DMAC into D3 (if supported)
acpi attempting to switch \\_SB_.PCI0.LPC_.FPU_ into D3 (if supported)
acpi attempting to switch \\_SB_.PCI0.LPC_.RTC_ into D3 (if supported)
acpi attempting to switch \\_SB_.PCI0.LPC_.KBD_ into D3 (if supported)
acpi attempting to switch \\_SB_.PCI0.LPC_.MOU_ into D3 (if supported)
acpi attempting to switch \\_SB_.PCI0.LPC_.LPT_ into D3 (if supported)
acpi succeeded putting \\_SB_.PCI0.LPC_.LPT_ into D3
acpi attempting to switch \\_SB_.PCI0.LPC_.EC__.BAT0 into D3 (if supported)
acpi attempting to switch \\_SB_.PCI0.LPC_.EC__.AC__ into D3 (if supported)
[----asleep----]
acpi_ec0: info: new max delay is 80 us
acpi_ec0: info: new max delay is 90 us
acpi attempting to switch \\_SB_.PCI0.LPC_.EC__ into D0 (if supported)
acpi succeeded putting \\_SB_.PCI0.LPC_.EC__ into D0
acpi attempting to switch \\_SB_.MEM_ into D0 (if supported)
acpi succeeded putting \\_SB_.MEM_ into D0
acpi attempting to switch \\_SB_.PCI0.LPC_.SIO_ into D0 (if supported)
acpi succeeded putting \\_SB_.PCI0.LPC_.SIO_ into D0
acpi attempting to switch \\_PR_.CPU_ into D0 (if supported)
acpi succeeded putting \\_PR_.CPU_ into D0
acpi attempting to switch \\_TZ_.THM0 into D0 (if supported)
acpi succeeded putting \\_TZ_.THM0 into D0
acpi attempting to switch \\_SB_.LID_ into D0 (if supported)
acpi succeeded putting \\_SB_.LID_ into D0
acpi attempting to switch \\_SB_.SLPB into D0 (if supported)
acpi succeeded putting \\_SB_.SLPB into D0
acpi attempting to switch \\_SB_.PCI0 into D0 (if supported)
acpi succeeded putting \\_SB_.PCI0 into D0
acpi attempting to switch \\_SB_.PCI0.LPC_.PIC_ into D0 (if supported)
acpi succeeded putting \\_SB_.PCI0.LPC_.PIC_ into D0
acpi attempting to switch \\_SB_.PCI0.LPC_.TIMR into D0 (if supported)
acpi succeeded putting \\_SB_.PCI0.LPC_.TIMR into D0
acpi attempting to switch \\_SB_.PCI0.LPC_.DMAC into D0 (if supported)
acpi succeeded putting \\_SB_.PCI0.LPC_.DMAC into D0
acpi attempting to switch \\_SB_.PCI0.LPC_.FPU_ into D0 (if supported)
acpi succeeded putting \\_SB_.PCI0.LPC_.FPU_ into D0
acpi attempting to switch \\_SB_.PCI0.LPC_.RTC_ into D0 (if supported)
acpi succeeded putting \\_SB_.PCI0.LPC_.RTC_ into D0
acpi attempting to switch \\_SB_.PCI0.LPC_.KBD_ into D0 (if supported)
acpi succeeded putting \\_SB_.PCI0.LPC_.KBD_ into D0
acpi attempting to switch \\_SB_.PCI0.LPC_.MOU_ into D0 (if supported)
acpi succeeded putting \\_SB_.PCI0.LPC_.MOU_ into D0
acpi attempting to switch \\_SB_.PCI0.LPC_.UART into D0 (if supported)
acpi succeeded putting \\_SB_.PCI0.LPC_.UART into D0
acpi attempting to switch \\_SB_.PCI0.LPC_.LPT_ into D0 (if supported)
acpi succeeded putting \\_SB_.PCI0.LPC_.LPT_ into D0
acpi attempting to switch \\_SB_.PCI0.LPC_.FIR_ into D0 (if supported)
acpi succeeded putting \\_SB_.PCI0.LPC_.FIR_ into D0
acpi attempting to switch \\_SB_.PCI0.LPC_.EC__.BAT0 into D0 (if supported)
acpi succeeded putting \\_SB_.PCI0.LPC_.EC__.BAT0 into D0
acpi attempting to switch \\_SB_.PCI0.LPC_.EC__.AC__ into D0 (if supported)
acpi succeeded putting \\_SB_.PCI0.LPC_.EC__.AC__ into D0
ata1-slave: FAILURE - ATAPI_IDENTIFY timed out
ata1-slave: FAILURE - ATAPI_IDENTIFY timed out
acpi_cmbat0: battery initialization start
acpi_cmbat0: battery initialization done, tried 1 times
einfaches Textdokument-Anlage (acpi_pwr.diff)
Index: sys/dev/acpica/acpi.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/acpica/acpi.c,v
retrieving revision 1.193
diff -u -r1.193 acpi.c
--- sys/dev/acpica/acpi.c 13 Oct 2004 07:29:29 -0000 1.193
+++ sys/dev/acpica/acpi.c 20 Nov 2004 03:13:45 -0000
@@ -59,6 +59,10 @@
#include <dev/acpica/acpiio.h>
#include <contrib/dev/acpica/acnamesp.h>
+#include "pci_if.h"
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pci_private.h>
+
MALLOC_DEFINE(M_ACPIDEV, "acpidev", "ACPI devices");
/* Hooks for the ACPI CA debugging infrastructure */
@@ -87,10 +91,13 @@
static void acpi_identify(driver_t *driver, device_t parent);
static int acpi_probe(device_t dev);
static int acpi_attach(device_t dev);
+static int acpi_suspend(device_t dev);
+static int acpi_resume(device_t dev);
static int acpi_shutdown(device_t dev);
static device_t acpi_add_child(device_t bus, int order, const char *name,
int unit);
static int acpi_print_child(device_t bus, device_t child);
+static void acpi_probe_nomatch(device_t bus, device_t child);
static int acpi_read_ivar(device_t dev, device_t child, int index,
uintptr_t *result);
static int acpi_write_ivar(device_t dev, device_t child, int index,
@@ -110,10 +117,14 @@
static ACPI_STATUS acpi_device_eval_obj(device_t bus, device_t dev,
ACPI_STRING pathname, ACPI_OBJECT_LIST *parameters,
ACPI_BUFFER *ret);
+static int acpi_device_pwr_for_sleep(device_t bus, device_t dev,
+ int *dstate);
static ACPI_STATUS acpi_device_scan_cb(ACPI_HANDLE h, UINT32 level,
void *context, void **retval);
static ACPI_STATUS acpi_device_scan_children(device_t bus, device_t dev,
int max_depth, acpi_scan_cb_t user_fn, void *arg);
+static int acpi_set_powerstate_method(device_t bus, device_t child,
+ int state);
static int acpi_isa_pnp_probe(device_t bus, device_t child,
struct isa_pnp_id *ids);
static void acpi_probe_children(device_t bus);
@@ -145,12 +156,13 @@
DEVMETHOD(device_attach, acpi_attach),
DEVMETHOD(device_shutdown, acpi_shutdown),
DEVMETHOD(device_detach, bus_generic_detach),
- DEVMETHOD(device_suspend, bus_generic_suspend),
- DEVMETHOD(device_resume, bus_generic_resume),
+ DEVMETHOD(device_suspend, acpi_suspend),
+ DEVMETHOD(device_resume, acpi_resume),
/* Bus interface */
DEVMETHOD(bus_add_child, acpi_add_child),
DEVMETHOD(bus_print_child, acpi_print_child),
+ DEVMETHOD(bus_probe_nomatch, acpi_probe_nomatch),
DEVMETHOD(bus_read_ivar, acpi_read_ivar),
DEVMETHOD(bus_write_ivar, acpi_write_ivar),
DEVMETHOD(bus_get_resource_list, acpi_get_rlist),
@@ -169,8 +181,12 @@
/* ACPI bus */
DEVMETHOD(acpi_id_probe, acpi_device_id_probe),
DEVMETHOD(acpi_evaluate_object, acpi_device_eval_obj),
+ DEVMETHOD(acpi_pwr_for_sleep, acpi_device_pwr_for_sleep),
DEVMETHOD(acpi_scan_children, acpi_device_scan_children),
+ /* PCI emulation */
+ DEVMETHOD(pci_set_powerstate, acpi_set_powerstate_method),
+
/* ISA emulation */
DEVMETHOD(isa_pnp_probe, acpi_isa_pnp_probe),
@@ -570,6 +586,82 @@
}
static int
+acpi_suspend(device_t dev)
+{
+ struct acpi_softc *sc;
+ ACPI_HANDLE handle;
+ char sxd[8];
+ device_t *devlist;
+ int error, i, numdevs, pstate;
+
+ /* First give child devices a chance to suspend. */
+ error = bus_generic_suspend(dev);
+ if (error)
+ return (error);
+
+ /*
+ * Now set them into the appropriate power state, usually D3. If the
+ * device has an _SxD method for the next sleep state, use that power
+ * state instead.
+ */
+ sc = device_get_softc(dev);
+ device_get_children(dev, &devlist, &numdevs);
+ for (i = 0; i < numdevs; i++) {
+ if (!device_is_attached(devlist[i]))
+ continue;
+ pstate = PCI_POWERSTATE_D3;
+ handle = acpi_get_handle(devlist[i]);
+
+ /*
+ * XXX If we find these devices, don't try to power them down.
+ * The serial and IRDA ports on my T23 hang the system when
+ * set to D3 and it appears that such legacy devices may
+ * need special handling in their drivers.
+ */
+ if (handle == NULL || acpi_MatchHid(handle, "PNP0500") ||
+ acpi_MatchHid(handle, "PNP0501") ||
+ acpi_MatchHid(handle, "PNP0502") ||
+ acpi_MatchHid(handle, "PNP0510") ||
+ acpi_MatchHid(handle, "PNP0511"))
+ continue;
+
+ /* Override next state with the value from _SxD, if present. */
+ snprintf(sxd, sizeof(sxd), "_S%dD", sc->acpi_sstate);
+ if (acpi_GetInteger(handle, sxd, &pstate) == 0)
+ printf("acpi: _SxD is D%d\n", pstate);
+ if (pstate < PCI_POWERSTATE_D0 || pstate > PCI_POWERSTATE_D3)
+ pstate = PCI_POWERSTATE_D3;
+
+ pci_set_powerstate(devlist[i], pstate);
+ }
+ free(devlist, M_TEMP);
+ error = 0;
+
+ return (error);
+}
+
+static int
+acpi_resume(device_t dev)
+{
+ ACPI_HANDLE handle;
+ int i, numdevs;
+ device_t *devlist;
+
+ device_get_children(dev, &devlist, &numdevs);
+ for (i = 0; i < numdevs; i++) {
+ /* XXX */
+ handle = acpi_get_handle(devlist[i]);
+ if (handle)
+ AcpiEvaluateObject(handle, "_S0D", NULL, NULL);
+ if (device_is_attached(devlist[i]))
+ pci_set_powerstate(devlist[i], PCI_POWERSTATE_D0);
+ }
+ free(devlist, M_TEMP);
+
+ return (bus_generic_resume(dev));
+}
+
+static int
acpi_shutdown(device_t dev)
{
@@ -624,6 +716,23 @@
return (retval);
}
+static void
+acpi_probe_nomatch(device_t bus, device_t child)
+{
+
+ /*
+ * If this device is an ACPI child but no one claimed it, attempt
+ * to power it off. We'll power it back up when a driver is added.
+ *
+ * XXX Disabled for now since many necessary devices (like fdc and
+ * ATA) don't claim the devices we created for them but still expect
+ * them to be powered up.
+ */
+#if 0
+ pci_set_powerstate(child, PCI_POWERSTATE_D3);
+#endif
+}
+
/* Location hint for devctl(8) */
static int
acpi_child_location_str_method(device_t cbdev, device_t child, char *buf,
@@ -1064,6 +1173,36 @@
return (AcpiEvaluateObject(h, pathname, parameters, ret));
}
+static int
+acpi_device_pwr_for_sleep(device_t bus, device_t dev, int *dstate)
+{
+ struct acpi_softc *sc;
+ ACPI_HANDLE handle;
+ char sxd[8];
+
+ sc = device_get_softc(bus);
+ handle = acpi_get_handle(dev);
+
+ /*
+ * XXX If we find these devices, don't try to power them down.
+ * The serial and IRDA ports on my T23 hang the system when
+ * set to D3 and it appears that such legacy devices may
+ * need special handling in their drivers.
+ */
+ if (handle == NULL || acpi_MatchHid(handle, "PNP0500") ||
+ acpi_MatchHid(handle, "PNP0501") ||
+ acpi_MatchHid(handle, "PNP0502") ||
+ acpi_MatchHid(handle, "PNP0510") ||
+ acpi_MatchHid(handle, "PNP0511"))
+ return (ENXIO);
+
+ /* Override next state with the value from _SxD, if present. */
+ snprintf(sxd, sizeof(sxd), "_S%dD", sc->acpi_sstate);
+ if (acpi_GetInteger(handle, sxd, dstate) == 0)
+ printf("acpi: _SxD is D%d\n", *dstate);
+ return (0);
+}
+
/* Callback arg for our implementation of walking the namespace. */
struct acpi_device_scan_ctx {
acpi_scan_cb_t user_fn;
@@ -1138,6 +1277,50 @@
acpi_device_scan_cb, &ctx, NULL));
}
+/*
+ * Even though ACPI devices are not PCI, we use the PCI approach for setting
+ * device power states since it's close enough to ACPI.
+ */
+static int
+acpi_set_powerstate_method(device_t bus, device_t child, int state)
+{
+ ACPI_HANDLE h;
+ ACPI_STATUS status;
+ int acpi_state, error;
+
+ error = 0;
+ switch (state) {
+ case PCI_POWERSTATE_D0:
+ acpi_state = ACPI_STATE_D0;
+ break;
+ case PCI_POWERSTATE_D1:
+ acpi_state = ACPI_STATE_D1;
+ break;
+ case PCI_POWERSTATE_D2:
+ acpi_state = ACPI_STATE_D2;
+ break;
+ case PCI_POWERSTATE_D3:
+ acpi_state = ACPI_STATE_D3;
+ break;
+ default:
+ return (EINVAL);
+ }
+
+ h = acpi_get_handle(child);
+ if (h == NULL)
+ return (0);
+ printf("acpi attempting to switch %s into D%d (if supported)\n",
+ acpi_name(h), state);
+ status = acpi_pwr_switch_consumer(h, acpi_state);
+ if (ACPI_SUCCESS(status))
+ printf("acpi succeeded putting %s into D%d\n", acpi_name(h), state);
+ if (ACPI_FAILURE(status) && status != AE_NOT_FOUND)
+ device_printf(bus, "failed to set ACPI power state D%d on %s: %s\n",
+ acpi_state, acpi_name(h), AcpiFormatException(status));
+
+ return (error);
+}
+
static int
acpi_isa_pnp_probe(device_t bus, device_t child, struct isa_pnp_id *ids)
{
Index: sys/dev/acpica/acpi_if.m
===================================================================
RCS file: /home/ncvs/src/sys/dev/acpica/acpi_if.m,v
retrieving revision 1.2
diff -u -r1.2 acpi_if.m
--- sys/dev/acpica/acpi_if.m 15 Jul 2004 16:29:08 -0000 1.2
+++ sys/dev/acpica/acpi_if.m 20 Nov 2004 03:12:35 -0000
@@ -109,6 +109,26 @@
};
#
+# Get the highest power state (D0-D3) that is usable for a device when
+# suspending/resuming. If a bus calls this when suspending a device, it
+# must also call it when resuming.
+#
+# device_t bus: parent bus for the device
+#
+# device_t dev: check this device's appropriate power state
+#
+# int *dstate: if successful, contains the highest valid sleep state
+#
+# Returns: 0 on success, ESRCH if device has no special state, or
+# some other error value.
+#
+METHOD int pwr_for_sleep {
+ device_t bus;
+ device_t dev;
+ int *dstate;
+};
+
+#
# Rescan a subtree and optionally reattach devices to handles. Users
# specify a callback that is called for each ACPI_HANDLE of type Device
# that is a child of "dev".
Index: sys/dev/pci/pci.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/pci/pci.c,v
retrieving revision 1.268
diff -u -r1.268 pci.c
--- sys/dev/pci/pci.c 10 Nov 2004 00:41:39 -0000 1.268
+++ sys/dev/pci/pci.c 20 Nov 2004 03:01:10 -0000
@@ -60,6 +60,10 @@
#include "pcib_if.h"
#include "pci_if.h"
+#include <contrib/dev/acpica/acpi.h>
+#include <dev/acpica/acpivar.h>
+#include "acpi_if.h"
+
static uint32_t pci_mapbase(unsigned mapreg);
static int pci_maptype(unsigned mapreg);
static int pci_mapsize(unsigned testval);
@@ -1016,22 +1020,29 @@
int
pci_suspend(device_t dev)
{
- int numdevs;
- device_t *devlist;
- device_t child;
+ int dstate, i, numdevs;
+ device_t acpi_dev, child, *devlist;
struct pci_devinfo *dinfo;
- int i;
/*
- * Save the pci configuration space for each child. We don't need
- * to do this, unless the BIOS suspend code powers down the bus and
- * the devices on the bus.
+ * Save the PCI configuration space for each child and set the
+ * device in the appropriate power state for this sleep state.
*/
+ acpi_dev = devclass_get_device(devclass_find("acpi"), 0);
device_get_children(dev, &devlist, &numdevs);
for (i = 0; i < numdevs; i++) {
child = devlist[i];
dinfo = (struct pci_devinfo *) device_get_ivars(child);
pci_cfg_save(child, dinfo, 0);
+
+ /*
+ * Always set the device to D3. If ACPI suggests a different
+ * power state, use it instead.
+ */
+ dstate = PCI_POWERSTATE_D3;
+ if (acpi_dev != NULL)
+ ACPI_PWR_FOR_SLEEP(acpi_dev, child, &dstate);
+ pci_set_powerstate(child, dstate);
}
free(devlist, M_TEMP);
return (bus_generic_suspend(dev));
@@ -1040,18 +1051,23 @@
int
pci_resume(device_t dev)
{
- int numdevs;
- device_t *devlist;
- device_t child;
+ int i, numdevs;
+ device_t acpi_dev, child, *devlist;
struct pci_devinfo *dinfo;
- int i;
/*
- * Restore the pci configuration space for each child.
+ * Set each child to D0 and restore its PCI configuration space.
*/
+ acpi_dev = devclass_get_device(devclass_find("acpi"), 0);
device_get_children(dev, &devlist, &numdevs);
for (i = 0; i < numdevs; i++) {
+ /* Notify ACPI we're going to D0 but ignore the result. */
child = devlist[i];
+ if (acpi_dev != NULL)
+ ACPI_PWR_FOR_SLEEP(acpi_dev, child, NULL);
+ pci_set_powerstate(child, PCI_POWERSTATE_D0);
+
+ /* Now the device is powered up, restore its config space. */
dinfo = (struct pci_devinfo *) device_get_ivars(child);
pci_cfg_restore(child, dinfo);
}
