From: Frederic Weisbecker <frederic@kernel.org>
To: Thomas Gleixner <tglx@linutronix.de>
Cc: LKML <linux-kernel@vger.kernel.org>,
"Frederic Weisbecker" <frederic@kernel.org>,
"Chen-Yu Tsai" <wenst@chromium.org>,
"Nícolas F. R. A. Prado" <nfraprado@collabora.com>,
"AngeloGioacchino Del Regno"
<angelogioacchino.delregno@collabora.com>,
"Anna-Maria Behnsen" <anna-maria@linutronix.de>
Subject: [PATCH] delay: Fix ndelay() spuriously treated as udelay()
Date: Thu, 21 Nov 2024 16:29:31 +0100 [thread overview]
Message-ID: <20241121152931.51884-1-frederic@kernel.org> (raw)
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@chromium.org>
Signed-off-by: Frederic Weisbecker <frederic@kernel.org>
---
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 76cf237b6e4c..03b0ec7afca6 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)
--
2.46.0
next reply other threads:[~2024-11-21 15:29 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-21 15:29 Frederic Weisbecker [this message]
2024-11-22 2:36 ` [PATCH] delay: Fix ndelay() spuriously treated as udelay() Chen-Yu Tsai
2024-11-25 9:56 ` AngeloGioacchino Del Regno
2024-11-29 10:48 ` [tip: timers/urgent] " tip-bot2 for Frederic Weisbecker
2024-12-02 14:04 ` [PATCH] " Nícolas F. R. A. Prado
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241121152931.51884-1-frederic@kernel.org \
--to=frederic@kernel.org \
--cc=angelogioacchino.delregno@collabora.com \
--cc=anna-maria@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=nfraprado@collabora.com \
--cc=tglx@linutronix.de \
--cc=wenst@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.