summaryrefslogtreecommitdiffstats
path: root/sys/dev/acpica/acpi.c
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2012-02-08 21:23:20 +0000
committerjkim <jkim@FreeBSD.org>2012-02-08 21:23:20 +0000
commit2966d74a6b934b078878f2c02e76a03b1f150013 (patch)
tree8cdfe7daa46f8eb3f6b34ed242142f085555c97c /sys/dev/acpica/acpi.c
parent234d88c28880ea3d9014955d1d8c6d90d043c878 (diff)
downloadFreeBSD-src-2966d74a6b934b078878f2c02e76a03b1f150013.zip
FreeBSD-src-2966d74a6b934b078878f2c02e76a03b1f150013.tar.gz
Reset clock after atrtc(4) is properly resumed.
Diffstat (limited to 'sys/dev/acpica/acpi.c')
-rw-r--r--sys/dev/acpica/acpi.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c
index 88bd5d1..c613461 100644
--- a/sys/dev/acpica/acpi.c
+++ b/sys/dev/acpica/acpi.c
@@ -152,6 +152,7 @@ static ACPI_STATUS acpi_EnterSleepState(struct acpi_softc *sc, int state);
static void acpi_shutdown_final(void *arg, int howto);
static void acpi_enable_fixed_events(struct acpi_softc *sc);
static BOOLEAN acpi_has_hid(ACPI_HANDLE handle);
+static void acpi_resync_clock(struct acpi_softc *sc);
static int acpi_wake_sleep_prep(ACPI_HANDLE handle, int sstate);
static int acpi_wake_run_prep(ACPI_HANDLE handle, int sstate);
static int acpi_wake_prep_walk(int sstate);
@@ -277,11 +278,13 @@ TUNABLE_INT("debug.acpi.interpreter_slack", &acpi_interpreter_slack);
SYSCTL_INT(_debug_acpi, OID_AUTO, interpreter_slack, CTLFLAG_RDTUN,
&acpi_interpreter_slack, 1, "Turn on interpreter slack mode.");
+#ifdef __amd64__
/* Reset system clock while resuming. XXX Remove once tested. */
static int acpi_reset_clock = 1;
TUNABLE_INT("debug.acpi.reset_clock", &acpi_reset_clock);
SYSCTL_INT(_debug_acpi, OID_AUTO, reset_clock, CTLFLAG_RW,
&acpi_reset_clock, 1, "Reset system clock while resuming.");
+#endif
/* Allow users to override quirks. */
TUNABLE_INT("debug.acpi.quirks", &acpi_quirks);
@@ -2741,8 +2744,10 @@ backout:
AcpiLeaveSleepState(state);
if (slp_state >= ACPI_SS_DEV_SUSPEND)
DEVICE_RESUME(root_bus);
- if (slp_state >= ACPI_SS_SLEPT)
+ if (slp_state >= ACPI_SS_SLEPT) {
+ acpi_resync_clock(sc);
acpi_enable_fixed_events(sc);
+ }
sc->acpi_next_sstate = 0;
mtx_unlock(&Giant);
@@ -2765,10 +2770,10 @@ backout:
return_ACPI_STATUS (status);
}
-void
+static void
acpi_resync_clock(struct acpi_softc *sc)
{
-
+#ifdef __amd64__
if (!acpi_reset_clock)
return;
@@ -2778,6 +2783,7 @@ acpi_resync_clock(struct acpi_softc *sc)
(void)timecounter->tc_get_timecount(timecounter);
(void)timecounter->tc_get_timecount(timecounter);
inittodr(time_second + sc->acpi_sleep_delay);
+#endif
}
/* Enable or disable the device's wake GPE. */
OpenPOWER on IntegriCloud