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

Merge branches 'pm-em' and 'pm-cpuidle' 

Marge Energy Model support updates and cpuidle updates for 5.19-rc1:

 - Update the Energy Model support code to allow the Energy Model to be
   artificial, which means that the power values may not be on a uniform
   scale with other devices providing power information, and update the
   cpufreq_cooling and devfreq_cooling thermal drivers to support
   artificial Energy Models (Lukasz Luba).

 - Make DTPM check the Energy Model type (Lukasz Luba).

 - Fix policy counter decrementation in cpufreq if Energy Model is in
   use (Pierre Gondois).

 - Add AlderLake processor support to the intel_idle driver (Zhang Rui).

 - Fix regression leading to no genpd governor in the PSCI cpuidle
   driver and fix the riscv-sbi cpuidle driver to allow a genpd
   governor to be used (Ulf Hansson).

* pm-em:
  PM: EM: Decrement policy counter
  powercap: DTPM: Check for Energy Model type
  thermal: cooling: Check Energy Model type in cpufreq_cooling and devfreq_cooling
  Documentation: EM: Add artificial EM registration description
  PM: EM: Remove old debugfs files and print all 'flags'
  PM: EM: Change the order of arguments in the .active_power() callback
  PM: EM: Use the new .get_cost() callback while registering EM
  PM: EM: Add artificial EM flag
  PM: EM: Add .get_cost() callback

* pm-cpuidle:
  cpuidle: riscv-sbi: Fix code to allow a genpd governor to be used
  cpuidle: psci: Fix regression leading to no genpd governor
  intel_idle: Add AlderLake support
parents 95f2ce54 c9d8923b a6653fb5

Documentation/power/energy-model.rst

+22 −2
Original line number Diff line number Diff line
@@ -123,6 +123,26 @@ allows a platform to register EM power values which are reflecting total power 
(static + dynamic). These power values might be coming directly from

experiments and measurements.



Registration of 'artificial' EM

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~



There is an option to provide a custom callback for drivers missing detailed

knowledge about power value for each performance state. The callback

.get_cost() is optional and provides the 'cost' values used by the EAS.

This is useful for platforms that only provide information on relative

efficiency between CPU types, where one could use the information to

create an abstract power model. But even an abstract power model can

sometimes be hard to fit in, given the input power value size restrictions.

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

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

to test and treat this flag properly.



Registration of 'simple' EM

~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -181,8 +201,8 @@ EM framework:: 


  -> drivers/cpufreq/foo_cpufreq.c



  01	static int est_power(unsigned long *mW, unsigned long *KHz,

  02			struct device *dev)

  01	static int est_power(struct device *dev, unsigned long *mW,

  02			unsigned long *KHz)

  03	{

  04		long freq, power;

  05

drivers/cpufreq/mediatek-cpufreq-hw.c

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



static int __maybe_unused

mtk_cpufreq_get_cpu_power(unsigned long *mW,

			  unsigned long *KHz, struct device *cpu_dev)

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

			  unsigned long *KHz)

{

	struct mtk_cpufreq_data *data;

	struct cpufreq_policy *policy;

drivers/cpufreq/scmi-cpufreq.c

+2 −2
Original line number Diff line number Diff line
@@ -96,8 +96,8 @@ scmi_get_sharing_cpus(struct device *cpu_dev, struct cpumask *cpumask) 
}



static int __maybe_unused

scmi_get_cpu_power(unsigned long *power, unsigned long *KHz,

		   struct device *cpu_dev)

scmi_get_cpu_power(struct device *cpu_dev, unsigned long *power,

		   unsigned long *KHz)

{

	unsigned long Hz;

	int ret, domain;

drivers/cpuidle/cpuidle-psci-domain.c

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static int psci_pd_init(struct device_node *np, bool use_osi) 
	struct generic_pm_domain *pd;

	struct psci_pd_provider *pd_provider;

	struct dev_power_governor *pd_gov;

	int ret = -ENOMEM, state_count = 0;

	int ret = -ENOMEM;



	pd = dt_idle_pd_alloc(np, psci_dt_parse_state_node);

	if (!pd)
@@ -71,7 +71,7 @@ static int psci_pd_init(struct device_node *np, bool use_osi) 
		pd->flags |= GENPD_FLAG_ALWAYS_ON;



	/* Use governor for CPU PM domains if it has some states to manage. */

	pd_gov = state_count > 0 ? &pm_domain_cpu_gov : NULL;

	pd_gov = pd->states ? &pm_domain_cpu_gov : NULL;



	ret = pm_genpd_init(pd, pd_gov, false);

	if (ret)

drivers/cpuidle/cpuidle-riscv-sbi.c

+2 −2
Original line number Diff line number Diff line
@@ -414,7 +414,7 @@ static int sbi_pd_init(struct device_node *np) 
	struct generic_pm_domain *pd;

	struct sbi_pd_provider *pd_provider;

	struct dev_power_governor *pd_gov;

	int ret = -ENOMEM, state_count = 0;

	int ret = -ENOMEM;



	pd = dt_idle_pd_alloc(np, sbi_dt_parse_state_node);

	if (!pd)
@@ -433,7 +433,7 @@ static int sbi_pd_init(struct device_node *np) 
		pd->flags |= GENPD_FLAG_ALWAYS_ON;



	/* Use governor for CPU PM domains if it has some states to manage. */

	pd_gov = state_count > 0 ? &pm_domain_cpu_gov : NULL;

	pd_gov = pd->states ? &pm_domain_cpu_gov : NULL;



	ret = pm_genpd_init(pd, pd_gov, false);

	if (ret)