cpufreq: Remove driver default policy->min/max init

Prior to commit 521223d8b3ec ("cpufreq: Fix initialization of min and
max frequency QoS requests"), drivers were setting policy->min/max and
these values were used as initial policy QoS constraints.

After the above commit, these values are only used temporarily, as
cpufreq_set_policy() ultimately overrides them through:

cpufreq_policy_online()
\-cpufreq_init_policy()
  \-cpufreq_set_policy()
    \-/* Set policy->min/max */

A subsequent change will restore the previous behavior allowing
drivers to request special min/max QoS frequencies instead of
FREQ_QOS_MIN_DEFAULT_VALUE and FREQ_QOS_MAX_DEFAULT_VALUE, respectively,
if desired. For instance, the CPPC driver wants to advertise the lowest
non-linear frequency that should be used as the initial minimum
frequency QoS request.

However, for this purpose, all drivers setting policy->min/max to
policy->cpuinfo.min/max_freq, respectively, need to be updated so
their initial policy->min/max settings don't limit the frequency
scaling unnecessarily going forward (which would defeat the purpose
of commit 521223d8b3ec), so do that.

This does not actually alter the observed behavior of all of
the drivers in question because setting policy->min/max to
policy->cpuinfo.min/max_freq, respectively, is not necessary or
even useful any more after a previous change ("cpufreq: Set default
policy->min/max values for all drivers").

Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
Acked-by: Jie Zhan <zhanjie9@hisilicon.com>
[ rjw: Changelog rewrite ]
Link: https://patch.msgid.link/20260528090913.2759118-4-pierre.gondois@arm.com
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c
index 6f415860bd2a42ca44e0bcdf8da272605c8c14d0..07fc6ac3daf8f35f6b52fc4fd003642d9672b42a 100644 (file)
--- a/drivers/cpufreq/amd-pstate.c
+++ b/drivers/cpufreq/amd-pstate.c
@@ -1080,10 +1080,9 @@ static int amd_pstate_cpu_init(struct cpufreq_policy *policy)
 
        perf = READ_ONCE(cpudata->perf);
 
-       policy->cpuinfo.min_freq = policy->min = perf_to_freq(perf,
-                                                             cpudata->nominal_freq,
-                                                             perf.lowest_perf);
-       policy->cpuinfo.max_freq = policy->max = cpudata->max_freq;
+       policy->cpuinfo.min_freq = perf_to_freq(perf, cpudata->nominal_freq,
+                                               perf.lowest_perf);
+       policy->cpuinfo.max_freq = cpudata->max_freq;
 
        policy->driver_data = cpudata;
        ret = amd_pstate_cppc_enable(policy);
@@ -1909,10 +1908,9 @@ static int amd_pstate_epp_cpu_init(struct cpufreq_policy *policy)
 
        perf = READ_ONCE(cpudata->perf);
 
-       policy->cpuinfo.min_freq = policy->min = perf_to_freq(perf,
-                                                             cpudata->nominal_freq,
-                                                             perf.lowest_perf);
-       policy->cpuinfo.max_freq = policy->max = cpudata->max_freq;
+       policy->cpuinfo.min_freq = perf_to_freq(perf, cpudata->nominal_freq,
+                                               perf.lowest_perf);
+       policy->cpuinfo.max_freq = cpudata->max_freq;
        policy->driver_data = cpudata;
 
        ret = amd_pstate_cppc_enable(policy);

diff --git a/drivers/cpufreq/cppc_cpufreq.c b/drivers/cpufreq/cppc_cpufreq.c
index bf5175f7551c7191614059cf7600e986880c09d9..f6cea0c54dd9cfd04d41b8d464c29725b0079e63 100644 (file)
--- a/drivers/cpufreq/cppc_cpufreq.c
+++ b/drivers/cpufreq/cppc_cpufreq.c
@@ -660,8 +660,6 @@ static int cppc_cpufreq_cpu_init(struct cpufreq_policy *policy)
         * Section 8.4.7.1.1.5 of ACPI 6.1 spec)
         */
        policy->min = cppc_perf_to_khz(caps, caps->lowest_nonlinear_perf);
-       policy->max = cppc_perf_to_khz(caps, policy->boost_enabled ?
-                                               caps->highest_perf : caps->nominal_perf);
 
        /*
         * Set cpuinfo.min_freq to Lowest to make the full range of performance
@@ -669,7 +667,8 @@ static int cppc_cpufreq_cpu_init(struct cpufreq_policy *policy)
         * nonlinear perf
         */
        policy->cpuinfo.min_freq = cppc_perf_to_khz(caps, caps->lowest_perf);
-       policy->cpuinfo.max_freq = policy->max;
+       policy->cpuinfo.max_freq = cppc_perf_to_khz(caps, policy->boost_enabled ?
+                                                   caps->highest_perf : caps->nominal_perf);
 
        policy->transition_delay_us = cppc_cpufreq_get_transition_delay_us(cpu);
        policy->shared_type = cpu_data->shared_type;

diff --git a/drivers/cpufreq/cpufreq-nforce2.c b/drivers/cpufreq/cpufreq-nforce2.c
index fbbbe501cf2dc1b862190bf8091104cc390632c1..831102522ad644b3b5ae1d91564d233d20c3f980 100644 (file)
--- a/drivers/cpufreq/cpufreq-nforce2.c
+++ b/drivers/cpufreq/cpufreq-nforce2.c
@@ -355,8 +355,8 @@ static int nforce2_cpu_init(struct cpufreq_policy *policy)
                min_fsb = NFORCE2_MIN_FSB;
 
        /* cpuinfo and default policy values */
-       policy->min = policy->cpuinfo.min_freq = min_fsb * fid * 100;
-       policy->max = policy->cpuinfo.max_freq = max_fsb * fid * 100;
+       policy->cpuinfo.min_freq = min_fsb * fid * 100;
+       policy->cpuinfo.max_freq = max_fsb * fid * 100;
 
        return 0;
 }

diff --git a/drivers/cpufreq/freq_table.c b/drivers/cpufreq/freq_table.c
index 5b364d8da4f92794dc5b9a91c5b6557f89cfadec..ea994647abc88557ebed29f45455b72b8c2386c9 100644 (file)
--- a/drivers/cpufreq/freq_table.c
+++ b/drivers/cpufreq/freq_table.c
@@ -49,16 +49,15 @@ int cpufreq_frequency_table_cpuinfo(struct cpufreq_policy *policy)
                        max_freq = freq;
        }
 
-       policy->min = policy->cpuinfo.min_freq = min_freq;
-       policy->max = max_freq;
+       policy->cpuinfo.min_freq = min_freq;
        /*
         * If the driver has set its own cpuinfo.max_freq above max_freq, leave
         * it as is.
         */
        if (policy->cpuinfo.max_freq < max_freq)
-               policy->max = policy->cpuinfo.max_freq = max_freq;
+               policy->cpuinfo.max_freq = max_freq;
 
-       if (policy->min == ~0)
+       if (min_freq == ~0)
                return -EINVAL;
        else
                return 0;

diff --git a/drivers/cpufreq/gx-suspmod.c b/drivers/cpufreq/gx-suspmod.c
index d269a4f26f98ea762b1708fb7df6984712d5542f..d40c9e0bbb740f4a0fca9e7dcfbc381503c67cce 100644 (file)
--- a/drivers/cpufreq/gx-suspmod.c
+++ b/drivers/cpufreq/gx-suspmod.c
@@ -421,7 +421,7 @@ static int cpufreq_gx_cpu_init(struct cpufreq_policy *policy)
                policy->min = maxfreq / max_duration;
        else
                policy->min = maxfreq / POLICY_MIN_DIV;
-       policy->max = maxfreq;
+
        policy->cpuinfo.min_freq = maxfreq / max_duration;
        policy->cpuinfo.max_freq = maxfreq;
 

diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index 8dc22a65e025815ecfde72080355b0066ec0e19a..5a0eeb84d3821db7c645015cb873421abe7d2cf5 100644 (file)
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -3051,9 +3051,6 @@ static int __intel_pstate_cpu_init(struct cpufreq_policy *policy)
        policy->cpuinfo.max_freq = READ_ONCE(global.no_turbo) ?
                        cpu->pstate.max_freq : cpu->pstate.turbo_freq;
 
-       policy->min = policy->cpuinfo.min_freq;
-       policy->max = policy->cpuinfo.max_freq;
-
        intel_pstate_init_acpi_perf_limits(policy);
 
        policy->fast_switch_possible = true;

diff --git a/drivers/cpufreq/pcc-cpufreq.c b/drivers/cpufreq/pcc-cpufreq.c
index a355ec4f3dd4cd04e5542c8547804a0b8c7917b8..83e6f73dc9a4b0528a4d10fd4706df297706ff87 100644 (file)
--- a/drivers/cpufreq/pcc-cpufreq.c
+++ b/drivers/cpufreq/pcc-cpufreq.c
@@ -553,13 +553,11 @@ static int pcc_cpufreq_cpu_init(struct cpufreq_policy *policy)
                goto out;
        }
 
-       policy->max = policy->cpuinfo.max_freq =
-               ioread32(&pcch_hdr->nominal) * 1000;
-       policy->min = policy->cpuinfo.min_freq =
-               ioread32(&pcch_hdr->minimum_frequency) * 1000;
+       policy->cpuinfo.max_freq = ioread32(&pcch_hdr->nominal) * 1000;
+       policy->cpuinfo.min_freq = ioread32(&pcch_hdr->minimum_frequency) * 1000;
 
-       pr_debug("init: policy->max is %d, policy->min is %d\n",
-               policy->max, policy->min);
+       pr_debug("init: max_freq is %d, min_freq is %d\n",
+                policy->cpuinfo.max_freq, policy->cpuinfo.min_freq);
 out:
        return result;
 }

diff --git a/drivers/cpufreq/pxa3xx-cpufreq.c b/drivers/cpufreq/pxa3xx-cpufreq.c
index 50ff3b6a69000b14d8465eb6539d210013fb72d8..06b27cbc59d6a54771803d283ad821fc0b0c0a55 100644 (file)
--- a/drivers/cpufreq/pxa3xx-cpufreq.c
+++ b/drivers/cpufreq/pxa3xx-cpufreq.c
@@ -185,9 +185,8 @@ static int pxa3xx_cpufreq_init(struct cpufreq_policy *policy)
        int ret = -EINVAL;
 
        /* set default policy and cpuinfo */
-       policy->min = policy->cpuinfo.min_freq = 104000;
-       policy->max = policy->cpuinfo.max_freq =
-               (cpu_is_pxa320()) ? 806000 : 624000;
+       policy->cpuinfo.min_freq = 104000;
+       policy->cpuinfo.max_freq = (cpu_is_pxa320()) ? 806000 : 624000;
        policy->cpuinfo.transition_latency = 1000; /* FIXME: 1 ms, assumed */
 
        if (cpu_is_pxa300() || cpu_is_pxa310())

diff --git a/drivers/cpufreq/sh-cpufreq.c b/drivers/cpufreq/sh-cpufreq.c
index 642ddb9ea217ed8421c8aec038d0b644636586da..3c99d7009cbe2293688808009e46edc1d136eb1d 100644 (file)
--- a/drivers/cpufreq/sh-cpufreq.c
+++ b/drivers/cpufreq/sh-cpufreq.c
@@ -124,10 +124,8 @@ static int sh_cpufreq_cpu_init(struct cpufreq_policy *policy)
                dev_notice(dev, "no frequency table found, falling back "
                           "to rate rounding.\n");
 
-               policy->min = policy->cpuinfo.min_freq =
-                       (clk_round_rate(cpuclk, 1) + 500) / 1000;
-               policy->max = policy->cpuinfo.max_freq =
-                       (clk_round_rate(cpuclk, ~0UL) + 500) / 1000;
+               policy->cpuinfo.min_freq = (clk_round_rate(cpuclk, 1) + 500) / 1000;
+               policy->cpuinfo.max_freq = (clk_round_rate(cpuclk, ~0UL) + 500) / 1000;
        }
 
        return 0;

diff --git a/drivers/cpufreq/virtual-cpufreq.c b/drivers/cpufreq/virtual-cpufreq.c
index 4159f31349b168796ea7fd95b01dea342b43fcb5..dc78b74409af45f35cd085a2e5ec0552ea4bf3a6 100644 (file)
--- a/drivers/cpufreq/virtual-cpufreq.c
+++ b/drivers/cpufreq/virtual-cpufreq.c
@@ -164,10 +164,7 @@ static int virt_cpufreq_get_freq_info(struct cpufreq_policy *policy)
                policy->cpuinfo.min_freq = 1;
                policy->cpuinfo.max_freq = virt_cpufreq_get_perftbl_entry(policy->cpu, 0);
 
-               policy->min = policy->cpuinfo.min_freq;
-               policy->max = policy->cpuinfo.max_freq;
-
-               policy->cur = policy->max;
+               policy->cur = policy->cpuinfo.max_freq;
                return 0;
        }