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

Merge branches 'pm-misc' and 'pm-tools' 

Merge miscellaneous power management updates and cpupower utility
updates for 6.17-rc1:

 - Update contact information in the PM ABI docs and maintainer
   information in the power domains DT binding (Rafael Wysocki)

 - Update PM header inclusions to follow the IWYU (Include What You Use)
   principle (Andy Shevchenko)

 - Add flags to specify power on attach/detach for PM domains, make the
   driver core detach PM domains in device_unbind_cleanup(), and drop
   the dev_pm_domain_detach() call from the platform bus type (Claudiu
   Beznea)

 - Improve Python binding's Makefile for cpupower (John B. Wyatt IV)

 - Fix printing of CORE, CPU fields in cpupower-monitor (Gautham Shenoy)

* pm-misc:
  PM: docs: Use my kernel.org address in ABI docs and DT bindings
  driver core: platform: Drop dev_pm_domain_detach() call
  PM: domains: Detach on device_unbind_cleanup()
  PM: domains: Add flags to specify power on attach/detach
  PM: Don't use "proxy" headers

* pm-tools:
  cpupower: Improve Python binding's Makefile
  pm: cpupower: Fix printing of CORE, CPU fields in cpupower-monitor
  pm: cpupower: Fix the snapshot-order of tsc,mperf, clock in mperf_stop()
parents 3b4d4c98 ebf266d0 b1092465

Documentation/ABI/testing/sysfs-devices-power

+17 −17
Original line number Diff line number Diff line 
What:		/sys/devices/.../power/

Date:		January 2009

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Contact:	Rafael J. Wysocki <rafael@kernel.org>

Description:

		The /sys/devices/.../power directory contains attributes

		allowing the user space to check and modify some power
@@ -8,7 +8,7 @@ Description: 


What:		/sys/devices/.../power/wakeup

Date:		January 2009

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Contact:	Rafael J. Wysocki <rafael@kernel.org>

Description:

		The /sys/devices/.../power/wakeup attribute allows the user

		space to check if the device is enabled to wake up the system
@@ -34,7 +34,7 @@ Description: 


What:		/sys/devices/.../power/control

Date:		January 2009

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Contact:	Rafael J. Wysocki <rafael@kernel.org>

Description:

		The /sys/devices/.../power/control attribute allows the user

		space to control the run-time power management of the device.
@@ -53,7 +53,7 @@ Description: 


What:		/sys/devices/.../power/async

Date:		January 2009

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Contact:	Rafael J. Wysocki <rafael@kernel.org>

Description:

		The /sys/devices/.../async attribute allows the user space to

		enable or disable the device's suspend and resume callbacks to
@@ -79,7 +79,7 @@ Description: 


What:		/sys/devices/.../power/wakeup_count

Date:		September 2010

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Contact:	Rafael J. Wysocki <rafael@kernel.org>

Description:

		The /sys/devices/.../wakeup_count attribute contains the number

		of signaled wakeup events associated with the device.  This
@@ -90,7 +90,7 @@ Description: 


What:		/sys/devices/.../power/wakeup_active_count

Date:		September 2010

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Contact:	Rafael J. Wysocki <rafael@kernel.org>

Description:

		The /sys/devices/.../wakeup_active_count attribute contains the

		number of times the processing of wakeup events associated with
@@ -102,7 +102,7 @@ Description: 


What:		/sys/devices/.../power/wakeup_abort_count

Date:		February 2012

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Contact:	Rafael J. Wysocki <rafael@kernel.org>

Description:

		The /sys/devices/.../wakeup_abort_count attribute contains the

		number of times the processing of a wakeup event associated with
@@ -114,7 +114,7 @@ Description: 


What:		/sys/devices/.../power/wakeup_expire_count

Date:		February 2012

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Contact:	Rafael J. Wysocki <rafael@kernel.org>

Description:

		The /sys/devices/.../wakeup_expire_count attribute contains the

		number of times a wakeup event associated with the device has
@@ -126,7 +126,7 @@ Description: 


What:		/sys/devices/.../power/wakeup_active

Date:		September 2010

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Contact:	Rafael J. Wysocki <rafael@kernel.org>

Description:

		The /sys/devices/.../wakeup_active attribute contains either 1,

		or 0, depending on whether or not a wakeup event associated with
@@ -138,7 +138,7 @@ Description: 


What:		/sys/devices/.../power/wakeup_total_time_ms

Date:		September 2010

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Contact:	Rafael J. Wysocki <rafael@kernel.org>

Description:

		The /sys/devices/.../wakeup_total_time_ms attribute contains

		the total time of processing wakeup events associated with the
@@ -149,7 +149,7 @@ Description: 


What:		/sys/devices/.../power/wakeup_max_time_ms

Date:		September 2010

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Contact:	Rafael J. Wysocki <rafael@kernel.org>

Description:

		The /sys/devices/.../wakeup_max_time_ms attribute contains

		the maximum time of processing a single wakeup event associated
@@ -161,7 +161,7 @@ Description: 


What:		/sys/devices/.../power/wakeup_last_time_ms

Date:		September 2010

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Contact:	Rafael J. Wysocki <rafael@kernel.org>

Description:

		The /sys/devices/.../wakeup_last_time_ms attribute contains

		the value of the monotonic clock corresponding to the time of
@@ -173,7 +173,7 @@ Description: 


What:		/sys/devices/.../power/wakeup_prevent_sleep_time_ms

Date:		February 2012

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Contact:	Rafael J. Wysocki <rafael@kernel.org>

Description:

		The /sys/devices/.../wakeup_prevent_sleep_time_ms attribute

		contains the total time the device has been preventing
@@ -203,7 +203,7 @@ Description: 


What:		/sys/devices/.../power/pm_qos_resume_latency_us

Date:		March 2012

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Contact:	Rafael J. Wysocki <rafael@kernel.org>

Description:

		The /sys/devices/.../power/pm_qos_resume_latency_us attribute

		contains the PM QoS resume latency limit for the given device,
@@ -223,7 +223,7 @@ Description: 


What:		/sys/devices/.../power/pm_qos_latency_tolerance_us

Date:		January 2014

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Contact:	Rafael J. Wysocki <rafael@kernel.org>

Description:

		The /sys/devices/.../power/pm_qos_latency_tolerance_us attribute

		contains the PM QoS active state latency tolerance limit for the
@@ -248,7 +248,7 @@ Description: 


What:		/sys/devices/.../power/pm_qos_no_power_off

Date:		September 2012

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Contact:	Rafael J. Wysocki <rafael@kernel.org>

Description:

		The /sys/devices/.../power/pm_qos_no_power_off attribute

		is used for manipulating the PM QoS "no power off" flag.  If
@@ -263,7 +263,7 @@ Description: 


What:		/sys/devices/.../power/runtime_status

Date:		April 2010

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Contact:	Rafael J. Wysocki <rafael@kernel.org>

Description:

		The /sys/devices/.../power/runtime_status attribute contains

		the current runtime PM status of the device, which may be

Documentation/ABI/testing/sysfs-power

+13 −13
Original line number Diff line number Diff line 
What:		/sys/power/

Date:		August 2006

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Contact:	Rafael J. Wysocki <rafael@kernel.org>

Description:

		The /sys/power directory will contain files that will

		provide a unified interface to the power management
@@ -8,7 +8,7 @@ Description: 


What:		/sys/power/state

Date:		November 2016

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Contact:	Rafael J. Wysocki <rafael@kernel.org>

Description:

		The /sys/power/state file controls system sleep states.

		Reading from this file returns the available sleep state
@@ -23,7 +23,7 @@ Description: 


What:		/sys/power/mem_sleep

Date:		November 2016

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Contact:	Rafael J. Wysocki <rafael@kernel.org>

Description:

		The /sys/power/mem_sleep file controls the operating mode of

		system suspend.  Reading from it returns the available modes
@@ -41,7 +41,7 @@ Description: 


What:		/sys/power/disk

Date:		September 2006

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Contact:	Rafael J. Wysocki <rafael@kernel.org>

Description:

		The /sys/power/disk file controls the operating mode of the

		suspend-to-disk mechanism.  Reading from this file returns
@@ -90,7 +90,7 @@ Description: 


What:		/sys/power/image_size

Date:		August 2006

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Contact:	Rafael J. Wysocki <rafael@kernel.org>

Description:

		The /sys/power/image_size file controls the size of the image

		created by the suspend-to-disk mechanism.  It can be written a
@@ -107,7 +107,7 @@ Description: 


What:		/sys/power/pm_trace

Date:		August 2006

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Contact:	Rafael J. Wysocki <rafael@kernel.org>

Description:

		The /sys/power/pm_trace file controls the code which saves the

		last PM event point in the RTC across reboots, so that you can
@@ -156,7 +156,7 @@ Description: 


What:		/sys/power/pm_async

Date:		January 2009

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Contact:	Rafael J. Wysocki <rafael@kernel.org>

Description:

		The /sys/power/pm_async file controls the switch allowing the

		user space to enable or disable asynchronous suspend and resume
@@ -169,7 +169,7 @@ Description: 


What:		/sys/power/wakeup_count

Date:		July 2010

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Contact:	Rafael J. Wysocki <rafael@kernel.org>

Description:

		The /sys/power/wakeup_count file allows user space to put the

		system into a sleep state while taking into account the
@@ -184,7 +184,7 @@ Description: 


What:		/sys/power/reserved_size

Date:		May 2011

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Contact:	Rafael J. Wysocki <rafael@kernel.org>

Description:

		The /sys/power/reserved_size file allows user space to control

		the amount of memory reserved for allocations made by device
@@ -198,7 +198,7 @@ Description: 


What:		/sys/power/autosleep

Date:		April 2012

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Contact:	Rafael J. Wysocki <rafael@kernel.org>

Description:

		The /sys/power/autosleep file can be written one of the strings

		returned by reads from /sys/power/state.  If that happens, a
@@ -215,7 +215,7 @@ Description: 


What:		/sys/power/wake_lock

Date:		February 2012

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Contact:	Rafael J. Wysocki <rafael@kernel.org>

Description:

		The /sys/power/wake_lock file allows user space to create

		wakeup source objects and activate them on demand (if one of
@@ -242,7 +242,7 @@ Description: 


What:		/sys/power/wake_unlock

Date:		February 2012

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Contact:	Rafael J. Wysocki <rafael@kernel.org>

Description:

		The /sys/power/wake_unlock file allows user space to deactivate

		wakeup sources created with the help of /sys/power/wake_lock.
@@ -283,7 +283,7 @@ Description: 


What:		/sys/power/pm_debug_messages

Date:		July 2017

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Contact:	Rafael J. Wysocki <rafael@kernel.org>

Description:

		The /sys/power/pm_debug_messages file controls the printing

		of debug messages from the system suspend/hiberbation

Documentation/devicetree/bindings/power/power-domain.yaml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Generic PM domains



maintainers:

  - Rafael J. Wysocki <rjw@rjwysocki.net>

  - Rafael J. Wysocki <rafael@kernel.org>

  - Kevin Hilman <khilman@kernel.org>

  - Ulf Hansson <ulf.hansson@linaro.org>

drivers/amba/bus.c

+2 −2
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ static int amba_read_periphid(struct amba_device *dev) 
	void __iomem *tmp;

	int i, ret;



	ret = dev_pm_domain_attach(&dev->dev, true);

	ret = dev_pm_domain_attach(&dev->dev, PD_FLAG_ATTACH_POWER_ON);

	if (ret) {

		dev_dbg(&dev->dev, "can't get PM domain: %d\n", ret);

		goto err_out;
@@ -291,7 +291,7 @@ static int amba_probe(struct device *dev) 
		if (ret < 0)

			break;



		ret = dev_pm_domain_attach(dev, true);

		ret = dev_pm_domain_attach(dev, PD_FLAG_ATTACH_POWER_ON);

		if (ret)

			break;

drivers/base/auxiliary.c

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ static int auxiliary_bus_probe(struct device *dev) 
	struct auxiliary_device *auxdev = to_auxiliary_dev(dev);

	int ret;



	ret = dev_pm_domain_attach(dev, true);

	ret = dev_pm_domain_attach(dev, PD_FLAG_ATTACH_POWER_ON);

	if (ret) {

		dev_warn(dev, "Failed to attach to PM Domain : %d\n", ret);

		return ret;