On Monday, 7 of January 2008, Len Brown wrote:
> On Saturday 05 January 2008 17:41, Rafael J. Wysocki wrote:
> > From: Rafael J. Wysocki <rjw@xxxxxxx>
> >
> > 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
> > platfor firmware has returned control to the OS on wake up.
>
>
> ACPI 1.0 systems don't have _GTS or _BFS -- they were added
> as optional control methods starting in ACPI 2.0.
>
> The ACPI 1.0 installed base of Windows by definition could
> not have invoked them -- so vendors could not have possibly
> made their invocation mandatory w/o adding special handling
> fro the installed base. I guess they never found a reason
> to do this, because I've not yet seen a BIOS that implements them.
>
> So the patch looks good, but Linux support for _GTS and _BFS
> is purely academic at this point.
>
> Rafael,
> Do you grant Intel permission to incorporate this change
> into the upstream ACPICA source base and ship it under
> the the ACPICA source license to all ACPICA customers?
Sure, I do.
Thanks,
Rafael
> > Move the execution of _GTS and _BFS to the right places.
> >
> > Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
> > Acked-by: Pavel Machek <pavel@xxxxxxx>
> > ---
> > drivers/acpi/hardware/hwsleep.c | 75 ++++++++++++++++++++++++++++++----------
> > drivers/acpi/sleep/main.c | 7 +++
> > include/acpi/acpixf.h | 2 +
> > 3 files changed, 66 insertions(+), 18 deletions(-)
> >
> > Index: linux-2.6/drivers/acpi/hardware/hwsleep.c
> > ===================================================================
> > --- linux-2.6.orig/drivers/acpi/hardware/hwsleep.c
> > +++ linux-2.6/drivers/acpi/hardware/hwsleep.c
> > @@ -192,18 +192,13 @@ acpi_status acpi_enter_sleep_state_prep(
> > arg.type = ACPI_TYPE_INTEGER;
> > arg.integer.value = sleep_state;
> >
> > - /* Run the _PTS and _GTS methods */
> > + /* Run the _PTS method */
> >
> > status = acpi_evaluate_object(NULL, METHOD_NAME__PTS, &arg_list, NULL);
> > if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
> > return_ACPI_STATUS(status);
> > }
> >
> > - status = acpi_evaluate_object(NULL, METHOD_NAME__GTS, &arg_list, NULL);
> > - if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
> > - return_ACPI_STATUS(status);
> > - }
> > -
> > /* Setup the argument to _SST */
> >
> > switch (sleep_state) {
> > @@ -262,6 +257,8 @@ acpi_status asmlinkage acpi_enter_sleep_
> > struct acpi_bit_register_info *sleep_type_reg_info;
> > struct acpi_bit_register_info *sleep_enable_reg_info;
> > u32 in_value;
> > + struct acpi_object_list arg_list;
> > + union acpi_object arg;
> > acpi_status status;
> >
> > ACPI_FUNCTION_TRACE(acpi_enter_sleep_state);
> > @@ -307,6 +304,18 @@ acpi_status asmlinkage acpi_enter_sleep_
> > return_ACPI_STATUS(status);
> > }
> >
> > + /* Execute the _GTS method */
> > +
> > + arg_list.count = 1;
> > + arg_list.pointer = &arg;
> > + arg.type = ACPI_TYPE_INTEGER;
> > + arg.integer.value = sleep_state;
> > +
> > + status = acpi_evaluate_object(NULL, METHOD_NAME__GTS, &arg_list, NULL);
> > + if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
> > + return_ACPI_STATUS(status);
> > + }
> > +
> > /* Get current value of PM1A control */
> >
> > status = acpi_hw_register_read(ACPI_REGISTER_PM1_CONTROL, &PM1Acontrol);
> > @@ -473,17 +482,18 @@ ACPI_EXPORT_SYMBOL(acpi_enter_sleep_stat
> >
> > /*******************************************************************************
> > *
> > - * FUNCTION: acpi_leave_sleep_state
> > + * FUNCTION: acpi_leave_sleep_state_prep
> > *
> > - * PARAMETERS: sleep_state - Which sleep state we just exited
> > + * PARAMETERS: sleep_state - Which sleep state we are exiting
> > *
> > * RETURN: Status
> > *
> > - * DESCRIPTION: Perform OS-independent ACPI cleanup after a sleep
> > - * Called with interrupts ENABLED.
> > + * DESCRIPTION: Perform the first state of OS-independent ACPI cleanup after a
> > + * sleep.
> > + * Called with interrupts DISABLED.
> > *
> > ******************************************************************************/
> > -acpi_status acpi_leave_sleep_state(u8 sleep_state)
> > +acpi_status acpi_leave_sleep_state_prep(u8 sleep_state)
> > {
> > struct acpi_object_list arg_list;
> > union acpi_object arg;
> > @@ -493,7 +503,7 @@ acpi_status acpi_leave_sleep_state(u8 sl
> > u32 PM1Acontrol;
> > u32 PM1Bcontrol;
> >
> > - ACPI_FUNCTION_TRACE(acpi_leave_sleep_state);
> > + ACPI_FUNCTION_TRACE(acpi_leave_sleep_state_prep);
> >
> > /*
> > * Set SLP_TYPE and SLP_EN to state S0.
> > @@ -540,6 +550,41 @@ acpi_status acpi_leave_sleep_state(u8 sl
> > }
> > }
> >
> > + /* Execute the _BFS method */
> > +
> > + arg_list.count = 1;
> > + arg_list.pointer = &arg;
> > + arg.type = ACPI_TYPE_INTEGER;
> > + arg.integer.value = sleep_state;
> > +
> > + status = acpi_evaluate_object(NULL, METHOD_NAME__BFS, &arg_list, NULL);
> > + if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
> > + ACPI_EXCEPTION((AE_INFO, status, "During Method _BFS"));
> > + }
> > +
> > + return_ACPI_STATUS(status);
> > +}
> > +
> > +/*******************************************************************************
> > + *
> > + * FUNCTION: acpi_leave_sleep_state
> > + *
> > + * PARAMETERS: sleep_state - Which sleep state we just exited
> > + *
> > + * RETURN: Status
> > + *
> > + * DESCRIPTION: Perform OS-independent ACPI cleanup after a sleep
> > + * Called with interrupts ENABLED.
> > + *
> > + ******************************************************************************/
> > +acpi_status acpi_leave_sleep_state(u8 sleep_state)
> > +{
> > + struct acpi_object_list arg_list;
> > + union acpi_object arg;
> > + acpi_status status;
> > +
> > + ACPI_FUNCTION_TRACE(acpi_leave_sleep_state);
> > +
> > /* Ensure enter_sleep_state_prep -> enter_sleep_state ordering */
> >
> > acpi_gbl_sleep_type_a = ACPI_SLEEP_TYPE_INVALID;
> > @@ -558,12 +603,6 @@ acpi_status acpi_leave_sleep_state(u8 sl
> > ACPI_EXCEPTION((AE_INFO, status, "During Method _SST"));
> > }
> >
> > - arg.integer.value = sleep_state;
> > - status = acpi_evaluate_object(NULL, METHOD_NAME__BFS, &arg_list, NULL);
> > - if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
> > - ACPI_EXCEPTION((AE_INFO, status, "During Method _BFS"));
> > - }
> > -
> > /*
> > * GPEs must be enabled before _WAK is called as GPEs
> > * might get fired there
> > Index: linux-2.6/drivers/acpi/sleep/main.c
> > ===================================================================
> > --- linux-2.6.orig/drivers/acpi/sleep/main.c
> > +++ linux-2.6/drivers/acpi/sleep/main.c
> > @@ -139,6 +139,9 @@ static int acpi_pm_enter(suspend_state_t
> > break;
> > }
> >
> > + /* Reprogram control registers and execute _BFS */
> > + acpi_leave_sleep_state_prep(acpi_state);
> > +
> > /* ACPI 3.0 specs (P62) says that it's the responsabilty
> > * of the OSPM to clear the status bit [ implying that the
> > * POWER_BUTTON event should not reach userspace ]
> > @@ -272,6 +275,8 @@ static int acpi_hibernation_enter(void)
> > acpi_enable_wakeup_device(ACPI_STATE_S4);
> > /* This shouldn't return. If it returns, we have a problem */
> > status = acpi_enter_sleep_state(ACPI_STATE_S4);
> > + /* Reprogram control registers and execute _BFS */
> > + acpi_leave_sleep_state_prep(ACPI_STATE_S4);
> > local_irq_restore(flags);
> >
> > return ACPI_SUCCESS(status) ? 0 : -EFAULT;
> > @@ -284,6 +289,8 @@ static void acpi_hibernation_leave(void)
> > * enable it here.
> > */
> > acpi_enable();
> > + /* Reprogram control registers and execute _BFS */
> > + acpi_leave_sleep_state_prep(ACPI_STATE_S4);
> > }
> >
> > static void acpi_hibernation_finish(void)
> > Index: linux-2.6/include/acpi/acpixf.h
> > ===================================================================
> > --- linux-2.6.orig/include/acpi/acpixf.h
> > +++ linux-2.6/include/acpi/acpixf.h
> > @@ -335,6 +335,8 @@ acpi_status asmlinkage acpi_enter_sleep_
> >
> > acpi_status asmlinkage acpi_enter_sleep_state_s4bios(void);
> >
> > +acpi_status acpi_leave_sleep_state_prep(u8 sleep_state);
> > +
> > acpi_status acpi_leave_sleep_state(u8 sleep_state);
> >
> > #endif /* __ACXFACE_H__ */
> >
> > -
> > To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> > the body of a message to majordomo@xxxxxxxxxxxxxxx
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
> >
-
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
