The following commit has been merged into the timers/urgent branch of tip:
Commit-ID: 4d17c25eaf5d8b95d70726e6946e8eb94619e139
Gitweb: https://git.kernel.org/tip/4d17c25eaf5d8b95d70726e6946e8eb94619e139
Author: Frederic Weisbecker <frederic@xxxxxxxxxx>
AuthorDate: Thu, 21 Nov 2024 16:29:31 +01:00
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitterDate: Fri, 29 Nov 2024 11:40:22 +01:00
delay: Fix ndelay() spuriously treated as udelay()
A recent rework on delay functions wrongly ended up calling __udelay()
instead of __ndelay() for nanosecond delays, increasing those by 1000.
As a result hangs have been observed on boot
Restore the right function calls.
Fixes: 19e2d91d8cb1 ("delay: Rework udelay and ndelay")
Reported-by: Chen-Yu Tsai <wenst@xxxxxxxxxxxx>
Signed-off-by: Frederic Weisbecker <frederic@xxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Tested-by: Chen-Yu Tsai <wenst@xxxxxxxxxxxx>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@xxxxxxxxxxxxx>
Reviewed-by: Chen-Yu Tsai <wenst@xxxxxxxxxxxx>
Link: https://lore.kernel.org/all/20241121152931.51884-1-frederic@xxxxxxxxxx
---
include/asm-generic/delay.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/asm-generic/delay.h b/include/asm-generic/delay.h
index 76cf237..03b0ec7 100644
--- a/include/asm-generic/delay.h
+++ b/include/asm-generic/delay.h
@@ -75,11 +75,11 @@ static __always_inline void ndelay(unsigned long nsec)
{
if (__builtin_constant_p(nsec)) {
if (nsec >= DELAY_CONST_MAX)
- __bad_udelay();
+ __bad_ndelay();
else
__const_udelay(nsec * NDELAY_CONST_MULT);
} else {
- __udelay(nsec);
+ __ndelay(nsec);
}
}
#define ndelay(x) ndelay(x)
|