Merge back earlier core cpufreq material for 6.10.

rafaeljw · rafaeljw · commit 5196123d4b3e · 2024-04-08T15:27:21.000+02:00
diff --git a/drivers/cpufreq/freq_table.c b/drivers/cpufreq/freq_table.c
@@ -70,7 +70,7 @@ int cpufreq_frequency_table_verify(struct cpufreq_policy_data *policy,
 				   struct cpufreq_frequency_table *table)
 {
 	struct cpufreq_frequency_table *pos;
-	unsigned int freq, next_larger = ~0;
+	unsigned int freq, prev_smaller = 0;
 	bool found = false;
 
 	pr_debug("request for verification of policy (%u - %u kHz) for cpu %u\n",
@@ -86,12 +86,12 @@ int cpufreq_frequency_table_verify(struct cpufreq_policy_data *policy,
 			break;
 		}
 
-		if ((next_larger > freq) && (freq > policy->max))
-			next_larger = freq;
+		if ((prev_smaller < freq) && (freq <= policy->max))
+			prev_smaller = freq;
 	}
 
 	if (!found) {
-		policy->max = next_larger;
+		policy->max = prev_smaller;
 		cpufreq_verify_within_cpu_limits(policy);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ int cpufreq_frequency_table_verify(struct cpufreq_policy_data *policy,`
`70`	`70`	`struct cpufreq_frequency_table *table)`
`71`	`71`	`{`
`72`	`72`	`struct cpufreq_frequency_table *pos;`
`73`		`- unsigned int freq, next_larger = ~0;`
	`73`	`+ unsigned int freq, prev_smaller = 0;`
`74`	`74`	`bool found = false;`
`75`	`75`
`76`	`76`	`pr_debug("request for verification of policy (%u - %u kHz) for cpu %u\n",`
`@@ -86,12 +86,12 @@ int cpufreq_frequency_table_verify(struct cpufreq_policy_data *policy,`
`86`	`86`	`break;`
`87`	`87`	`}`
`88`	`88`
`89`		`- if ((next_larger > freq) && (freq > policy->max))`
`90`		`- next_larger = freq;`
	`89`	`+ if ((prev_smaller < freq) && (freq <= policy->max))`
	`90`	`+ prev_smaller = freq;`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`if (!found) {`
`94`		`- policy->max = next_larger;`
	`94`	`+ policy->max = prev_smaller;`
`95`	`95`	`cpufreq_verify_within_cpu_limits(policy);`
`96`	`96`	`}`
`97`	`97`