From patchwork Wed Oct 19 11:17:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrej Picej X-Patchwork-Id: 13011729 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 5BF6FC433FE for ; Wed, 19 Oct 2022 13:16:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232225AbiJSNQG (ORCPT ); Wed, 19 Oct 2022 09:16:06 -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 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-watchdog@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. From patchwork Wed Oct 19 11:17:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrej Picej X-Patchwork-Id: 13011728 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 2E50DC433FE for ; Wed, 19 Oct 2022 13:16:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229900AbiJSNQC (ORCPT ); Wed, 19 Oct 2022 09:16:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50446 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231987AbiJSNPV (ORCPT ); Wed, 19 Oct 2022 09:15:21 -0400 X-Greylist: delayed 3540 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Wed, 19 Oct 2022 06:01:02 PDT Received: from cpanel.siel.si (cpanel.siel.si [46.19.9.99]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 90E451D1E37; Wed, 19 Oct 2022 06:01:00 -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=eNRpwG4buJx4Tvqox9EQWn+avHOAaaONBH2lWfkT/jc=; b=BXivr5bd5mQEaqcXCZNEmiEbz3 t9zNa27BFIH1TNvmhWDiBYB8ubQHWGHrxwRFyF4v6GtWMeekMRw860/wjdY+/Gbv9EfyhgLgMZfEM UdmPkFKp8d1fydsswt4egcumijRwIlS9oKk1TQdPCC4XTO/yQGGPRO2rKCII8tBn86zPKSOvK/J5W Brjit72EQEoAJ+ZAHWUZoPIkaEJ9nOKXiAQyRvwz/0lwOXfDIPlA2XoAkRFlQnbv8TG1Y321NegFP p2o8ISBUdoCDt3xe6LO7b1CElwkXf3PBQLhBnSIpIbVJVVj/Swzl+xcMNR9kZOBBT6ZfowdMdsOLg VezasqOw==; 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-DP; 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 2/3] dt-bindings: watchdog: fsl-imx: document suspend in wait mode Date: Wed, 19 Oct 2022 13:17:13 +0200 Message-Id: <20221019111714.1953262-3-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 - 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-watchdog@vger.kernel.org Signed-off-by: Andrej Picej --- Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml b/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml index fb7695515be1..01b3e04e7e65 100644 --- a/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml +++ b/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml @@ -55,6 +55,11 @@ properties: If present, the watchdog device is configured to assert its external reset (WDOG_B) instead of issuing a software reset. + fsl,suspend-in-wait: + $ref: /schemas/types.yaml#/definitions/flag + description: | + If present, the watchdog device is suspended in WAIT mode. + required: - compatible - interrupts From patchwork Wed Oct 19 11:17:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrej Picej X-Patchwork-Id: 13011730 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 583FDC4332F for ; Wed, 19 Oct 2022 13:16:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232885AbiJSNQJ (ORCPT ); Wed, 19 Oct 2022 09:16:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39364 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230044AbiJSNPv (ORCPT ); Wed, 19 Oct 2022 09:15:51 -0400 Received: from cpanel.siel.si (cpanel.siel.si [46.19.9.99]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D8CBA4F1B5; Wed, 19 Oct 2022 06:01:42 -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=TJFQZgcHpAiXq2u8GBJkx2Euz9+WpBppU5rX5bk9CRU=; b=XqDopoVMKKJiR8wg4YN3nnIuR/ DwCjGGBWV6S7v5G+kwDtPF9JdatpRfL4i+zUoOwo7eULGHkag2jD6xQRQ0vYbVveK/Wilv8rXHUQv noQh5gTU86qJDujKAma4JC3K64c9dprWVnKw69ZbA6hlvc1oTVJ1PHlqqLhwmjUZryUVCeP9vxDtB K1qZHL9GM7m5RwYJ8ZFieQZeyU+eTXNIH28oSQJQbqJu3kgGWJ9nGWWPy4kYJ5sOcQHGAPabOhCgU 7vac2jLi6ij7wnFY5yEi0Twr43G7TcycuqAuicwJiVZN/3t6b8E/oNzvDLdVnj2U3tw4jvgRZ/K2M zUic0KpQ==; 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-H1; 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 3/3] ARM: dts: imx6ul/ull: suspend i.MX6UL watchdog in wait mode Date: Wed, 19 Oct 2022 13:17:14 +0200 Message-Id: <20221019111714.1953262-4-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 - 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-watchdog@vger.kernel.org It was discovered that the watchdog triggers when the device is put into "Suspend-To-Idle"/"freeze" low-power mode. Setting WDW bit disables watchdog when the device is put into WAIT mode. Signed-off-by: Andrej Picej --- arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi b/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi index 3cddc68917a0..5168ed0ffec3 100644 --- a/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi +++ b/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi @@ -102,6 +102,10 @@ &usdhc2 { status = "disabled"; }; +&wdog1 { + fsl,suspend-in-wait; +}; + &iomuxc { pinctrl_enet1: enet1grp { fsl,pins = <