Skip to content

Commit 7c7a062

Browse files
yghannambwhacks
authored andcommitted
x86/smpboot: Don't use mwait_play_dead() on AMD systems
commit da6fa7e upstream. 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 <yazen.ghannam@amd.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Borislav Petkov <bp@suse.de> Cc: Yazen Ghannam <Yazen.Ghannam@amd.com> Link: https://lkml.kernel.org/r/20180403140228.58540-1-Yazen.Ghannam@amd.com Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
1 parent 6143a3c commit 7c7a062

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

arch/x86/kernel/smpboot.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1397,6 +1397,8 @@ static inline void mwait_play_dead(void)
13971397
void *mwait_ptr;
13981398
int i;
13991399

1400+
if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)
1401+
return;
14001402
if (!this_cpu_has(X86_FEATURE_MWAIT))
14011403
return;
14021404
if (!this_cpu_has(X86_FEATURE_CLFLUSH))

0 commit comments

Comments
 (0)