PM / ACPI: sleep: Additional changes related to suspend-to-idle
Subsystems (4)
v2 cover PM / ACPI: sleep: Additional changes related to suspend-to-idle
Hi All,
Quoted 7 lines
On top of the "Simplify the suspend-to-idle control flow" patch series posted previously:
https://lore.kernel.org/lkml/71085220.z6FKkvYQPX@kreacher/
sanitize the suspend-to-idle flow even further.
Quoted 8 lines
First off, decouple EC wakeup from the LPS0
_DSMprocessing (patch 1).Next, reorder the code to invoke LPS0
_DSMFunctions 5 and 6 in the specification-compliant order with respect to suspending and resuming devices (patch 2).Finally, rearrange
lps0_device_attach()(patch 3) and add a command line switch to prevent the LPS0_DSMfrom being used.
The v2 is because I found a (minor) bug in patch 1, decided to use a module parameter instead of a kernel command line option in patch 4. Also, there are 4 new patches:
Patch 5: Switch the EC over to polling during "noirq" suspend and back during "noirq" resume.
Patch 6: Eliminate acpi_sleep_no_ec_events().
Patch 7: Consolidate some EC code depending on PM_SLEEP.
Patch 8: Add EC GPE dispatching debug message.
Please refer to the changelogs for details.
Thanks,
Rafael
PATCH v2 1/8 ACPI: PM: Set up EC GPE for system wakeup from drivers that need it
From: Rafael J. Wysocki <[email protected]>
The EC GPE needs to be set up for system wakeup only if there is a driver depending on it, either intel-hid or intel-vbtn, bound to a button device that is expected to wake up the system from sleep (such as the power button on some Dell systems, like the XPS13 9360). It doesn't need to be set up for waking up the system from sleep in any other cases and whether or not it is expected to wake up the system from sleep doesn't depend on whether or not the LPS0 device is present in the ACPI namespace.
For this reason, rearrange the ACPI suspend-to-idle code to make the drivers depending on the EC GPE wakeup take care of setting it up and decouple that from the LPS0 device handling.
While at it, make intel-hid and intel-vbtn prepare for system wakeup only if they are allowed to wake up the system from sleep by user space (via sysfs).
[Note that acpi_ec_mark_gpe_for_wake() and acpi_ec_set_gpe_wake_mask()
are there to prevent the EC GPE from being disabled by the acpi_enable_all_wakeup_gpes() call in acpi_s2idle_prepare(), so on systems with either intel-hid or intel-vbtn this change doesn't affect any interactions with the hardware or platform firmware.]
---
-> v2: Drop the lps0_device_handle check from acpi_sleep_no_ec_events()
and add R-by from Andy.
--- drivers/acpi/ec.c | 7 ++++++- drivers/acpi/internal.h | 2 -- drivers/acpi/sleep.c | 13 ++----------- drivers/platform/x86/intel-hid.c | 20 ++++++++++++++++---- drivers/platform/x86/intel-vbtn.c | 20 ++++++++++++++++---- include/linux/acpi.h | 4 ++++ include/linux/suspend.h | 1 + 7 files changed, 45 insertions(+), 22 deletions(-)
drivers/acpi/internal.h +0 -2
@@ -194,8 +194,6 @@ void acpi_ec_ecdt_probe(void);void acpi_ec_dsdt_probe (void );void acpi_ec_block_transactions (void );void acpi_ec_unblock_transactions (void ); -void acpi_ec_mark_gpe_for_wake (void ); -void acpi_ec_set_gpe_wake_mask (u8 action);bool acpi_ec_dispatch_gpe (void ); int acpi_ec_add_query_handler(struct acpi_ec *ec, u8 query_bit, acpi_handle handle, acpi_ec_query_func func,
drivers/platform/x86/intel-hid.c +16 -4
@@ -253,9 +253,12 @@ static void intel_button_array_enable(ststatic int intel_hid_pm_prepare (struct device *device) { -struct intel_hid_priv *priv =dev_get_drvdata (device); +if (device_may_wakeup (device)) { +struct intel_hid_priv *priv =dev_get_drvdata (device); - priv->wakeup_mode = true; + priv->wakeup_mode = true; +acpi_ec_set_gpe_wake_mask (ACPI_GPE_ENABLE ); + }return 0 ; }
@@ -270,9 +273,12 @@ static int intel_hid_pl_suspend_handler(static int intel_hid_pl_resume_handler (struct device *device) { -struct intel_hid_priv *priv =dev_get_drvdata (device); +if (device_may_wakeup (device)) { +struct intel_hid_priv *priv =dev_get_drvdata (device); - priv->wakeup_mode = false; +acpi_ec_set_gpe_wake_mask (ACPI_GPE_DISABLE ); + priv->wakeup_mode = false; + }if (pm_resume_via_firmware ()) {intel_hid_set_enable (device, true);intel_button_array_enable (device, true);
@@ -491,6 +497,12 @@ static int intel_hid_probe(struct platfo }device_init_wakeup (&device->dev, true); +/* +* In order for system wakeup to work, the EC GPE has to be marked as +* a wakeup one, so do that here (this setting will persist, but it has +* no effect until the wakeup mask is set for the EC GPE). +*/ +acpi_ec_mark_gpe_for_wake ();return 0 ; err_remove_notify:
drivers/platform/x86/intel-vbtn.c +16 -4
@@ -176,6 +176,12 @@ static int intel_vbtn_probe(struct platfreturn -EBUSY ;device_init_wakeup (&device->dev, true); +/* +* In order for system wakeup to work, the EC GPE has to be marked as +* a wakeup one, so do that here (this setting will persist, but it has +* no effect until the wakeup mask is set for the EC GPE). +*/ +acpi_ec_mark_gpe_for_wake ();return 0 ; }
@@ -195,17 +201,23 @@ static int intel_vbtn_remove(struct platstatic int intel_vbtn_pm_prepare (struct device *dev) { -struct intel_vbtn_priv *priv =dev_get_drvdata (dev); +if (device_may_wakeup (dev)) { +struct intel_vbtn_priv *priv =dev_get_drvdata (dev); - priv->wakeup_mode = true; + priv->wakeup_mode = true; +acpi_ec_set_gpe_wake_mask (ACPI_GPE_ENABLE ); + }return 0 ; }static int intel_vbtn_pm_resume (struct device *dev) { -struct intel_vbtn_priv *priv =dev_get_drvdata (dev); +if (device_may_wakeup (dev)) { +struct intel_vbtn_priv *priv =dev_get_drvdata (dev); - priv->wakeup_mode = false; +acpi_ec_set_gpe_wake_mask (ACPI_GPE_DISABLE ); + priv->wakeup_mode = false; + }return 0 ; }
include/linux/acpi.h +4 -0
@@ -931,6 +931,8 @@ int acpi_subsys_suspend_noirq(struct devint acpi_subsys_suspend (struct device *dev);int acpi_subsys_freeze (struct device *dev);int acpi_subsys_poweroff (struct device *dev); +void acpi_ec_mark_gpe_for_wake (void ); +void acpi_ec_set_gpe_wake_mask (u8 action);#else static inline int acpi_subsys_prepare (struct device *dev) {return 0 ; }static inline void acpi_subsys_complete (struct device *dev) {}
@@ -939,6 +941,8 @@ static inline int acpi_subsys_suspend_nostatic inline int acpi_subsys_suspend (struct device *dev) {return 0 ; }static inline int acpi_subsys_freeze (struct device *dev) {return 0 ; }static inline int acpi_subsys_poweroff (struct device *dev) {return 0 ; } +static inline void acpi_ec_mark_gpe_for_wake (void ) {} +static inline void acpi_ec_set_gpe_wake_mask (u8 action) {}#endif #ifdef CONFIG_ACPI
drivers/acpi/ec.c +6 -1
@@ -25,6 +25,7 @@#include <linux/list.h> #include <linux/spinlock.h> #include <linux/slab.h> +#include <linux/suspend.h> #include <linux/acpi.h> #include <linux/dmi.h> #include <asm/io.h>
@@ -1048,17 +1049,21 @@ void acpi_ec_unblock_transactions(void)acpi_ec_start (first_ec, true); } +#ifdef CONFIG_PM_SLEEP void acpi_ec_mark_gpe_for_wake (void ) {if (first_ec && !ec_no_wakeup)acpi_mark_gpe_for_wake (NULL , first_ec->gpe); } +EXPORT_SYMBOL_GPL (acpi_ec_mark_gpe_for_wake);void acpi_ec_set_gpe_wake_mask (u8 action) { -if (first_ec && !ec_no_wakeup) +if (pm_suspend_no_platform () && first_ec && !ec_no_wakeup)acpi_set_gpe_wake_mask (NULL , first_ec->gpe, action); } +EXPORT_SYMBOL_GPL (acpi_ec_set_gpe_wake_mask); +#endif bool acpi_ec_dispatch_gpe (void ) {
drivers/acpi/sleep.c +2 -11
@@ -930,8 +930,6 @@ static int lps0_device_attach(struct acpacpi_handle_debug (adev->handle,"_DSM function mask: 0x%x\n" , bitmask); - -acpi_ec_mark_gpe_for_wake (); }else {acpi_handle_debug (adev->handle,"_DSM function 0 evaluation failed\n" );
@@ -960,8 +958,6 @@ static int acpi_s2idle_prepare(void)if (lps0_device_handle) {acpi_sleep_run_lps0_dsm (ACPI_LPS0_SCREEN_OFF );acpi_sleep_run_lps0_dsm (ACPI_LPS0_ENTRY ); - -acpi_ec_set_gpe_wake_mask (ACPI_GPE_ENABLE ); }if (acpi_sci_irq_valid ())
@@ -979,10 +975,7 @@ static int acpi_s2idle_prepare(void)static void acpi_s2idle_wake (void ) { -if (!lps0_device_handle) -return ; - -if (pm_debug_messages_on) +if (lps0_device_handle && pm_debug_messages_on)lpi_check_constraints ();/*
@@ -1031,8 +1024,6 @@ static void acpi_s2idle_restore(void)disable_irq_wake (acpi_sci_irq);if (lps0_device_handle) { -acpi_ec_set_gpe_wake_mask (ACPI_GPE_DISABLE ); -acpi_sleep_run_lps0_dsm (ACPI_LPS0_EXIT );acpi_sleep_run_lps0_dsm (ACPI_LPS0_SCREEN_ON ); }
@@ -1081,7 +1072,7 @@ bool acpi_s2idle_wakeup(void)bool acpi_sleep_no_ec_events (void ) { -return !s2idle_in_progress || !lps0_device_handle; +return !s2idle_in_progress; }#ifdef CONFIG_PM_SLEEP
include/linux/suspend.h +1 -0
@@ -335,6 +335,7 @@ static inline void pm_set_suspend_via_fistatic inline void pm_set_resume_via_firmware (void ) {}static inline bool pm_suspend_via_firmware (void ) {return false; }static inline bool pm_resume_via_firmware (void ) {return false; } +static inline bool pm_suspend_no_platform (void ) {return false; }static inline bool pm_suspend_default_s2idle (void ) {return false; }static inline void suspend_set_ops (const struct platform_suspend_ops *ops) {}
PATCH v2 2/8 ACPI: PM: s2idle: Execute LPS0 _DSM functions with suspended devices
In reply to Rafael J. WysockiFrom: Rafael J. Wysocki <[email protected]>
According to Section 3.5 of the "Intel Low Power S0 Idle" document [1], Function 5 of the LPS0 _DSM is expected to be invoked when the system configuration matches the criteria for entering the target low-power state of the platform. In particular, this means that all devices should be suspended and in low-power states already when that function is invoked.
This is not the case currently, however, because Function 5 of the LPS0 _DSM is invoked by it before the "noirq" phase of device suspend, which means that some devices may not have been put into low-power states yet at that point. That is a consequence of the previous design of the suspend-to-idle flow that allowed the "noirq" phase of device suspend and the "noirq" phase of device resume to be carried out for multiple times while "suspended" (if any spurious wakeup events were detected) and the point of the LPS0 _DSM Function 5 invocation was chosen so as to call it (and LPS0 _DSM Function 6 analogously) once per suspend-resume cycle (regardless of how many times the "noirq" phases of device suspend and resume were carried out while "suspended").
Now that the suspend-to-idle flow has been redesigned to carry out the "noirq" phases of device suspend and resume once in each cycle, the code can be reordered to follow the specification that it is based on more closely.
For this purpose, add ->prepare_late and ->restore_early platform callbacks for suspend-to-idle, to be executed, respectively, after the "noirq" phase of suspending devices and before the "noirq" phase of resuming them and make ACPI use them for the invocation of LPS0 _DSM functions as appropriate.
While at it, move the LPS0 entry requirements check to be made before invoking Functions 3 and 5 of the LPS0 _DSM (also once per cycle) as follows from the specification [1].
---
No changes in v2.
--- drivers/acpi/sleep.c | 36 ++++++++++++++++++++++++------------ include/linux/suspend.h | 2 ++ kernel/power/suspend.c | 12 +++++++++--- 3 files changed, 35 insertions(+), 15 deletions(-)
drivers/acpi/sleep.c +24 -12
@@ -955,11 +955,6 @@ static int acpi_s2idle_begin(void)static int acpi_s2idle_prepare (void ) { -if (lps0_device_handle) { -acpi_sleep_run_lps0_dsm (ACPI_LPS0_SCREEN_OFF ); -acpi_sleep_run_lps0_dsm (ACPI_LPS0_ENTRY ); - } -if (acpi_sci_irq_valid ())enable_irq_wake (acpi_sci_irq);
@@ -973,11 +968,22 @@ static int acpi_s2idle_prepare(void)return 0 ; } -static void acpi_s2idle_wake (void ) +static int acpi_s2idle_prepare_late (void ) { -if (lps0_device_handle && pm_debug_messages_on) +if (!lps0_device_handle) +return 0 ; + +if (pm_debug_messages_on)lpi_check_constraints (); +acpi_sleep_run_lps0_dsm (ACPI_LPS0_SCREEN_OFF ); +acpi_sleep_run_lps0_dsm (ACPI_LPS0_ENTRY ); + +return 0 ; +} + +static void acpi_s2idle_wake (void ) +{/* * If IRQD_WAKEUP_ARMED is set for the SCI at this point, the SCI has * not triggered while suspended, so bail out.
@@ -1012,6 +1018,15 @@ static void acpi_s2idle_wake(void)rearm_wake_irq (acpi_sci_irq); } +static void acpi_s2idle_restore_early (void ) +{ +if (!lps0_device_handle) +return ; + +acpi_sleep_run_lps0_dsm (ACPI_LPS0_EXIT ); +acpi_sleep_run_lps0_dsm (ACPI_LPS0_SCREEN_ON ); +} +static void acpi_s2idle_restore (void ) { s2idle_wakeup = false;
@@ -1022,11 +1037,6 @@ static void acpi_s2idle_restore(void)if (acpi_sci_irq_valid ())disable_irq_wake (acpi_sci_irq); - -if (lps0_device_handle) { -acpi_sleep_run_lps0_dsm (ACPI_LPS0_EXIT ); -acpi_sleep_run_lps0_dsm (ACPI_LPS0_SCREEN_ON ); - } }static void acpi_s2idle_end (void )
@@ -1038,7 +1048,9 @@ static void acpi_s2idle_end(void)static const struct platform_s2idle_ops acpi_s2idle_ops = { .begin = acpi_s2idle_begin, .prepare = acpi_s2idle_prepare, + .prepare_late = acpi_s2idle_prepare_late, .wake = acpi_s2idle_wake, + .restore_early = acpi_s2idle_restore_early, .restore = acpi_s2idle_restore, .end = acpi_s2idle_end, };
kernel/power/suspend.c +9 -3
@@ -253,13 +253,19 @@ static int platform_suspend_prepare_latestatic int platform_suspend_prepare_noirq (suspend_state_t state) { -return state !=PM_SUSPEND_TO_IDLE && suspend_ops->prepare_late ? - suspend_ops->prepare_late () :0 ; +if (state ==PM_SUSPEND_TO_IDLE ) { +if (s2idle_ops && s2idle_ops->prepare_late) +return s2idle_ops->prepare_late (); + } +return suspend_ops->prepare_late ? suspend_ops->prepare_late () :0 ; }static void platform_resume_noirq (suspend_state_t state) { -if (state !=PM_SUSPEND_TO_IDLE && suspend_ops->wake) +if (state ==PM_SUSPEND_TO_IDLE ) { +if (s2idle_ops && s2idle_ops->restore_early) + s2idle_ops->restore_early (); + }else if (suspend_ops->wake) suspend_ops->wake (); }
include/linux/suspend.h +2 -0
@@ -190,7 +190,9 @@ struct platform_suspend_ops {struct platform_s2idle_ops {int (*begin)(void );int (*prepare)(void ); +int (*prepare_late)(void );void (*wake)(void ); +void (*restore_early)(void );void (*restore)(void );void (*end)(void ); };
PATCH v2 3/8 PM: s2idle: Rearrange lps0_device_attach()
In reply to Rafael J. WysockiFrom: Rafael J. Wysocki <[email protected]>
To allow a subsequent change to be simpler, rearrange the code in lps0_device_attach() to reduce the indentation level and (while at it) make it avoid calling lpi_device_get_constraints() when lps0_device_handle is not going to be set.
---
No changes in v2.
--- drivers/acpi/sleep.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-)
drivers/acpi/sleep.c +17 -15
@@ -916,28 +916,30 @@ static int lps0_device_attach(struct acpguid_parse (ACPI_LPS0_DSM_UUID , &lps0_dsm_guid);/* Check if the _DSM is present and as expected. */ out_obj =acpi_evaluate_dsm (adev->handle, &lps0_dsm_guid,1 ,0 ,NULL ); -if (out_obj && out_obj->type ==ACPI_TYPE_BUFFER ) { -char bitmask = *(char *)out_obj->buffer.pointer; - - lps0_dsm_func_mask = bitmask; - lps0_device_handle = adev->handle; -/* -* Use suspend-to-idle by default if the default -* suspend mode was not set from the command line. -*/ -if (mem_sleep_default >PM_SUSPEND_MEM ) - mem_sleep_current =PM_SUSPEND_TO_IDLE ; - -acpi_handle_debug (adev->handle,"_DSM function mask: 0x%x\n" , - bitmask); - }else { +if (!out_obj || out_obj->type !=ACPI_TYPE_BUFFER ) {acpi_handle_debug (adev->handle,"_DSM function 0 evaluation failed\n" ); +return 0 ; } + + lps0_dsm_func_mask = *(char *)out_obj->buffer.pointer; +ACPI_FREE (out_obj); +acpi_handle_debug (adev->handle,"_DSM function mask: 0x%x\n" , + lps0_dsm_func_mask); + + lps0_device_handle = adev->handle; +lpi_device_get_constraints (); +/* +* Use suspend-to-idle by default if the default suspend mode was not +* set from the command line. +*/ +if (mem_sleep_default >PM_SUSPEND_MEM ) + mem_sleep_current =PM_SUSPEND_TO_IDLE ; +return 0 ; }
PATCH v2 4/8 ACPI: PM: s2idle: Add acpi.sleep_no_lps0 module parameter
In reply to Rafael J. WysockiFrom: Rafael J. Wysocki <[email protected]>
Add a module parameter to prevent the ACPI LPS0 _DSM functions from being invoked (if need be) and rework the suspend-to-idle blacklist entries in acpisleep_dmi_table[] to make them simply prevent suspend-to-idle from being used by default on the systems in question (which really is the original purpose of those entries).
---
-> v2: Patch reworked, new subject.
--- drivers/acpi/sleep.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-)
drivers/acpi/sleep.c +14 -15
@@ -89,6 +89,10 @@ bool acpi_sleep_state_supported(u8 sleep }#ifdef CONFIG_ACPI_SLEEP +static bool sleep_no_lps0__read_mostly ; +module_param (sleep_no_lps0, bool,0644 ); +MODULE_PARM_DESC (sleep_no_lps0,"Do not use the special LPS0 device interface" ); +static u32 acpi_target_sleep_state =ACPI_STATE_S0 ;u32 acpi_target_system_state (void )
@@ -158,11 +162,11 @@ static int __init init_nvs_nosave(constreturn 0 ; } -static bool acpi_sleep_no_lps0; +static bool acpi_sleep_default_s3; -static int __init init_no_lps0 (const struct dmi_system_id *d) +static int __init init_default_s3 (const struct dmi_system_id *d) { - acpi_sleep_no_lps0 = true; + acpi_sleep_default_s3 = true;return 0 ; }
@@ -363,7 +367,7 @@ static const struct dmi_system_id acpisl* S0 Idle firmware interface. */ { - .callback = init_no_lps0, + .callback = init_default_s3, .ident = "Dell XPS13 9360", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
@@ -376,7 +380,7 @@ static const struct dmi_system_id acpisl* https://bugzilla.kernel.org/show_bug.cgi?id=199057). */ { - .callback = init_no_lps0, + .callback = init_default_s3, .ident = "ThinkPad X1 Tablet(2016)", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
@@ -524,8 +528,9 @@ static void acpi_pm_end(void) acpi_sleep_tts_switch(acpi_target_sleep_state); }#else /* !CONFIG_ACPI_SLEEP */ +#define sleep_no_lps0 (1)#define acpi_target_sleep_state ACPI_STATE_S0 -#define acpi_sleep_no_lps0 (false) +#define acpi_sleep_default_s3 (1)static inline void acpi_sleep_dmi_check (void ) {}#endif /* CONFIG_ACPI_SLEEP */
@@ -904,12 +909,6 @@ static int lps0_device_attach(struct acpif (lps0_device_handle)return 0 ; -if (acpi_sleep_no_lps0) { -acpi_handle_info (adev->handle, -"Low Power S0 Idle interface disabled\n" ); -return 0 ; - } -if (!(acpi_gbl_FADT.flags &ACPI_FADT_LOW_POWER_S0 ))return 0 ;
@@ -937,7 +936,7 @@ static int lps0_device_attach(struct acp* Use suspend-to-idle by default if the default suspend mode was not * set from the command line. */ -if (mem_sleep_default >PM_SUSPEND_MEM ) +if (mem_sleep_default >PM_SUSPEND_MEM && !acpi_sleep_default_s3) mem_sleep_current =PM_SUSPEND_TO_IDLE ;return 0 ;
@@ -972,7 +971,7 @@ static int acpi_s2idle_prepare(void)static int acpi_s2idle_prepare_late (void ) { -if (!lps0_device_handle) +if (!lps0_device_handle || sleep_no_lps0)return 0 ;if (pm_debug_messages_on)
@@ -1022,7 +1021,7 @@ static void acpi_s2idle_wake(void)static void acpi_s2idle_restore_early (void ) { -if (!lps0_device_handle) +if (!lps0_device_handle || sleep_no_lps0)return ;acpi_sleep_run_lps0_dsm (ACPI_LPS0_EXIT );
PATCH v2 5/8 ACPI: PM: s2idle: Switch EC over to polling during "noirq" suspend
In reply to Rafael J. WysockiFrom: Rafael J. Wysocki <[email protected]>
Since the ACPI SCI is set up for system wakeup before the "noirq" suspend of devices, it is better to make suspend-to-idle follow suspend-to-RAM (S3) and switch over the EC to polling during "noirq" suspend (and back to interrupt-based flow during "noirq" resume).
The frequency of spurious wakeup interrupts from the EC may be reduced this way.
---
New in v2.
--- drivers/acpi/ec.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/acpi/ec.c +2 -4
@@ -1958,8 +1958,7 @@ static int acpi_ec_suspend_noirq(struct ec->reference_count >= 1)acpi_set_gpe (NULL , ec->gpe,ACPI_GPE_DISABLE ); -if (acpi_sleep_no_ec_events ()) -acpi_ec_enter_noirq (ec); +acpi_ec_enter_noirq (ec);return 0 ; }
@@ -1968,8 +1967,7 @@ static int acpi_ec_resume_noirq(struct d {struct acpi_ec *ec =acpi_driver_data (to_acpi_device (dev)); -if (acpi_sleep_no_ec_events ()) -acpi_ec_leave_noirq (ec); +acpi_ec_leave_noirq (ec);if (ec_no_wakeup &&test_bit (EC_FLAGS_STARTED , &ec->flags) && ec->reference_count >=1 )
PATCH v2 6/8 ACPI: PM: s2idle: Eliminate acpi_sleep_no_ec_events()
In reply to Rafael J. WysockiFrom: Rafael J. Wysocki <[email protected]>
Change acpi_ec_suspend() to use pm_suspend_no_platform() instead of acpi_sleep_no_ec_events(), which allows the latter to be eliminated along with the s2idle_in_progress variable which is only used by it.
---
New in v2.
--- drivers/acpi/ec.c | 2 +- drivers/acpi/internal.h | 2 -- drivers/acpi/sleep.c | 9 --------- 3 files changed, 1 insertion(+), 12 deletions(-)
drivers/acpi/ec.c +1 -1
@@ -1941,7 +1941,7 @@ static int acpi_ec_suspend(struct devicestruct acpi_ec *ec =acpi_driver_data (to_acpi_device (dev)); -if (acpi_sleep_no_ec_events () && ec_freeze_events) +if (!pm_suspend_no_platform () && ec_freeze_events)acpi_ec_disable_event (ec);return 0 ; }
drivers/acpi/sleep.c +0 -9
@@ -696,7 +696,6 @@ static const struct platform_suspend_ops .recover = acpi_pm_finish, }; -static bool s2idle_in_progress;static bool s2idle_wakeup;/*
@@ -950,7 +949,6 @@ static struct acpi_scan_handler lps0_hanstatic int acpi_s2idle_begin (void ) {acpi_scan_lock_acquire (); - s2idle_in_progress = true;return 0 ; }
@@ -1042,7 +1040,6 @@ static void acpi_s2idle_restore(void)static void acpi_s2idle_end (void ) { - s2idle_in_progress = false;acpi_scan_lock_release (); }
@@ -1072,7 +1069,6 @@ static void acpi_sleep_suspend_setup(voi }#else /* !CONFIG_SUSPEND */ -#define s2idle_in_progress (false)#define s2idle_wakeup (false)#define lps0_device_handle (NULL)static inline void acpi_sleep_suspend_setup (void ) {}
@@ -1083,11 +1079,6 @@ bool acpi_s2idle_wakeup(void)return s2idle_wakeup; } -bool acpi_sleep_no_ec_events (void ) -{ -return !s2idle_in_progress; -} -#ifdef CONFIG_PM_SLEEP static u32 saved_bm_rld;
drivers/acpi/internal.h +0 -2
@@ -210,11 +210,9 @@ void acpi_ec_flush_work(void);-------------------------------------------------------------------------- */ #ifdef CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT extern bool acpi_s2idle_wakeup (void ); -extern bool acpi_sleep_no_ec_events (void );extern int acpi_sleep_init (void );#else static inline bool acpi_s2idle_wakeup (void ) {return false; } -static inline bool acpi_sleep_no_ec_events (void ) {return true; }static inline int acpi_sleep_init (void ) {return -ENXIO ; }#endif
PATCH v2 7/8 ACPI: EC: PM: Consolidate some code depending on PM_SLEEP
In reply to Rafael J. WysockiFrom: Rafael J. Wysocki <[email protected]>
Move some routines, including acpi_ec_dispatch_gpe(), that are only used if CONFIG_PM_SLEEP is set to the #ifdef block containing the EC suspend and resume callbacks, to make the "full EC PM picture" easier to follow.
While at it, move the header of acpi_ec_dispatch_gpe() in the header file to a CONFIG_PM_SLEEP #ifdef block.
---
New in v2.
--- drivers/acpi/ec.c | 54 +++++++++++++++++++++++------------------------- drivers/acpi/internal.h | 2 - 2 files changed, 27 insertions(+), 29 deletions(-)
drivers/acpi/internal.h +1 -1
@@ -194,7 +194,6 @@ void acpi_ec_ecdt_probe(void);void acpi_ec_dsdt_probe (void );void acpi_ec_block_transactions (void );void acpi_ec_unblock_transactions (void ); -bool acpi_ec_dispatch_gpe (void );int acpi_ec_add_query_handler (struct acpi_ec *ec,u8 query_bit,acpi_handle handle,acpi_ec_query_func func,void *data);
@@ -202,6 +201,7 @@ void acpi_ec_remove_query_handler(struct#ifdef CONFIG_PM_SLEEP void acpi_ec_flush_work (void ); +bool acpi_ec_dispatch_gpe (void );#endif
drivers/acpi/ec.c +26 -28
66 lines not on this page · raw message
PATCH v2 8/8 ACPI: EC: PM: Make acpi_ec_dispatch_gpe() print debug message
In reply to Rafael J. WysockiFrom: Rafael J. Wysocki <[email protected]>
Add a pm_pr_dbg() debug statement to acpi_ec_dispatch_gpe() to print a message when the EC GPE has been dispatched (because its status was set).
---
New in v2.
--- drivers/acpi/ec.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/acpi/ec.c +5 -1
@@ -1980,7 +1980,11 @@ bool acpi_ec_dispatch_gpe(void)return false; ret =acpi_dispatch_gpe (NULL , first_ec->gpe); - return ret == ACPI_INTERRUPT_HANDLED; +if (ret ==ACPI_INTERRUPT_HANDLED ) { +pm_pr_dbg ("EC GPE dispatched\n" ); +return true; + } + return false; }#endif /* CONFIG_PM_SLEEP */