From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 187B0223711; Thu, 12 Dec 2024 17:46:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734025588; cv=none; b=f4x8BVL9fTI080/klnW0n6jOBRKjboxlpP4KkO1KlJWXxl6MrJrq9YP0/tCZMentDmTvl0jRyGlvRE9D0p1Uph6Zetvp+haLFC1mBp+4OLYS98aKEXjhyjP2YfAeAdrbYnl0c0OQG4INKUubDBje9yBE122sooTgcRgp6T/uuk4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734025588; c=relaxed/simple; bh=dkPeQ6onle//LngIqHD+Q3iXxqrqPEr6OTGFfycf69M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GjuXYFNE1E+mc+nKXMR38z88n6WW5pk95nAnsLmZ3YLDwshczR2GIjL/Z+qvqCaesad30ROnblGuA+mxBovsQf1J0Q/IG5yA0krG53lZDy/3eH9dsdPOnqEMQNoVe2KznntNzxfWUyaFvq71Iy2pEGhuilqO8W/cUh0upS+4dVw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=T4l5CfQ9; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="T4l5CfQ9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 96237C4CECE; Thu, 12 Dec 2024 17:46:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734025588; bh=dkPeQ6onle//LngIqHD+Q3iXxqrqPEr6OTGFfycf69M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T4l5CfQ92wIe38ZPtxl2xZbBhgV5tsVAlqy81U+cQjwi3DytN1RqBxSPoyoHhKzn4 WRJ3BpYBzz+p0McyD2DFQ3OSezx1jD5a2rDTNarPuTdmX2Z0oTz99N/OimXuqtSbC4 lmiHePVUn9v68Bda7oKDSlc2Y/u14R7UKzweqoXs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yassine Oudjana , AngeloGioacchino Del Regno , Guenter Roeck , Wim Van Sebroeck , Sasha Levin Subject: [PATCH 5.4 220/321] watchdog: mediatek: Make sure system reset gets asserted in mtk_wdt_restart() Date: Thu, 12 Dec 2024 16:02:18 +0100 Message-ID: <20241212144238.669124509@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241212144229.291682835@linuxfoundation.org> References: <20241212144229.291682835@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yassine Oudjana [ Upstream commit a1495a21e0b8aad92132dfcf9c6fffc1bde9d5b2 ] 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 Reviewed-by: AngeloGioacchino Del Regno Reviewed-by: Guenter Roeck Link: https://lore.kernel.org/r/20241106104738.195968-2-y.oudjana@protonmail.com Signed-off-by: Guenter Roeck Signed-off-by: Wim Van Sebroeck Signed-off-by: Sasha Levin --- 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 9c3d0033260d9..a2845c9ad3a7c 100644 --- a/drivers/watchdog/mtk_wdt.c +++ b/drivers/watchdog/mtk_wdt.c @@ -60,9 +60,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); -- 2.43.0