From: Nick Chan <towinchenmi@gmail.com>
To: Hector Martin <marcan@marcan.st>, Sven Peter <sven@svenpeter.dev>,
Alyssa Rosenzweig <alyssa@rosenzweig.io>,
Wim Van Sebroeck <wim@linux-watchdog.org>,
Guenter Roeck <linux@roeck-us.net>,
asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org,
linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Nick Chan <towinchenmi@gmail.com>, Arnd Bergmann <arnd@arndb.de>
Subject: [PATCH v2 RESEND 1/2] watchdog: apple: Actually flush writes after requesting watchdog restart
Date: Tue, 29 Oct 2024 09:29:17 +0800 [thread overview]
Message-ID: <20241029013055.45538-2-towinchenmi@gmail.com> (raw)
In-Reply-To: <20241029013055.45538-1-towinchenmi@gmail.com>
Although there is an existing code comment about flushing the writes,
writes were not actually being flushed.
Actually flush the writes by changing readl_relaxed() to readl().
Fixes: 4ed224aeaf661 ("watchdog: Add Apple SoC watchdog driver")
Suggested-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Nick Chan <towinchenmi@gmail.com>
---
drivers/watchdog/apple_wdt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/watchdog/apple_wdt.c b/drivers/watchdog/apple_wdt.c
index d4f739932f0b..62dabf223d90 100644
--- a/drivers/watchdog/apple_wdt.c
+++ b/drivers/watchdog/apple_wdt.c
@@ -130,7 +130,7 @@ static int apple_wdt_restart(struct watchdog_device *wdd, unsigned long mode,
* can take up to ~20-25ms until the SoC is actually reset. Just wait
* 50ms here to be safe.
*/
- (void)readl_relaxed(wdt->regs + APPLE_WDT_WD1_CUR_TIME);
+ (void)readl(wdt->regs + APPLE_WDT_WD1_CUR_TIME);
mdelay(50);
return 0;
--
2.47.0
next prev parent reply other threads:[~2024-10-29 1:31 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-29 1:29 [PATCH v2 RESEND 0/2] watchdog: apple: Increase reset delay to 150ms Nick Chan
2024-10-29 1:29 ` Nick Chan [this message]
2024-10-29 1:29 ` [PATCH v2 RESEND 2/2] " Nick Chan
2024-11-01 13:02 ` [PATCH v2 RESEND 0/2] " Hector Martin
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=20241029013055.45538-2-towinchenmi@gmail.com \
--to=towinchenmi@gmail.com \
--cc=alyssa@rosenzweig.io \
--cc=arnd@arndb.de \
--cc=asahi@lists.linux.dev \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=marcan@marcan.st \
--cc=sven@svenpeter.dev \
--cc=wim@linux-watchdog.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.