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

Merge branches 'pm-sleep', 'pm-opp' and 'pm-tools' 

Merge updates related to system sleep, operating performance points
(OPP) updates, and PM tooling updates for 6.12-rc1:

 - Remove unused stub for saveable_highmem_page() and remove deprecated
   macros from power management documentation (Andy Shevchenko).

 - Use ysfs_emit() and sysfs_emit_at() in "show" functions in the PM
   sysfs interface (Xueqin Luo).

 - Update the maintainers information for the operating-points-v2-ti-cpu DT
   binding (Dhruva Gole).

 - Drop unnecessary of_match_ptr() from ti-opp-supply (Rob Herring).

 - Update directory handling and installation process in the pm-graph
   Makefile and add .gitignore to ignore sleepgraph.py artifacts to
   pm-graph (Amit Vadhavana, Yo-Jung Lin).

 - Make cpupower display residency value in idle-info (Aboorva
   Devarajan).

 - Add missing powercap_set_enabled() stub function to cpupower (John
   B. Wyatt IV).

 - Add SWIG support to cpupower (John B. Wyatt IV).

* pm-sleep:
  PM: hibernate: Remove unused stub for saveable_highmem_page()
  Documentation: PM: Discourage use of deprecated macros
  PM: sleep: Use sysfs_emit() and sysfs_emit_at() in "show" functions
  PM: hibernate: Use sysfs_emit() and sysfs_emit_at() in "show" functions

* pm-opp:
  dt-bindings: opp: operating-points-v2-ti-cpu: Update maintainers
  opp: ti: Drop unnecessary of_match_ptr()

* pm-tools:
  pm:cpupower: Add error warning when SWIG is not installed
  MAINTAINERS: Add Maintainers for SWIG Python bindings
  pm:cpupower: Include test_raw_pylibcpupower.py
  pm:cpupower: Add SWIG bindings files for libcpupower
  pm:cpupower: Add missing powercap_set_enabled() stub function
  pm-graph: Update directory handling and installation process in Makefile
  pm-graph: Make git ignore sleepgraph.py artifacts
  tools/cpupower: display residency value in idle-info
parents 52f11928 c3565a35 339d9d87 ffa1f26d

Documentation/devicetree/bindings/opp/operating-points-v2-ti-cpu.yaml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ description: 
  the hardware description for the scheme mentioned above.



maintainers:

  - Nishanth Menon <nm@ti.com>

  - Dhruva Gole <d-gole@ti.com>



allOf:

  - $ref: opp-v2-base.yaml#

Documentation/power/pci.rst

+5 −6
Original line number Diff line number Diff line
@@ -979,18 +979,17 @@ subsections can be defined as a separate function, it often is convenient to 
point two or more members of struct dev_pm_ops to the same routine.  There are

a few convenience macros that can be used for this purpose.



The SIMPLE_DEV_PM_OPS macro declares a struct dev_pm_ops object with one

The DEFINE_SIMPLE_DEV_PM_OPS() declares a struct dev_pm_ops object with one

suspend routine pointed to by the .suspend(), .freeze(), and .poweroff()

members and one resume routine pointed to by the .resume(), .thaw(), and

.restore() members.  The other function pointers in this struct dev_pm_ops are

unset.



The UNIVERSAL_DEV_PM_OPS macro is similar to SIMPLE_DEV_PM_OPS, but it

additionally sets the .runtime_resume() pointer to the same value as

.resume() (and .thaw(), and .restore()) and the .runtime_suspend() pointer to

the same value as .suspend() (and .freeze() and .poweroff()).

The DEFINE_RUNTIME_DEV_PM_OPS() is similar to DEFINE_SIMPLE_DEV_PM_OPS(), but it

additionally sets the .runtime_resume() pointer to pm_runtime_force_resume()

and the .runtime_suspend() pointer to pm_runtime_force_suspend().



The SET_SYSTEM_SLEEP_PM_OPS can be used inside of a declaration of struct

The SYSTEM_SLEEP_PM_OPS() can be used inside of a declaration of struct

dev_pm_ops to indicate that one suspend routine is to be pointed to by the

.suspend(), .freeze(), and .poweroff() members and one resume routine is to

be pointed to by the .resume(), .thaw(), and .restore() members.

Documentation/power/runtime_pm.rst

+2 −2
Original line number Diff line number Diff line
@@ -811,8 +811,8 @@ subsystem-level dev_pm_ops structure. 


Device drivers that wish to use the same function as a system suspend, freeze,

poweroff and runtime suspend callback, and similarly for system resume, thaw,

restore, and runtime resume, can achieve this with the help of the

UNIVERSAL_DEV_PM_OPS macro defined in include/linux/pm.h (possibly setting its

restore, and runtime resume, can achieve similar behaviour with the help of the

DEFINE_RUNTIME_DEV_PM_OPS() defined in include/linux/pm_runtime.h (possibly setting its

last argument to NULL).



8. "No-Callback" Devices

MAINTAINERS

+3 −0
Original line number Diff line number Diff line
@@ -5824,6 +5824,9 @@ CPU POWER MONITORING SUBSYSTEM 
M:	Thomas Renninger <trenn@suse.com>

M:	Shuah Khan <shuah@kernel.org>

M:	Shuah Khan <skhan@linuxfoundation.org>

M:	John B. Wyatt IV <jwyatt@redhat.com>

M:	John B. Wyatt IV <sageofredondo@gmail.com>

M:	John Kacur <jkacur@redhat.com>

L:	linux-pm@vger.kernel.org

S:	Maintained

F:	tools/power/cpupower/

drivers/opp/ti-opp-supply.c

+1 −1
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ static struct platform_driver ti_opp_supply_driver = { 
	.probe = ti_opp_supply_probe,

	.driver = {

		   .name = "ti_opp_supply",

		   .of_match_table = of_match_ptr(ti_opp_supply_of_match),

		   .of_match_table = ti_opp_supply_of_match,

		   },

};

module_platform_driver(ti_opp_supply_driver);