On Wednesday, 9 May 2007 21:22, David Brownell wrote:
> Provide new ACPI method tracking the target system state, for use
> during suspend() and other PM calls. It returns ACPI_STATE_S0
> except during true suspend paths.
>
> Use that to finally implement the platform_pci_choose_state() hook
> on ACPI platforms. It calls "_S3D" and similar methods, and uses
> the result appropriately.
>
> Fix pci_choose_state() to finally behave sanely too.
>
> Minor whitespace fixes.
>
> Lightly tested -- STR only, with only USB affected by the new code.
>
> Signed-off-by: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx>
>
> ---
> drivers/acpi/sleep/main.c | 29 +++++++++++-
> drivers/pci/pci-acpi.c | 107 +++++++++++++++++++++++++++++++++-------------
> drivers/pci/pci.c | 51 ++++++++++++---------
> include/acpi/acpixf.h | 2
> 4 files changed, 135 insertions(+), 54 deletions(-)
>
> --- g26.orig/include/acpi/acpixf.h 2007-05-09 08:57:37.000000000 -0700
> +++ g26/include/acpi/acpixf.h 2007-05-09 08:58:33.000000000 -0700
> @@ -329,6 +329,8 @@ acpi_get_sleep_type_data(u8 sleep_state,
>
> acpi_status acpi_enter_sleep_state_prep(u8 sleep_state);
>
> +int acpi_get_target_sleep_state(void);
> +
> acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state);
>
> acpi_status asmlinkage acpi_enter_sleep_state_s4bios(void);
> --- g26.orig/drivers/acpi/sleep/main.c 2007-05-09 08:57:37.000000000 -0700
> +++ g26/drivers/acpi/sleep/main.c 2007-05-09 08:58:33.000000000 -0700
> @@ -35,6 +35,20 @@ static u32 acpi_suspend_states[] = {
>
> static int init_8259A_after_S1;
>
> +static u8 acpi_target_sleep_state = ACPI_STATE_S0;
> +
> +/**
> + * acpi_get_target_sleep_state - return target ACPI S-state
> + *
> + * When used during suspend processing, this returns the target state
> + * such as ACPI_STATE_S3. Otherwise it returns ACPI_STATE_S0.
> + */
> +int acpi_get_target_sleep_state(void)
> +{
> + return acpi_target_sleep_state;
> +}
> +/* EXPORT_SYMBOL(acpi_get_target_sleep_state); ... if you need it */
> +
> /**
> * acpi_pm_prepare - Do preliminary suspend work.
> * @pm_state: suspend state we're entering.
> @@ -50,12 +64,16 @@ extern void acpi_power_off(void);
> static int acpi_pm_prepare(suspend_state_t pm_state)
> {
> u32 acpi_state = acpi_suspend_states[pm_state];
> + int status;
>
> if (!sleep_states[acpi_state]) {
> printk("acpi_pm_prepare does not support %d \n", pm_state);
> return -EPERM;
> }
> - return acpi_sleep_prepare(acpi_state);
> + status = acpi_sleep_prepare(acpi_state);
> + if (status == 0)
> + acpi_target_sleep_state = acpi_state;
> + return status;
> }
I guess we'll need an analogous change for the hibernation too?
Rafael
-
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
