@@ -202,20 +202,22 @@ static void amd_pstate_ut_check_freq(u32 index)
202
202
int cpu = 0 ;
203
203
struct cpufreq_policy * policy = NULL ;
204
204
struct amd_cpudata * cpudata = NULL ;
205
+ u32 nominal_freq_khz ;
205
206
206
207
for_each_possible_cpu (cpu ) {
207
208
policy = cpufreq_cpu_get (cpu );
208
209
if (!policy )
209
210
break ;
210
211
cpudata = policy -> driver_data ;
211
212
212
- if (!((cpudata -> max_freq >= cpudata -> nominal_freq ) &&
213
- (cpudata -> nominal_freq > cpudata -> lowest_nonlinear_freq ) &&
213
+ nominal_freq_khz = cpudata -> nominal_freq * 1000 ;
214
+ if (!((cpudata -> max_freq >= nominal_freq_khz ) &&
215
+ (nominal_freq_khz > cpudata -> lowest_nonlinear_freq ) &&
214
216
(cpudata -> lowest_nonlinear_freq > cpudata -> min_freq ) &&
215
217
(cpudata -> min_freq > 0 ))) {
216
218
amd_pstate_ut_cases [index ].result = AMD_PSTATE_UT_RESULT_FAIL ;
217
219
pr_err ("%s cpu%d max=%d >= nominal=%d > lowest_nonlinear=%d > min=%d > 0, the formula is incorrect!\n" ,
218
- __func__ , cpu , cpudata -> max_freq , cpudata -> nominal_freq ,
220
+ __func__ , cpu , cpudata -> max_freq , nominal_freq_khz ,
219
221
cpudata -> lowest_nonlinear_freq , cpudata -> min_freq );
220
222
goto skip_test ;
221
223
}
@@ -229,13 +231,13 @@ static void amd_pstate_ut_check_freq(u32 index)
229
231
230
232
if (cpudata -> boost_supported ) {
231
233
if ((policy -> max == cpudata -> max_freq ) ||
232
- (policy -> max == cpudata -> nominal_freq ))
234
+ (policy -> max == nominal_freq_khz ))
233
235
amd_pstate_ut_cases [index ].result = AMD_PSTATE_UT_RESULT_PASS ;
234
236
else {
235
237
amd_pstate_ut_cases [index ].result = AMD_PSTATE_UT_RESULT_FAIL ;
236
238
pr_err ("%s cpu%d policy_max=%d should be equal cpu_max=%d or cpu_nominal=%d !\n" ,
237
239
__func__ , cpu , policy -> max , cpudata -> max_freq ,
238
- cpudata -> nominal_freq );
240
+ nominal_freq_khz );
239
241
goto skip_test ;
240
242
}
241
243
} else {
0 commit comments