Merge back final cpufreq fixes for 6.10.

rafaeljw · rafaeljw · commit 161bd53e3248 · 2024-07-15T18:27:13.000+02:00
diff --git 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
@@ -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.

Original file line number	Diff line number	Diff line change
`@@ -1431,7 +1431,8 @@ static int cpufreq_online(unsigned int cpu)`
`1431`	`1431`	`}`
`1432`	`1432`
`1433`	`1433`	`/* 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;`
`1435`	`1436`
`1436`	`1437`	`/*`
`1437`	`1438`	`* The initialization has succeeded and the policy is online.`