Commit 88d879d2 authored by Janakarajan Natarajan's avatar Janakarajan Natarajan Committed by Thomas Gleixner
Browse files

Prevent timer value 0 for MWAITX

Newer hardware has uncovered a bug in the software implementation of
using MWAITX for the delay function. A value of 0 for the timer is meant
to indicate that a timeout will not be used to exit MWAITX. On newer
hardware this can result in MWAITX never returning, resulting in NMI
soft lockup messages being printed. On older hardware, some of the other
conditions under which MWAITX can exit masked this issue. The AMD APM
does not currently document this and will be updated.

Please refer to

information regarding NMI soft lockup messages on an AMD Ryzen 1800X.
This has been root-caused as a 0 passed to MWAITX causing it to wait

This change has the added benefit of avoiding the unnecessary setup of
MONITORX/MWAITX when the delay value is zero.
Signed-off-by: default avatarJanakarajan Natarajan <>

Signed-off-by: default avatarThomas Gleixner <>
parent a5859c6d
......@@ -93,6 +93,13 @@ static void delay_mwaitx(unsigned long __loops)
u64 start, end, delay, loops = __loops;
* Timer value of 0 causes MWAITX to wait indefinitely, unless there
* is a store on the memory monitored by MONITORX.
if (loops == 0)
start = rdtsc_ordered();
for (;;) {
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment