Commit d863f053 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm-6.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull power management fixes from Rafael Wysocki:
 "These fix assorted issues in the ARM cpufreq drivers and in the AMD
  P-state driver.

  Specifics:

   - Fix cpufreq policy reference counting in amd-pstate to prevent it
     from crashing on removal (Perry Yuan)

   - Fix double initialization and set suspend-freq for Apple's cpufreq
     driver (Arnd Bergmann, Hector Martin)

   - Fix reading of "reg" property, update cpufreq-dt's blocklist and
     update DT documentation for Qualcomm's cpufreq driver (Konrad
     Dybcio, Krzysztof Kozlowski)

   - Replace 0 with NULL in the Armada cpufreq driver (Miles Chen)

   - Fix potential overflows in the CPPC cpufreq driver (Pierre Gondois)

   - Update blocklist for the Tegra234 Soc cpufreq driver (Sumit Gupta)"

* tag 'pm-6.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  cpufreq: amd-pstate: fix kernel hang issue while amd-pstate unregistering
  cpufreq: armada-37xx: stop using 0 as NULL pointer
  cpufreq: apple-soc: Switch to the lowest frequency on suspend
  dt-bindings: cpufreq: cpufreq-qcom-hw: document interrupts
  cpufreq: Add SM6375 to cpufreq-dt-platdev blocklist
  cpufreq: Add Tegra234 to cpufreq-dt-platdev blocklist
  cpufreq: qcom-hw: Fix reading "reg" with address/size-cells != 2
  cpufreq: CPPC: Add u64 casts to avoid overflowing
  cpufreq: apple: remove duplicate intializer
parents cdbbca25 4f3085f8

Documentation/devicetree/bindings/cpufreq/cpufreq-qcom-hw.yaml

+11 −0
Original line number Diff line number Diff line
@@ -54,6 +54,17 @@ properties: 
      - const: xo

      - const: alternate



  interrupts:

    minItems: 1

    maxItems: 3



  interrupt-names:

    minItems: 1

    items:

      - const: dcvsh-irq-0

      - const: dcvsh-irq-1

      - const: dcvsh-irq-2



  '#freq-domain-cells':

    const: 1

drivers/cpufreq/amd-pstate.c

+1 −0
Original line number Diff line number Diff line
@@ -307,6 +307,7 @@ static void amd_pstate_adjust_perf(unsigned int cpu, 
		max_perf = min_perf;



	amd_pstate_update(cpudata, min_perf, des_perf, max_perf, true);

	cpufreq_cpu_put(policy);

}



static int amd_get_min_freq(struct amd_cpudata *cpudata)

drivers/cpufreq/apple-soc-cpufreq.c

+2 −1
Original line number Diff line number Diff line
@@ -280,6 +280,7 @@ static int apple_soc_cpufreq_init(struct cpufreq_policy *policy) 
	policy->cpuinfo.transition_latency = transition_latency;

	policy->dvfs_possible_from_any_cpu = true;

	policy->fast_switch_possible = true;

	policy->suspend_freq = freq_table[0].frequency;



	if (policy_has_boost_freq(policy)) {

		ret = cpufreq_enable_boost_support();
@@ -321,7 +322,6 @@ static struct cpufreq_driver apple_soc_cpufreq_driver = { 
	.flags		= CPUFREQ_HAVE_GOVERNOR_PER_POLICY |

			  CPUFREQ_NEED_INITIAL_FREQ_CHECK | CPUFREQ_IS_COOLING_DEV,

	.verify		= cpufreq_generic_frequency_table_verify,

	.attr		= cpufreq_generic_attr,

	.get		= apple_soc_cpufreq_get_rate,

	.init		= apple_soc_cpufreq_init,

	.exit		= apple_soc_cpufreq_exit,
@@ -329,6 +329,7 @@ static struct cpufreq_driver apple_soc_cpufreq_driver = { 
	.fast_switch	= apple_soc_cpufreq_fast_switch,

	.register_em	= cpufreq_register_em_with_opp,

	.attr		= apple_soc_cpufreq_hw_attr,

	.suspend	= cpufreq_generic_suspend,

};



static int __init apple_soc_cpufreq_module_init(void)

drivers/cpufreq/armada-37xx-cpufreq.c

+1 −1
Original line number Diff line number Diff line
@@ -445,7 +445,7 @@ static int __init armada37xx_cpufreq_driver_init(void) 
		return -ENODEV;

	}



	clk = clk_get(cpu_dev, 0);

	clk = clk_get(cpu_dev, NULL);

	if (IS_ERR(clk)) {

		dev_err(cpu_dev, "Cannot get clock for CPU0\n");

		return PTR_ERR(clk);

drivers/cpufreq/cppc_cpufreq.c

+6 −5
Original line number Diff line number Diff line
@@ -487,7 +487,8 @@ static unsigned int get_perf_level_count(struct cpufreq_policy *policy) 
	cpu_data = policy->driver_data;

	perf_caps = &cpu_data->perf_caps;

	max_cap = arch_scale_cpu_capacity(cpu);

	min_cap = div_u64(max_cap * perf_caps->lowest_perf, perf_caps->highest_perf);

	min_cap = div_u64((u64)max_cap * perf_caps->lowest_perf,

			  perf_caps->highest_perf);

	if ((min_cap == 0) || (max_cap < min_cap))

		return 0;

	return 1 + max_cap / CPPC_EM_CAP_STEP - min_cap / CPPC_EM_CAP_STEP;
@@ -519,10 +520,10 @@ static int cppc_get_cpu_power(struct device *cpu_dev, 
	cpu_data = policy->driver_data;

	perf_caps = &cpu_data->perf_caps;

	max_cap = arch_scale_cpu_capacity(cpu_dev->id);

	min_cap = div_u64(max_cap * perf_caps->lowest_perf,

	min_cap = div_u64((u64)max_cap * perf_caps->lowest_perf,

			  perf_caps->highest_perf);



	perf_step = CPPC_EM_CAP_STEP * perf_caps->highest_perf / max_cap;

	perf_step = div_u64((u64)CPPC_EM_CAP_STEP * perf_caps->highest_perf,

			    max_cap);

	min_step = min_cap / CPPC_EM_CAP_STEP;

	max_step = max_cap / CPPC_EM_CAP_STEP;