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

Commit 2481bc75 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm+acpi-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull power management and ACPI updates from Rafael Wysocki:
 "These are mostly fixes and cleanups all over, although there are a few
  items that sort of fall into the new feature category.

  First off, we have new callbacks for PM domains that should help us to
  handle some issues related to device initialization in a better way.

  There also is some consolidation in the unified device properties API
  area allowing us to use that inferface for accessing data coming from
  platform initialization code in addition to firmware-provided data.

  We have some new device/CPU IDs in a few drivers, support for new
  chips and a new cpufreq driver too.

  Specifics:

   - Generic PM domains support update including new PM domain callbacks
     to handle device initialization better (Russell King, Rafael J
     Wysocki, Kevin Hilman)

   - Unified device properties API update including a new mechanism for
     accessing data provided by platform initialization code (Rafael J
     Wysocki, Adrian Hunter)

   - ARM cpuidle update including ARM32/ARM64 handling consolidation
     (Daniel Lezcano)

   - intel_idle update including support for the Silvermont Core in the
     Baytrail SOC and for the Airmont Core in the Cherrytrail and
     Braswell SOCs (Len Brown, Mathias Krause)

   - New cpufreq driver for Hisilicon ACPU (Leo Yan)

   - intel_pstate update including support for the Knights Landing chip
     (Dasaratharaman Chandramouli, Kristen Carlson Accardi)

   - QorIQ cpufreq driver update (Tang Yuantian, Arnd Bergmann)

   - powernv cpufreq driver update (Shilpasri G Bhat)

   - devfreq update including Tegra support changes (Tomeu Vizoso,
     MyungJoo Ham, Chanwoo Choi)

   - powercap RAPL (Running-Average Power Limit) driver update including
     support for Intel Broadwell server chips (Jacob Pan, Mathias Krause)

   - ACPI device enumeration update related to the handling of the
     special PRP0001 device ID allowing DT-style 'compatible' property
     to be used for ACPI device identification (Rafael J Wysocki)

   - ACPI EC driver update including limited _DEP support (Lan Tianyu,
     Lv Zheng)

   - ACPI backlight driver update including a new mechanism to allow
     native backlight handling to be forced on non-Windows 8 systems and
     a new quirk for Lenovo Ideapad Z570 (Aaron Lu, Hans de Goede)

   - New Windows Vista compatibility quirk for Sony VGN-SR19XN (Chen Yu)

   - Assorted ACPI fixes and cleanups (Aaron Lu, Martin Kepplinger,
     Masanari Iida, Mika Westerberg, Nan Li, Rafael J Wysocki)

   - Fixes related to suspend-to-idle for the iTCO watchdog driver and
     the ACPI core system suspend/resume code (Rafael J Wysocki, Chen Yu)

   - PM tracing support for the suspend phase of system suspend/resume
     transitions (Zhonghui Fu)

   - Configurable delay for the system suspend/resume testing facility
     (Brian Norris)

   - PNP subsystem cleanups (Peter Huewe, Rafael J Wysocki)"

* tag 'pm+acpi-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (74 commits)
  ACPI / scan: Fix NULL pointer dereference in acpi_companion_match()
  ACPI / scan: Rework modalias creation when "compatible" is present
  intel_idle: mark cpu id array as __initconst
  powercap / RAPL: mark rapl_ids array as __initconst
  powercap / RAPL: add ID for Broadwell server
  intel_pstate: Knights Landing support
  intel_pstate: remove MSR test
  cpufreq: fix qoriq uniprocessor build
  ACPI / scan: Take the PRP0001 position in the list of IDs into account
  ACPI / scan: Simplify acpi_match_device()
  ACPI / scan: Generalize of_compatible matching
  device property: Introduce firmware node type for platform data
  device property: Make it possible to use secondary firmware nodes
  PM / watchdog: iTCO: stop watchdog during system suspend
  cpufreq: hisilicon: add acpu driver
  ACPI / EC: Call acpi_walk_dep_device_list() after installing EC opregion handler
  cpufreq: powernv: Report cpu frequency throttling
  intel_idle: Add support for the Airmont Core in the Cherrytrail and Braswell SOCs
  intel_idle: Update support for Silvermont Core in Baytrail SOC
  PM / devfreq: tegra: Register governor on module init
  ...
parents 8691c130 518b4e27

Documentation/acpi/enumeration.txt

+23 −3
Original line number Diff line number Diff line
@@ -254,8 +254,13 @@ GPIO support 
~~~~~~~~~~~~

ACPI 5 introduced two new resources to describe GPIO connections: GpioIo

and GpioInt. These resources are used be used to pass GPIO numbers used by

the device to the driver. For example:

the device to the driver. ACPI 5.1 extended this with _DSD (Device

Specific Data) which made it possible to name the GPIOs among other things.



For example:



Device (DEV)

{

	Method (_CRS, 0, NotSerialized)

	{

		Name (SBUF, ResourceTemplate()
@@ -285,6 +290,18 @@ the device to the driver. For example: 
		Return (SBUF)

	}



	// ACPI 5.1 _DSD used for naming the GPIOs

	Name (_DSD, Package ()

	{

		ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),

		Package ()

		{

			Package () {"power-gpios", Package() {^DEV, 0, 0, 0 }},

			Package () {"irq-gpios", Package() {^DEV, 1, 0, 0 }},

		}

	})

	...



These GPIO numbers are controller relative and path "\\_SB.PCI0.GPI0"

specifies the path to the controller. In order to use these GPIOs in Linux

we need to translate them to the corresponding Linux GPIO descriptors.
@@ -300,11 +317,11 @@ a code like this: 


	struct gpio_desc *irq_desc, *power_desc;



	irq_desc = gpiod_get_index(dev, NULL, 1);

	irq_desc = gpiod_get(dev, "irq");

	if (IS_ERR(irq_desc))

		/* handle error */



	power_desc = gpiod_get_index(dev, NULL, 0);

	power_desc = gpiod_get(dev, "power");

	if (IS_ERR(power_desc))

		/* handle error */
@@ -313,6 +330,9 @@ a code like this: 
There are also devm_* versions of these functions which release the

descriptors once the device is released.



See Documentation/acpi/gpio-properties.txt for more information about the

_DSD binding related to GPIOs.



MFD devices

~~~~~~~~~~~

The MFD devices register their children as platform devices. For the child

Documentation/kernel-parameters.txt

+7 −0
Original line number Diff line number Diff line
@@ -3477,6 +3477,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			improve throughput, but will also increase the

			amount of memory reserved for use by the client.



	suspend.pm_test_delay=

			[SUSPEND]

			Sets the number of seconds to remain in a suspend test

			mode before resuming the system (see

			/sys/power/pm_test). Only available when CONFIG_PM_DEBUG

			is set. Default value is 5.



	swapaccount=[0|1]

			[KNL] Enable accounting of swap in memory resource

			controller if no parameter or 1 is given or disable

Documentation/power/basic-pm-debugging.txt

+6 −4
Original line number Diff line number Diff line
@@ -75,12 +75,14 @@ you should do the following: 
# echo platform > /sys/power/disk

# echo disk > /sys/power/state



Then, the kernel will try to freeze processes, suspend devices, wait 5 seconds,

resume devices and thaw processes.  If "platform" is written to

Then, the kernel will try to freeze processes, suspend devices, wait a few

seconds (5 by default, but configurable by the suspend.pm_test_delay module

parameter), resume devices and thaw processes.  If "platform" is written to

/sys/power/pm_test , then after suspending devices the kernel will additionally

invoke the global control methods (eg. ACPI global control methods) used to

prepare the platform firmware for hibernation.  Next, it will wait 5 seconds and

invoke the platform (eg. ACPI) global methods used to cancel hibernation etc.

prepare the platform firmware for hibernation.  Next, it will wait a

configurable number of seconds and invoke the platform (eg. ACPI) global

methods used to cancel hibernation etc.



Writing "none" to /sys/power/pm_test causes the kernel to switch to the normal

hibernation/suspend operations.  Also, when open for reading, /sys/power/pm_test

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -4331,6 +4331,15 @@ S: Supported 
F:	drivers/phy/

F:	include/linux/phy/



GENERIC PM DOMAINS

M:	"Rafael J. Wysocki" <rjw@rjwysocki.net>

M:	Kevin Hilman <khilman@kernel.org>

M:	Ulf Hansson <ulf.hansson@linaro.org>

L:	linux-pm@vger.kernel.org

S:	Supported

F:	drivers/base/power/domain*.c

F:	include/linux/pm_domain.h



GENERIC UIO DRIVER FOR PCI DEVICES

M:	"Michael S. Tsirkin" <mst@redhat.com>

L:	kvm@vger.kernel.org

arch/arm/include/asm/cpuidle.h

+23 −0
Original line number Diff line number Diff line 
#ifndef __ASM_ARM_CPUIDLE_H

#define __ASM_ARM_CPUIDLE_H



#include <asm/proc-fns.h>



#ifdef CONFIG_CPU_IDLE

extern int arm_cpuidle_simple_enter(struct cpuidle_device *dev,

		struct cpuidle_driver *drv, int index);
@@ -25,4 +27,25 @@ static inline int arm_cpuidle_simple_enter(struct cpuidle_device *dev, 
 */

#define ARM_CPUIDLE_WFI_STATE ARM_CPUIDLE_WFI_STATE_PWR(UINT_MAX)



struct device_node;



struct cpuidle_ops {

	int (*suspend)(int cpu, unsigned long arg);

	int (*init)(struct device_node *, int cpu);

};



struct of_cpuidle_method {

	const char *method;

	struct cpuidle_ops *ops;

};



#define CPUIDLE_METHOD_OF_DECLARE(name, _method, _ops)			\

	static const struct of_cpuidle_method __cpuidle_method_of_table_##name \

	__used __section(__cpuidle_method_of_table)			\

	= { .method = _method, .ops = _ops }



extern int arm_cpuidle_suspend(int index);



extern int arm_cpuidle_init(int cpu);



#endif