tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

watchdog: apple: Actually flush writes after requesting watchdog restart

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>
Signed-off-by: Nick Chan <towinchenmi@gmail.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20241001170018.20139-2-towinchenmi@gmail.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>

authored by

Nick Chan and committed by
Wim Van Sebroeck 51dfe714 3ab1663a

+1 -1
+1 -1
drivers/watchdog/apple_wdt.c
··· 130 130 * can take up to ~20-25ms until the SoC is actually reset. Just wait 131 131 * 50ms here to be safe. 132 132 */ 133 - (void)readl_relaxed(wdt->regs + APPLE_WDT_WD1_CUR_TIME); 133 + (void)readl(wdt->regs + APPLE_WDT_WD1_CUR_TIME); 134 134 mdelay(50); 135 135 136 136 return 0;