Commit 0c67f6b2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm-5.8-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull more power management updates from Rafael Wysocki:
 "These are operating performance points (OPP) framework updates mostly,
  including support for interconnect bandwidth in the OPP core, plus a
  few cpufreq changes, including boost support in the CPPC cpufreq
  driver, an ACPI device power management fix and a hibernation code
  cleanup.

  Specifics:

   - Add support for interconnect bandwidth to the OPP core (Georgi
     Djakov, Saravana Kannan, Sibi Sankar, Viresh Kumar).

   - Add support for regulator enable/disable to the OPP core (Kamil
     Konieczny).

   - Add boost support to the CPPC cpufreq driver (Xiongfeng Wang).

   - Make the tegra186 cpufreq driver set the
     CPUFREQ_NEED_INITIAL_FREQ_CHECK flag (Mian Yousaf Kaukab).

   - Prevent the ACPI power management from using power resources with
     devices where the list of power resources for power state D0 (full
     power) is missing (Rafael Wysocki).

   - Annotate a hibernation-related function with __init (Christophe
     JAILLET)"

* tag 'pm-5.8-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: PM: Avoid using power resources if there are none for D0
  cpufreq: CPPC: add SW BOOST support
  cpufreq: change '.set_boost' to act on one policy
  PM: hibernate: Add __init annotation to swsusp_header_init()
  opp: Don't parse icc paths unnecessarily
  opp: Remove bandwidth votes when target_freq is zero
  opp: core: add regulators enable and disable
  opp: Reorder the code for !target_freq case
  opp: Expose bandwidth information via debugfs
  cpufreq: dt: Add support for interconnect bandwidth scaling
  opp: Update the bandwidth on OPP frequency changes
  opp: Add sanity checks in _read_opp_key()
  opp: Add support for parsing interconnect bandwidth
  cpufreq: tegra186: add CPUFREQ_NEED_INITIAL_FREQ_CHECK flag
  OPP: Add helpers for reading the binding properties
  dt-bindings: opp: Introduce opp-peak-kBps and opp-avg-kBps bindings
parents 49f13b09 50dd154e

Documentation/devicetree/bindings/opp/opp.txt

+14 −3
Original line number Diff line number Diff line
@@ -83,9 +83,14 @@ properties. 


Required properties:

- opp-hz: Frequency in Hz, expressed as a 64-bit big-endian integer. This is a

  required property for all device nodes but devices like power domains. The

  power domain nodes must have another (implementation dependent) property which

  uniquely identifies the OPP nodes.

  required property for all device nodes, unless another "required" property to

  uniquely identify the OPP nodes exists. Devices like power domains must have

  another (implementation dependent) property.



- opp-peak-kBps: Peak bandwidth in kilobytes per second, expressed as an array

  of 32-bit big-endian integers. Each element of the array represents the

  peak bandwidth value of each interconnect path. The number of elements should

  match the number of interconnect paths.



Optional properties:

- opp-microvolt: voltage in micro Volts.
@@ -132,6 +137,12 @@ Optional properties: 
- opp-level: A value representing the performance level of the device,

  expressed as a 32-bit integer.



- opp-avg-kBps: Average bandwidth in kilobytes per second, expressed as an array

  of 32-bit big-endian integers. Each element of the array represents the

  average bandwidth value of each interconnect path. The number of elements

  should match the number of interconnect paths. This property is only

  meaningful in OPP tables where opp-peak-kBps is present.



- clock-latency-ns: Specifies the maximum possible transition latency (in

  nanoseconds) for switching to this OPP from any other OPP.

Documentation/devicetree/bindings/property-units.txt

+4 −0
Original line number Diff line number Diff line
@@ -41,3 +41,7 @@ Temperature 
Pressure

----------------------------------------

-kpascal	: kilopascal



Throughput

----------------------------------------

-kBps		: kilobytes per second

drivers/acpi/device_pm.c

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ int acpi_device_set_power(struct acpi_device *device, int state) 
		 * possibly drop references to the power resources in use.

		 */

		state = ACPI_STATE_D3_HOT;

		/* If _PR3 is not available, use D3hot as the target state. */

		/* If D3cold is not supported, use D3hot as the target state. */

		if (!device->power.states[ACPI_STATE_D3_COLD].flags.valid)

			target_state = state;

	} else if (!device->power.states[state].flags.valid) {

drivers/acpi/scan.c

+19 −9
Original line number Diff line number Diff line
@@ -918,12 +918,9 @@ static void acpi_bus_init_power_state(struct acpi_device *device, int state) 


		if (buffer.length && package

		    && package->type == ACPI_TYPE_PACKAGE

		    && package->package.count) {

			int err = acpi_extract_power_resources(package, 0,

							       &ps->resources);

			if (!err)

				device->power.flags.power_resources = 1;

		}

		    && package->package.count)

			acpi_extract_power_resources(package, 0, &ps->resources);



		ACPI_FREE(buffer.pointer);

	}
@@ -970,14 +967,27 @@ static void acpi_bus_get_power_flags(struct acpi_device *device) 
		acpi_bus_init_power_state(device, i);



	INIT_LIST_HEAD(&device->power.states[ACPI_STATE_D3_COLD].resources);

	if (!list_empty(&device->power.states[ACPI_STATE_D3_HOT].resources))

		device->power.states[ACPI_STATE_D3_COLD].flags.valid = 1;



	/* Set defaults for D0 and D3hot states (always valid) */

	/* Set the defaults for D0 and D3hot (always supported). */

	device->power.states[ACPI_STATE_D0].flags.valid = 1;

	device->power.states[ACPI_STATE_D0].power = 100;

	device->power.states[ACPI_STATE_D3_HOT].flags.valid = 1;



	/*

	 * Use power resources only if the D0 list of them is populated, because

	 * some platforms may provide _PR3 only to indicate D3cold support and

	 * in those cases the power resources list returned by it may be bogus.

	 */

	if (!list_empty(&device->power.states[ACPI_STATE_D0].resources)) {

		device->power.flags.power_resources = 1;

		/*

		 * D3cold is supported if the D3hot list of power resources is

		 * not empty.

		 */

		if (!list_empty(&device->power.states[ACPI_STATE_D3_HOT].resources))

			device->power.states[ACPI_STATE_D3_COLD].flags.valid = 1;

	}



	if (acpi_bus_init_power(device))

		device->flags.power_manageable = 0;

}

drivers/cpufreq/acpi-cpufreq.c

+8 −6
Original line number Diff line number Diff line
@@ -126,12 +126,12 @@ static void boost_set_msr_each(void *p_en) 
	boost_set_msr(enable);

}



static int set_boost(int val)

static int set_boost(struct cpufreq_policy *policy, int val)

{

	get_online_cpus();

	on_each_cpu(boost_set_msr_each, (void *)(long)val, 1);

	put_online_cpus();

	pr_debug("Core Boosting %sabled.\n", val ? "en" : "dis");

	on_each_cpu_mask(policy->cpus, boost_set_msr_each,

			 (void *)(long)val, 1);

	pr_debug("CPU %*pbl: Core Boosting %sabled.\n",

		 cpumask_pr_args(policy->cpus), val ? "en" : "dis");



	return 0;

}
@@ -162,7 +162,9 @@ static ssize_t store_cpb(struct cpufreq_policy *policy, const char *buf, 
	if (ret || val > 1)

		return -EINVAL;



	set_boost(val);

	get_online_cpus();

	set_boost(policy, val);

	put_online_cpus();



	return count;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE