Skip to content

Commit da6fa7e

Browse files
yghannamKAGA-KOKO
authored andcommitted
x86/smpboot: Don't use mwait_play_dead() on AMD systems
Recent AMD systems support using MWAIT for C1 state. However, MWAIT will not allow deeper cstates than C1 on current systems. play_dead() expects to use the deepest state available. The deepest state available on AMD systems is reached through SystemIO or HALT. If MWAIT is available, it is preferred over the other methods, so the CPU never reaches the deepest possible state. Don't try to use MWAIT to play_dead() on AMD systems. Instead, use CPUIDLE to enter the deepest state advertised by firmware. If CPUIDLE is not available then fallback to HALT. Signed-off-by: Yazen Ghannam <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Reviewed-by: Borislav Petkov <[email protected]> Cc: [email protected] Cc: Yazen Ghannam <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
1 parent 14d12bb commit da6fa7e

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

arch/x86/kernel/smpboot.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1571,6 +1571,8 @@ static inline void mwait_play_dead(void)
15711571
void *mwait_ptr;
15721572
int i;
15731573

1574+
if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)
1575+
return;
15741576
if (!this_cpu_has(X86_FEATURE_MWAIT))
15751577
return;
15761578
if (!this_cpu_has(X86_FEATURE_CLFLUSH))

0 commit comments

Comments
 (0)