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

Merge branches 'pm-core', 'pm-sleep', 'powercap', 'pm-domains' and 'pm-em' 

Merge core device power management changes for v5.20-rc1:

 - Extend support for wakeirq to callback wrappers used during system
   suspend and resume (Ulf Hansson).

 - Defer waiting for device probe before loading a hibernation image
   till the first actual device access to avoid possible deadlocks
   reported by syzbot (Tetsuo Handa).

 - Unify device_init_wakeup() for PM_SLEEP and !PM_SLEEP (Bjorn
   Helgaas).

 - Add Raptor Lake-P to the list of processors supported by the Intel
   RAPL driver (George D Sworo).

 - Add Alder Lake-N and Raptor Lake-P to the list of processors for
   which Power Limit4 is supported in the Intel RAPL driver (Sumeet
   Pawnikar).

 - Make pm_genpd_remove() check genpd_debugfs_dir against NULL before
   attempting to remove it (Hsin-Yi Wang).

 - Change the Energy Model code to represent power in micro-Watts and
   adjust its users accordingly (Lukasz Luba).

* pm-core:
  PM: runtime: Extend support for wakeirq for force_suspend|resume

* pm-sleep:
  PM: hibernate: defer device probing when resuming from hibernation
  PM: wakeup: Unify device_init_wakeup() for PM_SLEEP and !PM_SLEEP

* powercap:
  powercap: RAPL: Add Power Limit4 support for Alder Lake-N and Raptor Lake-P
  powercap: intel_rapl: Add support for RAPTORLAKE_P

* pm-domains:
  PM: domains: Ensure genpd_debugfs_dir exists before remove

* pm-em:
  cpufreq: scmi: Support the power scale in micro-Watts in SCMI v3.1
  firmware: arm_scmi: Get detailed power scale from perf
  Documentation: EM: Switch to micro-Watts scale
  PM: EM: convert power field to micro-Watts precision and align drivers
parents 82b6c2e7 c46a0d5a 8386c414 b08b95cf 37101d3c f3ac888f

Documentation/power/energy-model.rst

+7 −7
Original line number Diff line number Diff line
@@ -20,20 +20,20 @@ possible source of information on its own, the EM framework intervenes as an 
abstraction layer which standardizes the format of power cost tables in the

kernel, hence enabling to avoid redundant work.



The power values might be expressed in milli-Watts or in an 'abstract scale'.

The power values might be expressed in micro-Watts or in an 'abstract scale'.

Multiple subsystems might use the EM and it is up to the system integrator to

check that the requirements for the power value scale types are met. An example

can be found in the Energy-Aware Scheduler documentation

Documentation/scheduler/sched-energy.rst. For some subsystems like thermal or

powercap power values expressed in an 'abstract scale' might cause issues.

These subsystems are more interested in estimation of power used in the past,

thus the real milli-Watts might be needed. An example of these requirements can

thus the real micro-Watts might be needed. An example of these requirements can

be found in the Intelligent Power Allocation in

Documentation/driver-api/thermal/power_allocator.rst.

Kernel subsystems might implement automatic detection to check whether EM

registered devices have inconsistent scale (based on EM internal flag).

Important thing to keep in mind is that when the power values are expressed in

an 'abstract scale' deriving real energy in milli-Joules would not be possible.

an 'abstract scale' deriving real energy in micro-Joules would not be possible.



The figure below depicts an example of drivers (Arm-specific here, but the

approach is applicable to any architecture) providing power costs to the EM
@@ -98,7 +98,7 @@ Drivers are expected to register performance domains into the EM framework by 
calling the following API::



  int em_dev_register_perf_domain(struct device *dev, unsigned int nr_states,

		struct em_data_callback *cb, cpumask_t *cpus, bool milliwatts);

		struct em_data_callback *cb, cpumask_t *cpus, bool microwatts);



Drivers must provide a callback function returning <frequency, power> tuples

for each performance state. The callback function provided by the driver is free
@@ -106,10 +106,10 @@ to fetch data from any relevant location (DT, firmware, ...), and by any mean 
deemed necessary. Only for CPU devices, drivers must specify the CPUs of the

performance domains using cpumask. For other devices than CPUs the last

argument must be set to NULL.

The last argument 'milliwatts' is important to set with correct value. Kernel

The last argument 'microwatts' is important to set with correct value. Kernel

subsystems which use EM might rely on this flag to check if all EM devices use

the same scale. If there are different scales, these subsystems might decide

to: return warning/error, stop working or panic.

to return warning/error, stop working or panic.

See Section 3. for an example of driver implementing this

callback, or Section 2.4 for further documentation on this API
@@ -137,7 +137,7 @@ The .get_cost() allows to provide the 'cost' values which reflect the 
efficiency of the CPUs. This would allow to provide EAS information which

has different relation than what would be forced by the EM internal

formulas calculating 'cost' values. To register an EM for such platform, the

driver must set the flag 'milliwatts' to 0, provide .get_power() callback

driver must set the flag 'microwatts' to 0, provide .get_power() callback

and provide .get_cost() callback. The EM framework would handle such platform

properly during registration. A flag EM_PERF_DOMAIN_ARTIFICIAL is set for such

platform. Special care should be taken by other frameworks which are using EM

drivers/base/power/domain.c

+3 −0
Original line number Diff line number Diff line
@@ -222,6 +222,9 @@ static void genpd_debug_remove(struct generic_pm_domain *genpd) 
{

	struct dentry *d;



	if (!genpd_debugfs_dir)

		return;



	d = debugfs_lookup(genpd->name, genpd_debugfs_dir);

	debugfs_remove(d);

}

drivers/base/power/runtime.c

+6 −0
Original line number Diff line number Diff line
@@ -1862,10 +1862,13 @@ int pm_runtime_force_suspend(struct device *dev) 


	callback = RPM_GET_CALLBACK(dev, runtime_suspend);



	dev_pm_enable_wake_irq_check(dev, true);

	ret = callback ? callback(dev) : 0;

	if (ret)

		goto err;



	dev_pm_enable_wake_irq_complete(dev);



	/*

	 * If the device can stay in suspend after the system-wide transition

	 * to the working state that will follow, drop the children counter of
@@ -1882,6 +1885,7 @@ int pm_runtime_force_suspend(struct device *dev) 
	return 0;



err:

	dev_pm_disable_wake_irq_check(dev, true);

	pm_runtime_enable(dev);

	return ret;

}
@@ -1915,9 +1919,11 @@ int pm_runtime_force_resume(struct device *dev) 


	callback = RPM_GET_CALLBACK(dev, runtime_resume);



	dev_pm_disable_wake_irq_check(dev, false);

	ret = callback ? callback(dev) : 0;

	if (ret) {

		pm_runtime_set_suspended(dev);

		dev_pm_enable_wake_irq_check(dev, false);

		goto out;

	}

drivers/base/power/wakeup.c

+0 −30
Original line number Diff line number Diff line
@@ -500,36 +500,6 @@ void device_set_wakeup_capable(struct device *dev, bool capable) 
}

EXPORT_SYMBOL_GPL(device_set_wakeup_capable);



/**

 * device_init_wakeup - Device wakeup initialization.

 * @dev: Device to handle.

 * @enable: Whether or not to enable @dev as a wakeup device.

 *

 * By default, most devices should leave wakeup disabled.  The exceptions are

 * devices that everyone expects to be wakeup sources: keyboards, power buttons,

 * possibly network interfaces, etc.  Also, devices that don't generate their

 * own wakeup requests but merely forward requests from one bus to another

 * (like PCI bridges) should have wakeup enabled by default.

 */

int device_init_wakeup(struct device *dev, bool enable)

{

	int ret = 0;



	if (!dev)

		return -EINVAL;



	if (enable) {

		device_set_wakeup_capable(dev, true);

		ret = device_wakeup_enable(dev);

	} else {

		device_wakeup_disable(dev);

		device_set_wakeup_capable(dev, false);

	}



	return ret;

}

EXPORT_SYMBOL_GPL(device_init_wakeup);



/**

 * device_set_wakeup_enable - Enable or disable a device to wake up the system.

 * @dev: Device to handle.

drivers/cpufreq/mediatek-cpufreq-hw.c

+4 −3
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static const u16 cpufreq_mtk_offsets[REG_ARRAY_SIZE] = { 
};



static int __maybe_unused

mtk_cpufreq_get_cpu_power(struct device *cpu_dev, unsigned long *mW,

mtk_cpufreq_get_cpu_power(struct device *cpu_dev, unsigned long *uW,

			  unsigned long *KHz)

{

	struct mtk_cpufreq_data *data;
@@ -71,8 +71,9 @@ mtk_cpufreq_get_cpu_power(struct device *cpu_dev, unsigned long *mW, 
	i--;



	*KHz = data->table[i].frequency;

	*mW = readl_relaxed(data->reg_bases[REG_EM_POWER_TBL] +

			    i * LUT_ROW_SIZE) / 1000;

	/* Provide micro-Watts value to the Energy Model */

	*uW = readl_relaxed(data->reg_bases[REG_EM_POWER_TBL] +

			    i * LUT_ROW_SIZE);



	return 0;

}