Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 130abfe

Browse files
committed
Merge tag 'pm-6.10-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fixes from Rafael Wysocki: "Fix two issues related to boost frequencies handling, one in the cpufreq core and one in the ACPI cpufreq driver (Mario Limonciello)" * tag 'pm-6.10-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: cpufreq: ACPI: Mark boost policy as enabled when setting boost cpufreq: Allow drivers to advertise boost enabled
2 parents d045c46 + d92467a commit 130abfe

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

drivers/cpufreq/acpi-cpufreq.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -890,8 +890,10 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
890890
if (perf->states[0].core_frequency * 1000 != freq_table[0].frequency)
891891
pr_warn(FW_WARN "P-state 0 is not max freq\n");
892892

893-
if (acpi_cpufreq_driver.set_boost)
893+
if (acpi_cpufreq_driver.set_boost) {
894894
set_boost(policy, acpi_cpufreq_driver.boost_enabled);
895+
policy->boost_enabled = acpi_cpufreq_driver.boost_enabled;
896+
}
895897

896898
return result;
897899

drivers/cpufreq/cpufreq.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1431,7 +1431,8 @@ static int cpufreq_online(unsigned int cpu)
14311431
}
14321432

14331433
/* Let the per-policy boost flag mirror the cpufreq_driver boost during init */
1434-
policy->boost_enabled = cpufreq_boost_enabled() && policy_has_boost_freq(policy);
1434+
if (cpufreq_boost_enabled() && policy_has_boost_freq(policy))
1435+
policy->boost_enabled = true;
14351436

14361437
/*
14371438
* The initialization has succeeded and the policy is online.

0 commit comments

Comments
 (0)