diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-07-15 18:27:13 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-07-15 18:27:13 +0200 |
| commit | 161bd53e3248358029e1cdad02ab74f0003e6b02 (patch) | |
| tree | 5c38a82db8ee83cae7b02f219a9deab258e0c03f | |
| parent | Merge tag 'opp-updates-6.11' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/vireshk/pm into pm-opp (diff) | |
| parent | cpufreq: ACPI: Mark boost policy as enabled when setting boost (diff) | |
| download | wireguard-linux-161bd53e3248358029e1cdad02ab74f0003e6b02.tar.xz wireguard-linux-161bd53e3248358029e1cdad02ab74f0003e6b02.zip | |
Merge back final cpufreq fixes for 6.10.
| -rw-r--r-- | drivers/cpufreq/acpi-cpufreq.c | 4 | ||||
| -rw-r--r-- | drivers/cpufreq/cpufreq.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c index 37f1cdf46d29..4ac3a35dcd98 100644 --- a/drivers/cpufreq/acpi-cpufreq.c +++ b/drivers/cpufreq/acpi-cpufreq.c @@ -890,8 +890,10 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy) if (perf->states[0].core_frequency * 1000 != freq_table[0].frequency) pr_warn(FW_WARN "P-state 0 is not max freq\n"); - if (acpi_cpufreq_driver.set_boost) + if (acpi_cpufreq_driver.set_boost) { set_boost(policy, acpi_cpufreq_driver.boost_enabled); + policy->boost_enabled = acpi_cpufreq_driver.boost_enabled; + } return result; diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index a45aac17c20f..9e5060b27864 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -1431,7 +1431,8 @@ static int cpufreq_online(unsigned int cpu) } /* Let the per-policy boost flag mirror the cpufreq_driver boost during init */ - policy->boost_enabled = cpufreq_boost_enabled() && policy_has_boost_freq(policy); + if (cpufreq_boost_enabled() && policy_has_boost_freq(policy)) + policy->boost_enabled = true; /* * The initialization has succeeded and the policy is online. |