]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge tag 'cpufreq-arm-updates-6.15' of git://git.kernel.org/pub/scm/linux/kernel...
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 22 Mar 2025 14:00:00 +0000 (15:00 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 22 Mar 2025 14:00:00 +0000 (15:00 +0100)
Merge ARM cpufreq updates for 6.15 from Viresh Kumar:

"- manage sysfs attributes and boost frequencies efficiently from cpufreq
   core to reduce boilerplate code from drivers (Viresh Kumar).

 - Minor cleanups to cpufreq drivers (Aaron Kling, Benjamin Schneider,
   Dhananjay Ugwekar, Imran Shaik, and zuoqian).

 - Migrate to using for_each_present_cpu (Jacky Bai).

 - cpufreq-qcom-hw DT binding fixes (Krzysztof Kozlowski).

 - Use str_enable_disable() helper (Lifeng Zheng)."

* tag 'cpufreq-arm-updates-6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm: (59 commits)
  dt-bindings: cpufreq: cpufreq-qcom-hw: Narrow properties on SDX75, SA8775p and SM8650
  dt-bindings: cpufreq: cpufreq-qcom-hw: Drop redundant minItems:1
  dt-bindings: cpufreq: cpufreq-qcom-hw: Add missing constraint for interrupt-names
  dt-bindings: cpufreq: cpufreq-qcom-hw: Add QCS8300 compatible
  cpufreq: Init cpufreq only for present CPUs
  cpufreq: tegra186: Share policy per cluster
  cpufreq: tegra194: Allow building for Tegra234
  cpufreq: enable 1200Mhz clock speed for armada-37xx
  cpufreq: Remove cpufreq_enable_boost_support()
  cpufreq: staticize policy_has_boost_freq()
  cpufreq: qcom: Set .set_boost directly
  cpufreq: dt: Set .set_boost directly
  cpufreq: scmi: Set .set_boost directly
  cpufreq: powernv: Set .set_boost directly
  cpufreq: loongson: Set .set_boost directly
  cpufreq: apple: Set .set_boost directly
  cpufreq: Restrict enabling boost on policies with no boost frequencies
  cpufreq: cppc: Set policy->boost_supported
  cpufreq: amd: Set policy->boost_supported
  cpufreq: acpi: Set policy->boost_supported
  ...

1  2 
drivers/cpufreq/amd-pstate.c
include/linux/cpufreq.h

index 024d33d5e3670acfaa469030c1596aa85df2cba6,41d83dd50a710aa2a47f559ed01cf6264007810c..6789eed1bb5ba00a6519a2c4c6d110c8f7abe27f
@@@ -984,20 -995,16 +984,20 @@@ static int amd_pstate_cpu_init(struct c
        policy->cpuinfo.transition_latency = amd_pstate_get_transition_latency(policy->cpu);
        policy->transition_delay_us = amd_pstate_get_transition_delay_us(policy->cpu);
  
 -      policy->min = min_freq;
 -      policy->max = max_freq;
 +      perf = READ_ONCE(cpudata->perf);
  
 -      policy->cpuinfo.min_freq = min_freq;
 -      policy->cpuinfo.max_freq = max_freq;
 +      policy->cpuinfo.min_freq = policy->min = perf_to_freq(perf,
 +                                                            cpudata->nominal_freq,
 +                                                            perf.lowest_perf);
 +      policy->cpuinfo.max_freq = policy->max = perf_to_freq(perf,
 +                                                            cpudata->nominal_freq,
 +                                                            perf.highest_perf);
 +
 +      ret = amd_pstate_cppc_enable(policy);
 +      if (ret)
 +              goto free_cpudata1;
  
-       policy->boost_enabled = READ_ONCE(cpudata->boost_supported);
+       policy->boost_supported = READ_ONCE(cpudata->boost_supported);
  
        /* It will be updated by governor */
        policy->cur = policy->cpuinfo.min_freq;
@@@ -1474,8 -1490,14 +1474,8 @@@ static int amd_pstate_epp_cpu_init(stru
        /* It will be updated by governor */
        policy->cur = policy->cpuinfo.min_freq;
  
 -      policy->driver_data = cpudata;
 -
 -      policy->min = policy->cpuinfo.min_freq;
 -      policy->max = policy->cpuinfo.max_freq;
  
-       policy->boost_enabled = READ_ONCE(cpudata->boost_supported);
+       policy->boost_supported = READ_ONCE(cpudata->boost_supported);
  
        /*
         * Set the policy to provide a valid fallback value in case
Simple merge