delay: Fix ndelay() spuriously treated as udelay()

Frederic Weisbecker · KAGA-KOKO · commit 4d17c25eaf5d · 2024-11-29T11:40:22.000+01:00
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: 19e2d91 ("delay: Rework udelay and ndelay") Reported-by: Chen-Yu Tsai <wenst@chromium.org> Signed-off-by: Frederic Weisbecker <frederic@kernel.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Tested-by: Chen-Yu Tsai <wenst@chromium.org> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Reviewed-by: Chen-Yu Tsai <wenst@chromium.org> Link: https://lore.kernel.org/all/20241121152931.51884-1-frederic@kernel.org
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -75,11 +75,11 @@ static __always_inline void ndelay(unsigned long nsec)`
`75`	`75`	`{`
`76`	`76`	`if (__builtin_constant_p(nsec)) {`
`77`	`77`	`if (nsec >= DELAY_CONST_MAX)`
`78`		`- __bad_udelay();`
	`78`	`+ __bad_ndelay();`
`79`	`79`	`else`
`80`	`80`	`__const_udelay(nsec * NDELAY_CONST_MULT);`
`81`	`81`	`} else {`
`82`		`- __udelay(nsec);`
	`82`	`+ __ndelay(nsec);`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`	`#define ndelay(x) ndelay(x)`