Commit d2817063 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-sleep' 

* pm-sleep: (29 commits)
  ACPI: PM: s2idle: Always set up EC GPE for system wakeup
  ACPI: PM: s2idle: Avoid rearming SCI for wakeup unnecessarily
  PM / wakeup: Unexport wakeup_source_sysfs_{add,remove}()
  PM / wakeup: Register wakeup class kobj after device is added
  PM / wakeup: Fix sysfs registration error path
  PM / wakeup: Show wakeup sources stats in sysfs
  PM / wakeup: Use wakeup_source_register() in wakelock.c
  PM / wakeup: Drop wakeup_source_init(), wakeup_source_prepare()
  PM: sleep: Replace strncmp() with str_has_prefix()
  PM: suspend: Fix platform_suspend_prepare_noirq()
  intel-hid: Disable button array during suspend-to-idle
  intel-hid: intel-vbtn: Avoid leaking wakeup_mode set
  ACPI: PM: s2idle: Execute LPS0 _DSM functions with suspended devices
  ACPI: EC: PM: Make acpi_ec_dispatch_gpe() print debug message
  ACPI: EC: PM: Consolidate some code depending on PM_SLEEP
  ACPI: PM: s2idle: Eliminate acpi_sleep_no_ec_events()
  ACPI: PM: s2idle: Switch EC over to polling during "noirq" suspend
  ACPI: PM: s2idle: Add acpi.sleep_no_lps0 module parameter
  ACPI: PM: s2idle: Rearrange lps0_device_attach()
  PM/sleep: Expose suspend stats in sysfs
  ...
parents 0760bb9a 1b531e55

Documentation/ABI/testing/sysfs-class-wakeup

0 → 100644
+76 −0
Original line number Diff line number Diff line 
What:		/sys/class/wakeup/

Date:		June 2019

Contact:	Tri Vo <trong@android.com>

Description:

		The /sys/class/wakeup/ directory contains pointers to all

		wakeup sources in the kernel at that moment in time.



What:		/sys/class/wakeup/.../name

Date:		June 2019

Contact:	Tri Vo <trong@android.com>

Description:

		This file contains the name of the wakeup source.



What:		/sys/class/wakeup/.../active_count

Date:		June 2019

Contact:	Tri Vo <trong@android.com>

Description:

		This file contains the number of times the wakeup source was

		activated.



What:		/sys/class/wakeup/.../event_count

Date:		June 2019

Contact:	Tri Vo <trong@android.com>

Description:

		This file contains the number of signaled wakeup events

		associated with the wakeup source.



What:		/sys/class/wakeup/.../wakeup_count

Date:		June 2019

Contact:	Tri Vo <trong@android.com>

Description:

		This file contains the number of times the wakeup source might

		abort suspend.



What:		/sys/class/wakeup/.../expire_count

Date:		June 2019

Contact:	Tri Vo <trong@android.com>

Description:

		This file contains the number of times the wakeup source's

		timeout has expired.



What:		/sys/class/wakeup/.../active_time_ms

Date:		June 2019

Contact:	Tri Vo <trong@android.com>

Description:

		This file contains the amount of time the wakeup source has

		been continuously active, in milliseconds.  If the wakeup

		source is not active, this file contains '0'.



What:		/sys/class/wakeup/.../total_time_ms

Date:		June 2019

Contact:	Tri Vo <trong@android.com>

Description:

		This file contains the total amount of time this wakeup source

		has been active, in milliseconds.



What:		/sys/class/wakeup/.../max_time_ms

Date:		June 2019

Contact:	Tri Vo <trong@android.com>

Description:

		This file contains the maximum amount of time this wakeup

		source has been continuously active, in milliseconds.



What:		/sys/class/wakeup/.../last_change_ms

Date:		June 2019

Contact:	Tri Vo <trong@android.com>

Description:

		This file contains the monotonic clock time when the wakeup

		source was touched last time, in milliseconds.



What:		/sys/class/wakeup/.../prevent_suspend_time_ms

Date:		June 2019

Contact:	Tri Vo <trong@android.com>

Description:

		The file contains the total amount of time this wakeup source

		has been preventing autosleep, in milliseconds.

Documentation/ABI/testing/sysfs-power

+106 −0
Original line number Diff line number Diff line
@@ -301,3 +301,109 @@ Description: 


		Using this sysfs file will override any values that were

		set using the kernel command line for disk offset.



What:		/sys/power/suspend_stats

Date:		July 2019

Contact:	Kalesh Singh <kaleshsingh96@gmail.com>

Description:

		The /sys/power/suspend_stats directory contains suspend related

		statistics.



What:		/sys/power/suspend_stats/success

Date:		July 2019

Contact:	Kalesh Singh <kaleshsingh96@gmail.com>

Description:

		The /sys/power/suspend_stats/success file contains the number

		of times entering system sleep state succeeded.



What:		/sys/power/suspend_stats/fail

Date:		July 2019

Contact:	Kalesh Singh <kaleshsingh96@gmail.com>

Description:

		The /sys/power/suspend_stats/fail file contains the number

		of times entering system sleep state failed.



What:		/sys/power/suspend_stats/failed_freeze

Date:		July 2019

Contact:	Kalesh Singh <kaleshsingh96@gmail.com>

Description:

		The /sys/power/suspend_stats/failed_freeze file contains the

		number of times freezing processes failed.



What:		/sys/power/suspend_stats/failed_prepare

Date:		July 2019

Contact:	Kalesh Singh <kaleshsingh96@gmail.com>

Description:

		The /sys/power/suspend_stats/failed_prepare file contains the

		number of times preparing all non-sysdev devices for

		a system PM transition failed.



What:		/sys/power/suspend_stats/failed_resume

Date:		July 2019

Contact:	Kalesh Singh <kaleshsingh96@gmail.com>

Description:

		The /sys/power/suspend_stats/failed_resume file contains the

		number of times executing "resume" callbacks of

		non-sysdev devices failed.



What:		/sys/power/suspend_stats/failed_resume_early

Date:		July 2019

Contact:	Kalesh Singh <kaleshsingh96@gmail.com>

Description:

		The /sys/power/suspend_stats/failed_resume_early file contains

		the number of times executing "early resume" callbacks

		of devices failed.



What:		/sys/power/suspend_stats/failed_resume_noirq

Date:		July 2019

Contact:	Kalesh Singh <kaleshsingh96@gmail.com>

Description:

		The /sys/power/suspend_stats/failed_resume_noirq file contains

		the number of times executing "noirq resume" callbacks

		of devices failed.



What:		/sys/power/suspend_stats/failed_suspend

Date:		July 2019

Contact:	Kalesh Singh <kaleshsingh96@gmail.com>

Description:

		The /sys/power/suspend_stats/failed_suspend file contains

		the number of times executing "suspend" callbacks

		of all non-sysdev devices failed.



What:		/sys/power/suspend_stats/failed_suspend_late

Date:		July 2019

Contact:	Kalesh Singh <kaleshsingh96@gmail.com>

Description:

		The /sys/power/suspend_stats/failed_suspend_late file contains

		the number of times executing "late suspend" callbacks

		of all devices failed.



What:		/sys/power/suspend_stats/failed_suspend_noirq

Date:		July 2019

Contact:	Kalesh Singh <kaleshsingh96@gmail.com>

Description:

		The /sys/power/suspend_stats/failed_suspend_noirq file contains

		the number of times executing "noirq suspend" callbacks

		of all devices failed.



What:		/sys/power/suspend_stats/last_failed_dev

Date:		July 2019

Contact:	Kalesh Singh <kaleshsingh96@gmail.com>

Description:

		The /sys/power/suspend_stats/last_failed_dev file contains

		the last device for which a suspend/resume callback failed.



What:		/sys/power/suspend_stats/last_failed_errno

Date:		July 2019

Contact:	Kalesh Singh <kaleshsingh96@gmail.com>

Description:

		The /sys/power/suspend_stats/last_failed_errno file contains

		the errno of the last failed attempt at entering

		system sleep state.



What:		/sys/power/suspend_stats/last_failed_step

Date:		July 2019

Contact:	Kalesh Singh <kaleshsingh96@gmail.com>

Description:

		The /sys/power/suspend_stats/last_failed_step file contains

		the last failed step in the suspend/resume path.

drivers/acpi/acpica/evxfgpe.c

+3 −3
Original line number Diff line number Diff line
@@ -644,17 +644,17 @@ ACPI_EXPORT_SYMBOL(acpi_get_gpe_status) 
 * PARAMETERS:  gpe_device          - Parent GPE Device. NULL for GPE0/GPE1

 *              gpe_number          - GPE level within the GPE block

 *

 * RETURN:      None

 * RETURN:      INTERRUPT_HANDLED or INTERRUPT_NOT_HANDLED

 *

 * DESCRIPTION: Detect and dispatch a General Purpose Event to either a function

 *              (e.g. EC) or method (e.g. _Lxx/_Exx) handler.

 *

 ******************************************************************************/

void acpi_dispatch_gpe(acpi_handle gpe_device, u32 gpe_number)

u32 acpi_dispatch_gpe(acpi_handle gpe_device, u32 gpe_number)

{

	ACPI_FUNCTION_TRACE(acpi_dispatch_gpe);



	acpi_ev_detect_gpe(gpe_device, NULL, gpe_number);

	return acpi_ev_detect_gpe(gpe_device, NULL, gpe_number);

}



ACPI_EXPORT_SYMBOL(acpi_dispatch_gpe)

drivers/acpi/device_pm.c

+2 −1
Original line number Diff line number Diff line
@@ -497,7 +497,8 @@ acpi_status acpi_add_pm_notifier(struct acpi_device *adev, struct device *dev, 
		goto out;



	mutex_lock(&acpi_pm_notifier_lock);

	adev->wakeup.ws = wakeup_source_register(dev_name(&adev->dev));

	adev->wakeup.ws = wakeup_source_register(&adev->dev,

						 dev_name(&adev->dev));

	adev->wakeup.context.dev = dev;

	adev->wakeup.context.func = func;

	adev->wakeup.flags.notifier_present = true;

drivers/acpi/ec.c

+33 −24
Original line number Diff line number Diff line
@@ -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,24 +1049,6 @@ void acpi_ec_unblock_transactions(void) 
		acpi_ec_start(first_ec, true);

}



void acpi_ec_mark_gpe_for_wake(void)

{

	if (first_ec && !ec_no_wakeup)

		acpi_mark_gpe_for_wake(NULL, first_ec->gpe);

}



void acpi_ec_set_gpe_wake_mask(u8 action)

{

	if (first_ec && !ec_no_wakeup)

		acpi_set_gpe_wake_mask(NULL, first_ec->gpe, action);

}



void acpi_ec_dispatch_gpe(void)

{

	if (first_ec)

		acpi_dispatch_gpe(NULL, first_ec->gpe);

}



/* --------------------------------------------------------------------------

                                Event Management

   -------------------------------------------------------------------------- */
@@ -1931,7 +1914,7 @@ static int acpi_ec_suspend(struct device *dev) 
	struct 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;

}
@@ -1948,7 +1931,6 @@ static int acpi_ec_suspend_noirq(struct device *dev) 
	    ec->reference_count >= 1)

		acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_DISABLE);



	if (acpi_sleep_no_ec_events())

	acpi_ec_enter_noirq(ec);



	return 0;
@@ -1958,7 +1940,6 @@ static int acpi_ec_resume_noirq(struct device *dev) 
{

	struct acpi_ec *ec = acpi_driver_data(to_acpi_device(dev));



	if (acpi_sleep_no_ec_events())

	acpi_ec_leave_noirq(ec);



	if (ec_no_wakeup && test_bit(EC_FLAGS_STARTED, &ec->flags) &&
@@ -1976,7 +1957,35 @@ static int acpi_ec_resume(struct device *dev) 
	acpi_ec_enable_event(ec);

	return 0;

}

#endif



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 (pm_suspend_no_platform() && first_ec && !ec_no_wakeup)

		acpi_set_gpe_wake_mask(NULL, first_ec->gpe, action);

}



bool acpi_ec_dispatch_gpe(void)

{

	u32 ret;



	if (!first_ec)

		return false;



	ret = acpi_dispatch_gpe(NULL, first_ec->gpe);

	if (ret == ACPI_INTERRUPT_HANDLED) {

		pm_pr_dbg("EC GPE dispatched\n");

		return true;

	}

	return false;

}

#endif /* CONFIG_PM_SLEEP */



static const struct dev_pm_ops acpi_ec_pm = {

	SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(acpi_ec_suspend_noirq, acpi_ec_resume_noirq)

CRA Git | Maintained and supported by SUSTech CRA and CCSE