Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-16 13:34:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

x86/cpu: Remove unnecessary MwAIT leaf checks

Browse Source 
The CPUID leaf dependency checker will remove X86_FEATURE_MWAIT if
the CPUID level is below the required level (CPUID_MWAIT_LEAF).
Thus, if you check X86_FEATURE_MWAIT you do not need to also
check the CPUID level.

Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Link: https://lore.kernel.org/all/20241213205030.9B42B458%40davehans-spike.ostc.intel.com
This commit is contained in:
Dave Hansen 2024-12-13 12:50:30 -08:00
parent 8bd6821c9c
commit 262fba5570
4 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/x86/kernel/hpet.c
View File

@ -928,9 +928,6 @@ static bool __init mwait_pc10_supported(void)
if (!cpu_feature_enabled(X86_FEATURE_MWAIT)) if (!cpu_feature_enabled(X86_FEATURE_MWAIT))
return false; return false;
if (boot_cpu_data.cpuid_level < CPUID_MWAIT_LEAF)
return false;
cpuid(CPUID_MWAIT_LEAF, &eax, &ebx, &ecx, &mwait_substates); cpuid(CPUID_MWAIT_LEAF, &eax, &ebx, &ecx, &mwait_substates);
return (ecx & CPUID5_ECX_EXTENSIONS_SUPPORTED) && return (ecx & CPUID5_ECX_EXTENSIONS_SUPPORTED) &&

2
arch/x86/kernel/smpboot.c
View File

@ -1292,8 +1292,6 @@ static inline void mwait_play_dead(void)
return; return;
if (!this_cpu_has(X86_FEATURE_CLFLUSH)) if (!this_cpu_has(X86_FEATURE_CLFLUSH))
return; return;
if (__this_cpu_read(cpu_info.cpuid_level) < CPUID_MWAIT_LEAF)
return;
eax = CPUID_MWAIT_LEAF; eax = CPUID_MWAIT_LEAF;
ecx = 0; ecx = 0;

2
drivers/acpi/acpi_pad.c
View File

@ -47,8 +47,6 @@ static void power_saving_mwait_init(void)
if (!boot_cpu_has(X86_FEATURE_MWAIT)) if (!boot_cpu_has(X86_FEATURE_MWAIT))
return; return;
if (boot_cpu_data.cpuid_level < CPUID_MWAIT_LEAF)
return;
cpuid(CPUID_MWAIT_LEAF, &eax, &ebx, &ecx, &edx); cpuid(CPUID_MWAIT_LEAF, &eax, &ebx, &ecx, &edx);

3
drivers/idle/intel_idle.c
View File

@ -2317,9 +2317,6 @@ static int __init intel_idle_init(void)
return -ENODEV; return -ENODEV;
} }
if (boot_cpu_data.cpuid_level < CPUID_MWAIT_LEAF)
return -ENODEV;
cpuid(CPUID_MWAIT_LEAF, &eax, &ebx, &ecx, &mwait_substates); cpuid(CPUID_MWAIT_LEAF, &eax, &ebx, &ecx, &mwait_substates);
if (!(ecx & CPUID5_ECX_EXTENSIONS_SUPPORTED) || if (!(ecx & CPUID5_ECX_EXTENSIONS_SUPPORTED) ||