d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a function to reset system time after resuming, which will be used

Browse Source 
by amd64 shortly.  It can be turned off by setting "debug.acpi.reset_clock"
tunable to zero.
This commit is contained in:
jkim 2009-03-23 22:12:33 +00:00
parent 9ece6c032d
commit a4268466ee
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sys/dev/acpica/acpi.c
View File

@ -254,6 +254,12 @@ TUNABLE_INT("debug.acpi.do_powerstate", &acpi_do_powerstate);
SYSCTL_INT(_debug_acpi, OID_AUTO, do_powerstate, CTLFLAG_RW,
&acpi_do_powerstate, 1, "Turn off devices when suspending.");
/* 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.");
/* Allow users to override quirks. */
TUNABLE_INT("debug.acpi.quirks", &acpi_quirks);
@ -2596,10 +2602,6 @@ acpi_EnterSleepState(struct acpi_softc *sc, int state)
mtx_unlock(&Giant);
/* Warm up timecounter again */
(void)timecounter->tc_get_timecount(timecounter);
(void)timecounter->tc_get_timecount(timecounter);
#ifdef SMP
thread_lock(curthread);
sched_unbind(curthread);
@ -2617,6 +2619,21 @@ acpi_EnterSleepState(struct acpi_softc *sc, int state)
return_ACPI_STATUS (status);
}
void
acpi_resync_clock(struct acpi_softc *sc)
{
if (!acpi_reset_clock)
return;
/*
* Warm up timecounter again and reset system clock.
*/
(void)timecounter->tc_get_timecount(timecounter);
(void)timecounter->tc_get_timecount(timecounter);
inittodr(time_second + sc->acpi_sleep_delay);
}
/* Initialize a device's wake GPE. */
int
acpi_wake_init(device_t dev, int type)

1
sys/dev/acpica/acpivar.h
View File

@ -330,6 +330,7 @@ ACPI_STATUS acpi_SetIntrModel(int model);
int acpi_ReqSleepState(struct acpi_softc *sc, int state);
int acpi_AckSleepState(struct apm_clone_data *clone, int error);
ACPI_STATUS acpi_SetSleepState(struct acpi_softc *sc, int state);
void acpi_resync_clock(struct acpi_softc *sc);
int acpi_wake_init(device_t dev, int type);
int acpi_wake_set_enable(device_t dev, int enable);
int acpi_parse_prw(ACPI_HANDLE h, struct acpi_prw_data *prw);