Re: [PATCH v2 1/2] watchdog: mediatek: Fix mtk_wdt_restart
From: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Date: 2024-11-06 12:31:14
Also in:
linux-mediatek, linux-watchdog, lkml
Il 06/11/24 11:47, Yassine Oudjana ha scritto:
Clear the IRQ enable bit of WDT_MODE before asserting software reset
in order to make TOPRGU issue a system reset signal instead of an IRQ.
Fixes: a44a45536f7b ("watchdog: Add driver for Mediatek watchdog")
Signed-off-by: Yassine Oudjana <y.oudjana@protonmail.com>I'd be more comfortable with a title like: watchdog: mediatek: Make sure system reset gets asserted in mtk_wdt_restart() or along those lines, saying what's this commit about, because a generic "fix" doesn't really mean anything... About the commit description - that's good. Btw, I wonder if maintainers can fix the title without you sending a v3... Anyway - you can get my: Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Cheers! Angelo
quoted hunk ↗ jump to hunk
--- drivers/watchdog/mtk_wdt.c | 6 ++++++ 1 file changed, 6 insertions(+)diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c index c35f85ce8d69c..e2d7a57d6ea2e 100644 --- a/drivers/watchdog/mtk_wdt.c +++ b/drivers/watchdog/mtk_wdt.c@@ -225,9 +225,15 @@ static int mtk_wdt_restart(struct watchdog_device *wdt_dev, { struct mtk_wdt_dev *mtk_wdt = watchdog_get_drvdata(wdt_dev); void __iomem *wdt_base; + u32 reg; wdt_base = mtk_wdt->wdt_base; + /* Enable reset in order to issue a system reset instead of an IRQ */ + reg = readl(wdt_base + WDT_MODE); + reg &= ~WDT_MODE_IRQ_EN; + writel(reg | WDT_MODE_KEY, wdt_base + WDT_MODE); + while (1) { writel(WDT_SWRST_KEY, wdt_base + WDT_SWRST); mdelay(5);