| Message ID | 0ec1b203bc83c1acdaf1c5a2f3e51031b4374da2.1715065568.git.perry.yuan@amd.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | AMD Pstate Driver Fixes and Improvements | expand |
On 5/7/2024 02:15, Perry Yuan wrote: > If CPPC feature is supported by the CPU however the CPUID flag bit is not > set by SBIOS, the `amd_pstate` will be failed to load while system > booting. > So adding one more debug message to inform user to check the SBIOS setting, > The change also can help maintainers to debug why amd_pstate driver failed > to be loaded at system booting if the processor support CPPC. > > Closes: https://bugzilla.kernel.org/show_bug.cgi?id=218686 > Signed-off-by: Perry Yuan <perry.yuan@amd.com> > --- > drivers/cpufreq/amd-pstate.c | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c > index cb766c061c86..e94b55a7bb59 100644 > --- a/drivers/cpufreq/amd-pstate.c > +++ b/drivers/cpufreq/amd-pstate.c > @@ -1698,6 +1698,17 @@ static bool amd_cppc_supported(void) > return false; > } > > + /* > + * If the CPPC flag is disabled in the BIOS for processors that support MSR-based CPPC > + * the AMD Pstate driver may not function correctly. > + */ > + if ((boot_cpu_data.x86 >= 0x19) && (boot_cpu_data.x86_model >= 0x40) && > + !cpu_feature_enabled(X86_FEATURE_CPPC)) { I don't think this if statement is correct. The intent behind is is family 0x19 but models 0x40 to 0x4f AFAICT and then family 0x1a all models right? This message will miss any models that are 0x00 through 0x39 in family 0x1a. I'll give you two ideas: What do you think about instead doing the inverse like this: If (boot_cpu_data.x86 == 0x19) && (boot_cpu_data.x86_model < 0x40) return true; if (!cpu_feature_enabled(X86_FEATURE_CPPC)) { pr_debug_once(); return false; } return true; Another idea can be to look at X86_FEATURE_ZEN# to decide what to do. For example all Zen4 and Zen5 should have the architectural MSR. if (!cpu_feature_enabled(X86_FEATURE_CPPC)) { if (cpu_feature_enabled(X86_FEATURE_ZEN5) { // do stuff } else if (cpu_feature_enabled(X86_FEATURE_ZEN4) { // do stuff } else if (cpu_feature_enabled(X86_FEATURE_ZEN3) { // do stuff } } > + pr_debug_once("The CPPC feature is supported but disabled by the BIOS. " > + "Please enable it if your BIOS has the CPPC option.\n"); > + return false; > + } > + > return true; > } >
diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c index cb766c061c86..e94b55a7bb59 100644 --- a/drivers/cpufreq/amd-pstate.c +++ b/drivers/cpufreq/amd-pstate.c @@ -1698,6 +1698,17 @@ static bool amd_cppc_supported(void) return false; } + /* + * If the CPPC flag is disabled in the BIOS for processors that support MSR-based CPPC + * the AMD Pstate driver may not function correctly. + */ + if ((boot_cpu_data.x86 >= 0x19) && (boot_cpu_data.x86_model >= 0x40) && + !cpu_feature_enabled(X86_FEATURE_CPPC)) { + pr_debug_once("The CPPC feature is supported but disabled by the BIOS. " + "Please enable it if your BIOS has the CPPC option.\n"); + return false; + } + return true; }
If CPPC feature is supported by the CPU however the CPUID flag bit is not set by SBIOS, the `amd_pstate` will be failed to load while system booting. So adding one more debug message to inform user to check the SBIOS setting, The change also can help maintainers to debug why amd_pstate driver failed to be loaded at system booting if the processor support CPPC. Closes: https://bugzilla.kernel.org/show_bug.cgi?id=218686 Signed-off-by: Perry Yuan <perry.yuan@amd.com> --- drivers/cpufreq/amd-pstate.c | 11 +++++++++++ 1 file changed, 11 insertions(+)