Commit 130abfe9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents d045c46c d92467ad

drivers/cpufreq/acpi-cpufreq.c

+3 −1
Original line number Diff line number Diff line
@@ -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;

drivers/cpufreq/cpufreq.c

+2 −1
Original line number Diff line number Diff line
@@ -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.