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

Merge branches 'pm-opp', 'pm-qos', 'acpi-pm', 'pm-domains' and 'pm-tools' 

* pm-opp:
  PM / OPP: Correct Documentation about library location
  opp: of: Support multiple suspend OPPs defined in DT
  dt-bindings: opp: Support multiple opp-suspend properties
  opp: core: add regulators enable and disable
  opp: Don't decrement uninitialized list_kref

* pm-qos:
  PM: QoS: Get rid of unused flags

* acpi-pm:
  ACPI: PM: Print debug messages on device power state changes

* pm-domains:
  PM / Domains: Verify PM domain type in dev_pm_genpd_set_performance_state()
  PM / Domains: Simplify genpd_lookup_dev()
  PM / Domains: Align in-parameter names for some genpd functions

* pm-tools:
  pm-graph: make setVal unbuffered again for python2 and python3
  cpupower: update German translation
  tools/power/cpupower: fix 64bit detection when cross-compiling
  cpupower: Add missing newline at end of file
  pm-graph v5.5
parents 031f469e e47bc756 c3082a67 ee8193ee 3ea4ca92 e3e2ffdc

Documentation/devicetree/bindings/opp/opp.txt

+2 −2
Original line number Diff line number Diff line
@@ -140,8 +140,8 @@ Optional properties: 
  frequency for a short duration of time limited by the device's power, current

  and thermal limits.



- opp-suspend: Marks the OPP to be used during device suspend. Only one OPP in

  the table should have this.

- opp-suspend: Marks the OPP to be used during device suspend. If multiple OPPs

  in the table have this, the OPP with highest opp-hz will be used.



- opp-supported-hw: This enables us to select only a subset of OPPs from the

  larger OPP table, based on what version of the hardware we are running on. We

Documentation/power/opp.rst

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ We can represent these as three OPPs as the following {Hz, uV} tuples: 
----------------------------------------



OPP library provides a set of helper functions to organize and query the OPP

information. The library is located in drivers/base/power/opp.c and the header

information. The library is located in drivers/opp/ directory and the header

is located in include/linux/pm_opp.h. OPP library can be enabled by enabling

CONFIG_PM_OPP from power management menuconfig menu. OPP library depends on

CONFIG_PM as certain SoCs such as Texas Instrument's OMAP framework allows to

Documentation/power/pm_qos_interface.rst

+2 −3
Original line number Diff line number Diff line
@@ -7,8 +7,7 @@ performance expectations by drivers, subsystems and user space applications on 
one of the parameters.



Two different PM QoS frameworks are available:

1. PM QoS classes for cpu_dma_latency, network_latency, network_throughput,

memory_bandwidth.

1. PM QoS classes for cpu_dma_latency

2. the per-device PM QoS framework provides the API to manage the per-device latency

constraints and PM QoS flags.
@@ -79,7 +78,7 @@ cleanup of a process, the interface requires the process to register its 
parameter requests in the following way:



To register the default pm_qos target for the specific parameter, the process

must open one of /dev/[cpu_dma_latency, network_latency, network_throughput]

must open /dev/cpu_dma_latency



As long as the device node is held open that process has a registered

request on the parameter.

drivers/acpi/device_pm.c

+4 −0
Original line number Diff line number Diff line
@@ -166,6 +166,10 @@ int acpi_device_set_power(struct acpi_device *device, int state) 
	    || (state < ACPI_STATE_D0) || (state > ACPI_STATE_D3_COLD))

		return -EINVAL;



	acpi_handle_debug(device->handle, "Power state change: %s -> %s\n",

			  acpi_power_state_string(device->power.state),

			  acpi_power_state_string(state));



	/* Make sure this is a valid target state */



	/* There is a special case for D0 addressed below. */

drivers/base/power/domain.c

+10 −15
Original line number Diff line number Diff line
@@ -149,29 +149,24 @@ static inline bool irq_safe_dev_in_no_sleep_domain(struct device *dev, 
	return ret;

}



static int genpd_runtime_suspend(struct device *dev);



/*

 * Get the generic PM domain for a particular struct device.

 * This validates the struct device pointer, the PM domain pointer,

 * and checks that the PM domain pointer is a real generic PM domain.

 * Any failure results in NULL being returned.

 */

static struct generic_pm_domain *genpd_lookup_dev(struct device *dev)

static struct generic_pm_domain *dev_to_genpd_safe(struct device *dev)

{

	struct generic_pm_domain *genpd = NULL, *gpd;



	if (IS_ERR_OR_NULL(dev) || IS_ERR_OR_NULL(dev->pm_domain))

		return NULL;



	mutex_lock(&gpd_list_lock);

	list_for_each_entry(gpd, &gpd_list, gpd_list_node) {

		if (&gpd->domain == dev->pm_domain) {

			genpd = gpd;

			break;

		}

	}

	mutex_unlock(&gpd_list_lock);

	/* A genpd's always have its ->runtime_suspend() callback assigned. */

	if (dev->pm_domain->ops.runtime_suspend == genpd_runtime_suspend)

		return pd_to_genpd(dev->pm_domain);



	return genpd;

	return NULL;

}



/*
@@ -385,8 +380,8 @@ int dev_pm_genpd_set_performance_state(struct device *dev, unsigned int state) 
	unsigned int prev;

	int ret;



	genpd = dev_to_genpd(dev);

	if (IS_ERR(genpd))

	genpd = dev_to_genpd_safe(dev);

	if (!genpd)

		return -ENODEV;



	if (unlikely(!genpd->set_performance_state))
@@ -1610,7 +1605,7 @@ static int genpd_remove_device(struct generic_pm_domain *genpd, 
 */

int pm_genpd_remove_device(struct device *dev)

{

	struct generic_pm_domain *genpd = genpd_lookup_dev(dev);

	struct generic_pm_domain *genpd = dev_to_genpd_safe(dev);



	if (!genpd)

		return -EINVAL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE