From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F1D96C433FE for ; Wed, 19 Oct 2022 11:18:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=lfjgVa6OjDnWEK72eBUNdgEqigzA6QM37S1g8yvXhxQ=; b=XD3LSxCzmoiow1 kmEfyrQgiMPPy38ZsrmLDljUWEsAJdGjnadO+TdSEB+d/EnUgcTTrwlPvUJCRgZa7Nnh1f9LjTf1u SOBGvxi2HUqtKvbxG1yX/25CIEXpZ8G7z85iylx9N4bi+2YaOm5TGE7LssEL40WaMxqt6VQQDrKYH LfJ9uV2WXVlKnfyF2o6yON9dd9qq2xJZLijfW0pt1DFbSeD3jtXv7EXv+e71Y2V97oh/tHx+O3UmO FY/zKABf4+6HrXjSiLYGECC9iRsQaTO7QPDLvbR0hLu+7g99x1jk0fAT0ObbCHBdFhTOg4gI996kK OkyymZKcQI3hS8uX0z8Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ol74u-000s7G-HT; Wed, 19 Oct 2022 11:17:40 +0000 Received: from cpanel.siel.si ([46.19.9.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ol74i-000s2Z-7b for linux-arm-kernel@lists.infradead.org; Wed, 19 Oct 2022 11:17:30 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=norik.com; s=default; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=ZIxTik8qCVScEWj5sC/9qAFim//UicDvI+RfOQzsGsQ=; b=Blppzso/pr2nGSHf+R1U1YeYg2 JADA3gtzViPRS5E6/JCew3xPWqEXj4sG39/Ume+6UlIlnSYqoTrzm72yTMxSW4SFkWyhgr6yhdVMK V6LUd9d2qMNVA/4tJs04U2VIdwx8FkZkBtqs25dpBPK4gdO0tXfBT9+saANuArPeCZSzK1VNPsg3i x/M2Hz+Lxf5Pp7CZ49FsyOmjgBP9nh+YBvp75kBUQ3de2zSflCTIzwecH0LZI6TdC3DR6jIblHvE9 BEACG1uEWcfOEH8AeHDbVhSWJsfSnCW/JSsbVPD0/E6lA0sajEa5QNZT3QM+mSnjQKs4AZN9ABs+B FEeIazLA==; Received: from 89-212-21-243.static.t-2.net ([89.212.21.243]:45936 helo=localhost.localdomain) by cpanel.siel.si with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.95) (envelope-from ) id 1ol74W-007ZXa-AK; Wed, 19 Oct 2022 13:17:16 +0200 From: Andrej Picej To: linux-watchdog@vger.kernel.org Cc: shawnguo@kernel.org, linux@roeck-us.net, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-imx@nxp.com, festevam@gmail.com, kernel@pengutronix.de, s.hauer@pengutronix.de, wim@linux-watchdog.org, robh+dt@kernel.org Subject: [PATCH 1/3] watchdog: imx2_wdg: suspend watchdog in WAIT mode Date: Wed, 19 Oct 2022 13:17:12 +0200 Message-Id: <20221019111714.1953262-2-andrej.picej@norik.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221019111714.1953262-1-andrej.picej@norik.com> References: <20221019111714.1953262-1-andrej.picej@norik.com> MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cpanel.siel.si X-AntiAbuse: Original Domain - lists.infradead.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - norik.com X-Get-Message-Sender-Via: cpanel.siel.si: authenticated_id: andrej.picej@norik.com X-Authenticated-Sender: cpanel.siel.si: andrej.picej@norik.com X-Source: X-Source-Args: X-Source-Dir: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221019_041728_755906_1D38F86A X-CRM114-Status: UNSURE ( 9.39 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Putting device into the "Suspend-To-Idle" mode causes watchdog to trigger and reset the board after set watchdog timeout period elapses. Introduce new device-tree property "fsl,suspend-in-wait" which suspends watchdog in WAIT mode. This is done by setting WDW bit in WCR (Watchdog Control Register) Watchdog operation is restored after exiting WAIT mode as expected. WAIT mode coresponds with Linux's "Suspend-To-Idle". Signed-off-by: Andrej Picej --- drivers/watchdog/imx2_wdt.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c index d0c5d47ddede..150ba83ce176 100644 --- a/drivers/watchdog/imx2_wdt.c +++ b/drivers/watchdog/imx2_wdt.c @@ -35,6 +35,7 @@ #define IMX2_WDT_WCR 0x00 /* Control Register */ #define IMX2_WDT_WCR_WT (0xFF << 8) /* -> Watchdog Timeout Field */ +#define IMX2_WDT_WCR_WDW BIT(7) /* -> Watchdog disable for WAIT */ #define IMX2_WDT_WCR_WDA BIT(5) /* -> External Reset WDOG_B */ #define IMX2_WDT_WCR_SRS BIT(4) /* -> Software Reset Signal */ #define IMX2_WDT_WCR_WRE BIT(3) /* -> WDOG Reset Enable */ @@ -67,6 +68,7 @@ struct imx2_wdt_device { bool ext_reset; bool clk_is_on; bool no_ping; + bool sleep_wait; }; static bool nowayout = WATCHDOG_NOWAYOUT; @@ -129,6 +131,9 @@ static inline void imx2_wdt_setup(struct watchdog_device *wdog) /* Suspend timer in low power mode, write once-only */ val |= IMX2_WDT_WCR_WDZST; + /* Suspend timer in low power WAIT mode, write once-only */ + if (wdev->sleep_wait) + val |= IMX2_WDT_WCR_WDW; /* Strip the old watchdog Time-Out value */ val &= ~IMX2_WDT_WCR_WT; /* Generate internal chip-level reset if WDOG times out */ @@ -313,6 +318,8 @@ static int __init imx2_wdt_probe(struct platform_device *pdev) wdev->ext_reset = of_property_read_bool(dev->of_node, "fsl,ext-reset-output"); + wdev->sleep_wait = of_property_read_bool(dev->of_node, + "fsl,suspend-in-wait"); /* * The i.MX7D doesn't support low power mode, so we need to ping the watchdog * during suspend. -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 82F18C43217 for ; Wed, 19 Oct 2022 13:16:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233081AbiJSNQJ (ORCPT ); Wed, 19 Oct 2022 09:16:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54852 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232319AbiJSNPi (ORCPT ); Wed, 19 Oct 2022 09:15:38 -0400 Received: from cpanel.siel.si (cpanel.siel.si [46.19.9.99]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D6AF8303EF; Wed, 19 Oct 2022 06:01:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=norik.com; s=default; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=ZIxTik8qCVScEWj5sC/9qAFim//UicDvI+RfOQzsGsQ=; b=Blppzso/pr2nGSHf+R1U1YeYg2 JADA3gtzViPRS5E6/JCew3xPWqEXj4sG39/Ume+6UlIlnSYqoTrzm72yTMxSW4SFkWyhgr6yhdVMK V6LUd9d2qMNVA/4tJs04U2VIdwx8FkZkBtqs25dpBPK4gdO0tXfBT9+saANuArPeCZSzK1VNPsg3i x/M2Hz+Lxf5Pp7CZ49FsyOmjgBP9nh+YBvp75kBUQ3de2zSflCTIzwecH0LZI6TdC3DR6jIblHvE9 BEACG1uEWcfOEH8AeHDbVhSWJsfSnCW/JSsbVPD0/E6lA0sajEa5QNZT3QM+mSnjQKs4AZN9ABs+B FEeIazLA==; Received: from 89-212-21-243.static.t-2.net ([89.212.21.243]:45936 helo=localhost.localdomain) by cpanel.siel.si with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.95) (envelope-from ) id 1ol74W-007ZXa-AK; Wed, 19 Oct 2022 13:17:16 +0200 From: Andrej Picej To: linux-watchdog@vger.kernel.org Cc: shawnguo@kernel.org, linux@roeck-us.net, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-imx@nxp.com, festevam@gmail.com, kernel@pengutronix.de, s.hauer@pengutronix.de, wim@linux-watchdog.org, robh+dt@kernel.org Subject: [PATCH 1/3] watchdog: imx2_wdg: suspend watchdog in WAIT mode Date: Wed, 19 Oct 2022 13:17:12 +0200 Message-Id: <20221019111714.1953262-2-andrej.picej@norik.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221019111714.1953262-1-andrej.picej@norik.com> References: <20221019111714.1953262-1-andrej.picej@norik.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cpanel.siel.si X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - norik.com X-Get-Message-Sender-Via: cpanel.siel.si: authenticated_id: andrej.picej@norik.com X-Authenticated-Sender: cpanel.siel.si: andrej.picej@norik.com X-Source: X-Source-Args: X-Source-Dir: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Putting device into the "Suspend-To-Idle" mode causes watchdog to trigger and reset the board after set watchdog timeout period elapses. Introduce new device-tree property "fsl,suspend-in-wait" which suspends watchdog in WAIT mode. This is done by setting WDW bit in WCR (Watchdog Control Register) Watchdog operation is restored after exiting WAIT mode as expected. WAIT mode coresponds with Linux's "Suspend-To-Idle". Signed-off-by: Andrej Picej --- drivers/watchdog/imx2_wdt.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c index d0c5d47ddede..150ba83ce176 100644 --- a/drivers/watchdog/imx2_wdt.c +++ b/drivers/watchdog/imx2_wdt.c @@ -35,6 +35,7 @@ #define IMX2_WDT_WCR 0x00 /* Control Register */ #define IMX2_WDT_WCR_WT (0xFF << 8) /* -> Watchdog Timeout Field */ +#define IMX2_WDT_WCR_WDW BIT(7) /* -> Watchdog disable for WAIT */ #define IMX2_WDT_WCR_WDA BIT(5) /* -> External Reset WDOG_B */ #define IMX2_WDT_WCR_SRS BIT(4) /* -> Software Reset Signal */ #define IMX2_WDT_WCR_WRE BIT(3) /* -> WDOG Reset Enable */ @@ -67,6 +68,7 @@ struct imx2_wdt_device { bool ext_reset; bool clk_is_on; bool no_ping; + bool sleep_wait; }; static bool nowayout = WATCHDOG_NOWAYOUT; @@ -129,6 +131,9 @@ static inline void imx2_wdt_setup(struct watchdog_device *wdog) /* Suspend timer in low power mode, write once-only */ val |= IMX2_WDT_WCR_WDZST; + /* Suspend timer in low power WAIT mode, write once-only */ + if (wdev->sleep_wait) + val |= IMX2_WDT_WCR_WDW; /* Strip the old watchdog Time-Out value */ val &= ~IMX2_WDT_WCR_WT; /* Generate internal chip-level reset if WDOG times out */ @@ -313,6 +318,8 @@ static int __init imx2_wdt_probe(struct platform_device *pdev) wdev->ext_reset = of_property_read_bool(dev->of_node, "fsl,ext-reset-output"); + wdev->sleep_wait = of_property_read_bool(dev->of_node, + "fsl,suspend-in-wait"); /* * The i.MX7D doesn't support low power mode, so we need to ping the watchdog * during suspend. -- 2.25.1