mirrors/acpica
1
0
Fork 0
mirror of https://github.com/acpica/acpica/ synced 2025-03-15 10:42:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Move invocations of _GTS and _BFS during sleep/wake.

Browse Source 
The execution of ACPI global control methods _GTS and _BFS is
currently tied to the preparation to enter a sleep state and to the
leaving of the sleep state, respectively.  However, these functions
are called before disabling the nonboot CPUs and after enabling
them, respectively (in fact, on ACPI 1.0x systems the first of them
ought to be called before suspending devices), while according to the
ACPI specification, _GTS is to be executed right prior to entering
the system sleep state and _BFS is to be executed right after the
platform firmware has returned control to the OS on wake up.

Move the execution of _GTS and _BFS to the right places.
Adds a new external function, AcpiEnterSleepStatePrep.
Rafael Wysocki.
This commit is contained in:
Robert Moore 2012-02-10 09:01:13 -08:00
parent d418fc8ca9
commit 31b81721aa
4 changed files with 222 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

237
source/components/hardware/hwsleep.c
View File

@ -126,7 +126,11 @@ AcpiHwExecuteGTS (
UINT8 SleepState);
static void
AcpiHwExecuteWakeMethods (
AcpiHwExecuteBFS (
UINT8 SleepState);
static void
AcpiHwExecuteWAK (
UINT8 SleepState);
@ -166,6 +170,79 @@ AcpiHwExecuteGTS (
}
/*******************************************************************************
*
* FUNCTION: AcpiHwExecuteBFS
*
* PARAMETERS: SleepState - Which sleep state we just exited
*
* RETURN: None
*
* DESCRIPTION: Execute the optional _BFS method (Back From Sleep)
*
******************************************************************************/
static void
AcpiHwExecuteBFS (
UINT8 SleepState)
{
ACPI_OBJECT_LIST ArgList;
ACPI_OBJECT Arg;
ACPI_STATUS Status;
/* One argument, SleepState */
ArgList.Count = 1;
ArgList.Pointer = &Arg;
Arg.Type = ACPI_TYPE_INTEGER;
Arg.Integer.Value = SleepState;
Status = AcpiEvaluateObject (NULL, METHOD_NAME__BFS, &ArgList, NULL);
if (ACPI_FAILURE (Status) && Status != AE_NOT_FOUND)
{
ACPI_EXCEPTION ((AE_INFO, Status, "While executing method _BFS"));
}
}
/*******************************************************************************
*
* FUNCTION: AcpiHwExecuteWAK
*
* PARAMETERS: SleepState - Which sleep state we just exited
*
* RETURN: None
*
* DESCRIPTION: Execute the _WAK method (System Wake)
*
******************************************************************************/
static void
AcpiHwExecuteWAK (
UINT8 SleepState)
{
ACPI_OBJECT_LIST ArgList;
ACPI_OBJECT Arg;
ACPI_STATUS Status;
/* One argument, SleepState */
ArgList.Count = 1;
ArgList.Pointer = &Arg;
Arg.Type = ACPI_TYPE_INTEGER;
Arg.Integer.Value = SleepState;
Status = AcpiEvaluateObject (NULL, METHOD_NAME__WAK, &ArgList, NULL);
if (ACPI_FAILURE (Status) && Status != AE_NOT_FOUND)
{
ACPI_EXCEPTION ((AE_INFO, Status, "While executing method _WAK"));
}
/* TBD: _WAK "sometimes" returns stuff - do we want to look at it? */
}
/*******************************************************************************
*
* FUNCTION: AcpiHwExecuteSST
@ -202,61 +279,6 @@ AcpiHwExecuteSST (
}
/*******************************************************************************
*
* FUNCTION: AcpiHwExecuteWakeMethods
*
* PARAMETERS: SleepState - Which sleep state we just exited
*
* RETURN: None
*
* DESCRIPTION: Execute optional methods associated with a wake event:
* _SST: System Status - set system indicator light
* _BFS: Back From Sleep - inform AML of the wake event
* _WAK: Wake - inform AML of the wake event
*
******************************************************************************/
static void
AcpiHwExecuteWakeMethods (
UINT8 SleepState)
{
ACPI_OBJECT_LIST ArgList;
ACPI_OBJECT Arg;
ACPI_STATUS Status;
ACPI_FUNCTION_TRACE (HwExecuteWakeMethods);
AcpiHwExecuteSST (ACPI_SST_WAKING);
/* Setup parameter object */
ArgList.Count = 1;
ArgList.Pointer = &Arg;
Arg.Type = ACPI_TYPE_INTEGER;
Arg.Integer.Value = SleepState;
/* These methods have the same SleepState argument */
Status = AcpiEvaluateObject (NULL, METHOD_NAME__BFS, &ArgList, NULL);
if (ACPI_FAILURE (Status) && Status != AE_NOT_FOUND)
{
ACPI_EXCEPTION ((AE_INFO, Status, "While executing method _BFS"));
}
Status = AcpiEvaluateObject (NULL, METHOD_NAME__WAK, &ArgList, NULL);
if (ACPI_FAILURE (Status) && Status != AE_NOT_FOUND)
{
ACPI_EXCEPTION ((AE_INFO, Status, "While executing method _WAK"));
}
/* TBD: _WAK "sometimes" returns stuff - do we want to look at it? */
return_VOID;
}
#if (!ACPI_REDUCED_HARDWARE)
/*******************************************************************************
*
@ -433,19 +455,20 @@ AcpiHwLegacySleep (
/*******************************************************************************
*
* FUNCTION: AcpiHwLegacyWake
* FUNCTION: AcpiHwLegacyWakePrep
*
* PARAMETERS: SleepState - Which sleep state we just exited
*
* RETURN: Status
*
* DESCRIPTION: Perform OS-independent ACPI cleanup after a sleep
* DESCRIPTION: Perform the first state of OS-independent ACPI cleanup after a
* sleep.
* Called with interrupts ENABLED.
*
******************************************************************************/
ACPI_STATUS
AcpiHwLegacyWake (
AcpiHwLegacyWakePrep (
UINT8 SleepState)
{
ACPI_STATUS Status;
@ -455,7 +478,7 @@ AcpiHwLegacyWake (
UINT32 Pm1bControl;
ACPI_FUNCTION_TRACE (AcpiHwLegacyWake);
ACPI_FUNCTION_TRACE (HwLegacyWakePrep);
/*
* Set SLP_TYPE and SLP_EN to state S0.
@ -496,11 +519,43 @@ AcpiHwLegacyWake (
}
}
AcpiHwExecuteBFS (SleepState);
return_ACPI_STATUS (Status);
}
/*******************************************************************************
*
* FUNCTION: AcpiHwLegacyWake
*
* PARAMETERS: SleepState - Which sleep state we just exited
*
* RETURN: Status
*
* DESCRIPTION: Perform OS-independent ACPI cleanup after a sleep
* Called with interrupts ENABLED.
*
******************************************************************************/
ACPI_STATUS
AcpiHwLegacyWake (
UINT8 SleepState)
{
ACPI_STATUS Status;
ACPI_FUNCTION_TRACE (HwLegacyWake);
/* Ensure EnterSleepStatePrep -> EnterSleepState ordering */
AcpiGbl_SleepTypeA = ACPI_SLEEP_TYPE_INVALID;
AcpiHwExecuteSST (ACPI_SST_WAKING);
/*
* GPEs must be enabled before _WAK is called as GPEs
* might get fired there
*
* Restore the GPEs:
* 1) Disable/Clear all GPEs
* 2) Enable all runtime GPEs
@ -521,7 +576,7 @@ AcpiHwLegacyWake (
* Now we can execute _WAK, etc. Some machines require that the GPEs
* are enabled before the wake methods are executed.
*/
AcpiHwExecuteWakeMethods (SleepState);
AcpiHwExecuteWAK (SleepState);
/*
* Some BIOS code assumes that WAK_STS will be cleared on resume
@ -646,6 +701,46 @@ AcpiHwExtendedSleep (
}
/*******************************************************************************
*
* FUNCTION: AcpiHwExtendedWakePrep
*
* PARAMETERS: SleepState - Which sleep state we just exited
*
* RETURN: Status
*
* DESCRIPTION: Perform first part of OS-independent ACPI cleanup after
* a sleep. Called with interrupts ENABLED.
*
******************************************************************************/
ACPI_STATUS
AcpiHwExtendedWakePrep (
UINT8 SleepState)
{
ACPI_STATUS Status;
UINT8 SleepTypeValue;
ACPI_FUNCTION_TRACE (HwExtendedWakePrep);
Status = AcpiGetSleepTypeData (ACPI_STATE_S0,
&AcpiGbl_SleepTypeA, &AcpiGbl_SleepTypeB);
if (ACPI_SUCCESS (Status))
{
SleepTypeValue = ((AcpiGbl_SleepTypeA << ACPI_X_SLEEP_TYPE_POSITION) &
ACPI_X_SLEEP_TYPE_MASK);
(void) AcpiWrite ((SleepTypeValue | ACPI_X_SLEEP_ENABLE),
&AcpiGbl_FADT.SleepControl);
}
AcpiHwExecuteBFS (SleepState);
return_ACPI_STATUS (AE_OK);
}
/*******************************************************************************
*
* FUNCTION: AcpiHwExtendedWake
@ -663,31 +758,17 @@ ACPI_STATUS
AcpiHwExtendedWake (
UINT8 SleepState)
{
ACPI_STATUS Status;
UINT8 SleepTypeValue;
ACPI_FUNCTION_TRACE (HwExtendedWake);
ACPI_FUNCTION_TRACE (AcpiHwExtendedWake);
Status = AcpiGetSleepTypeData (ACPI_STATE_S0,
&AcpiGbl_SleepTypeA, &AcpiGbl_SleepTypeB);
if (ACPI_SUCCESS (Status))
{
SleepTypeValue = ((AcpiGbl_SleepTypeA << ACPI_X_SLEEP_TYPE_POSITION) &
ACPI_X_SLEEP_TYPE_MASK);
(void) AcpiWrite ((SleepTypeValue | ACPI_X_SLEEP_ENABLE),
&AcpiGbl_FADT.SleepControl);
}
/* Ensure EnterSleepStatePrep -> EnterSleepState ordering */
AcpiGbl_SleepTypeA = ACPI_SLEEP_TYPE_INVALID;
/* Execute the wake methods */
AcpiHwExecuteWakeMethods (SleepState);
AcpiHwExecuteSST (ACPI_SST_WAKING);
AcpiHwExecuteWAK (SleepState);
/*
* Some BIOS code assumes that WAK_STS will be cleared on resume

51
source/components/hardware/hwxfsleep.c
View File

@ -419,6 +419,57 @@ AcpiEnterSleepState (
ACPI_EXPORT_SYMBOL (AcpiEnterSleepState)
/*******************************************************************************
*
* FUNCTION: AcpiLeaveSleepStatePrep
*
* PARAMETERS: SleepState - Which sleep state we are exiting
*
* RETURN: Status
*
* DESCRIPTION: Perform the first state of OS-independent ACPI cleanup after a
* sleep.
* Called with interrupts DISABLED.
*
******************************************************************************/
ACPI_STATUS
AcpiLeaveSleepStatePrep (
UINT8 SleepState)
{
ACPI_STATUS Status;
ACPI_FUNCTION_TRACE (AcpiLeaveSleepState);
#if (!ACPI_REDUCED_HARDWARE)
/* If Hardware Reduced flag is set, must use the extended sleep registers */
if (AcpiGbl_ReducedHardware ||
AcpiGbl_FADT.SleepControl.Address)
{
Status = AcpiHwExtendedWakePrep (SleepState);
}
else
{
/* Legacy sleep */
Status = AcpiHwLegacyWakePrep (SleepState);
}
#else
Status = AcpiHwExtendedWakePrep (SleepState);
#endif /* !ACPI_REDUCED_HARDWARE */
return_ACPI_STATUS (Status);
}
ACPI_EXPORT_SYMBOL (AcpiLeaveSleepStatePrep)
/*******************************************************************************
*
* FUNCTION: AcpiLeaveSleepState

8
source/include/achware.h
View File

@ -196,10 +196,18 @@ ACPI_STATUS
AcpiHwLegacySleep (
UINT8 SleepState);
ACPI_STATUS
AcpiHwExtendedWakePrep (
UINT8 SleepState);
ACPI_STATUS
AcpiHwExtendedWake (
UINT8 SleepState);
ACPI_STATUS
AcpiHwLegacyWakePrep (
UINT8 SleepState);
ACPI_STATUS
AcpiHwLegacyWake (
UINT8 SleepState);

4
source/include/acpixf.h
View File

@ -753,6 +753,10 @@ ACPI_STATUS \
AcpiEnterSleepStateS4bios ( \
void))
ACPI_STATUS
AcpiLeaveSleepStatePrep (
UINT8 SleepState);
ACPI_STATUS
AcpiLeaveSleepState (
UINT8 SleepState);