Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ba1a557 authored by Ivaylo Georgiev's avatar Ivaylo Georgiev
Browse files

Merge wakeup_source changes into msm-4.19 



* refs/heads/tmp-5da11144:
  Restore "UPSTREAM: PM / wakeup updates"

Change-Id: Ic256d059a99f075b519c4441c8b12fe4da818d62
Signed-off-by: default avatarIvaylo Georgiev <irgeorgiev@codeaurora.org>
parents d46ff52a e8dfef83

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.

drivers/acpi/device_pm.c

+2 −1
Original line number Diff line number Diff line
@@ -455,7 +455,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/base/power/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

obj-$(CONFIG_PM)	+= sysfs.o generic_ops.o common.o qos.o runtime.o wakeirq.o

obj-$(CONFIG_PM_SLEEP)	+= main.o wakeup.o

obj-$(CONFIG_PM_SLEEP)	+= main.o wakeup.o wakeup_stats.o

obj-$(CONFIG_PM_TRACE_RTC)	+= trace.o

obj-$(CONFIG_PM_GENERIC_DOMAINS)	+=  domain.o domain_governor.o

obj-$(CONFIG_HAVE_CLK)	+= clock_ops.o

drivers/base/power/power.h

+18 −0
Original line number Diff line number Diff line
@@ -154,3 +154,21 @@ static inline void device_pm_init(struct device *dev) 
	device_pm_sleep_init(dev);

	pm_runtime_init(dev);

}



#ifdef CONFIG_PM_SLEEP



/* drivers/base/power/wakeup_stats.c */

extern int wakeup_source_sysfs_add(struct device *parent,

				   struct wakeup_source *ws);

extern void wakeup_source_sysfs_remove(struct wakeup_source *ws);



extern int pm_wakeup_source_sysfs_add(struct device *parent);



#else /* !CONFIG_PM_SLEEP */



static inline int pm_wakeup_source_sysfs_add(struct device *parent)

{

	return 0;

}



#endif /* CONFIG_PM_SLEEP */

drivers/base/power/sysfs.c

+6 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/export.h>

#include <linux/pm_qos.h>

#include <linux/pm_runtime.h>

#include <linux/pm_wakeup.h>

#include <linux/atomic.h>

#include <linux/jiffies.h>

#include "power.h"
@@ -672,8 +673,13 @@ int dpm_sysfs_add(struct device *dev) 
		if (rc)

			goto err_wakeup;

	}

	rc = pm_wakeup_source_sysfs_add(dev);

	if (rc)

		goto err_latency;

	return 0;



 err_latency:

	sysfs_unmerge_group(&dev->kobj, &pm_qos_latency_tolerance_attr_group);

 err_wakeup:

	sysfs_unmerge_group(&dev->kobj, &pm_wakeup_attr_group);

 err_runtime: