From patchwork Tue Oct 25 07:25:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrej Picej X-Patchwork-Id: 13018615 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 29D8DC04A95 for ; Tue, 25 Oct 2022 07:26:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231708AbiJYH0B (ORCPT ); Tue, 25 Oct 2022 03:26:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55390 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230353AbiJYH0A (ORCPT ); Tue, 25 Oct 2022 03:26:00 -0400 Received: from cpanel.siel.si (cpanel.siel.si [46.19.9.99]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8279C107AB9; Tue, 25 Oct 2022 00:25:45 -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=aJweMiiv60aAvd4o0keDrFaMyPWSNSdiMVKyzovAEWY=; b=dBJ2HGYfx6LE4X5Bjq6pWYx6S0 /Zs6Z2T2mGZdsLVF0i9pCYxmv3GYzLsJjky9Ri2xs1bwK4G5rR26sb3PGAVt1dkJSXjnwJ8sez1iR JRtEWaZQbGHOIlixqhjwBD0Catt3jQnkD72YIQQpNGa+2EjRkj5+N8kbh9rUWhvV+RnUBuu7+xgql Gkx9Eh07Qi8bCyccmVDjITRitPZdyUHRMWtZdl/ga+g/I4O2kWUyCcgRZAdYwC7RGu9GMSBuNDsFh 4qYIn8DYix+MWbxnKtIBlozbbPahfSiBFzDYv8pT+oqDqb5UTPRQJly0CtetW40jnEqv00qqxdEek mnOJDwfA==; Received: from 89-212-21-243.static.t-2.net ([89.212.21.243]:33544 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 1onEJZ-006HEZ-Gk; Tue, 25 Oct 2022 09:25:40 +0200 From: Andrej Picej To: linux-watchdog@vger.kernel.org Cc: wim@linux-watchdog.org, linux@roeck-us.net, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, Anson.Huang@nxp.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/3] watchdog: imx2_wdg: suspend watchdog in WAIT mode Date: Tue, 25 Oct 2022 09:25:31 +0200 Message-Id: <20221025072533.2980154-2-andrej.picej@norik.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221025072533.2980154-1-andrej.picej@norik.com> References: <20221025072533.2980154-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 Reviewed-by: Fabio Estevam --- Changes in v2: - validate the property with compatible string, as this functionality is not supported by all devices. --- drivers/watchdog/imx2_wdt.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c index d0c5d47ddede..dd9866c6f1e5 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,27 @@ struct imx2_wdt_device { bool ext_reset; bool clk_is_on; bool no_ping; + bool sleep_wait; +}; + +static const char * const wdw_boards[] __initconst = { + "fsl,imx25-wdt", + "fsl,imx35-wdt", + "fsl,imx50-wdt", + "fsl,imx51-wdt", + "fsl,imx53-wdt", + "fsl,imx6q-wdt", + "fsl,imx6sl-wdt", + "fsl,imx6sll-wdt", + "fsl,imx6sx-wdt", + "fsl,imx6ul-wdt", + "fsl,imx7d-wdt", + "fsl,imx8mm-wdt", + "fsl,imx8mn-wdt", + "fsl,imx8mp-wdt", + "fsl,imx8mq-wdt", + "fsl,vf610-wdt", + NULL }; static bool nowayout = WATCHDOG_NOWAYOUT; @@ -129,6 +151,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 +338,18 @@ static int __init imx2_wdt_probe(struct platform_device *pdev) wdev->ext_reset = of_property_read_bool(dev->of_node, "fsl,ext-reset-output"); + + if (of_property_read_bool(dev->of_node, "fsl,suspend-in-wait")) + if (of_device_compatible_match(dev->of_node, wdw_boards)) + wdev->sleep_wait = 1; + else { + dev_warn(dev, "Warning: Suspending watchdog during " \ + "WAIT mode is not supported for this device.\n"); + wdev->sleep_wait = 0; + } + else + wdev->sleep_wait = 0; + /* * The i.MX7D doesn't support low power mode, so we need to ping the watchdog * during suspend. From patchwork Tue Oct 25 07:25:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrej Picej X-Patchwork-Id: 13018618 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 055F7C04A95 for ; Tue, 25 Oct 2022 07:26:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231752AbiJYH0J (ORCPT ); Tue, 25 Oct 2022 03:26:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55942 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231721AbiJYH0D (ORCPT ); Tue, 25 Oct 2022 03:26:03 -0400 Received: from cpanel.siel.si (cpanel.siel.si [46.19.9.99]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E6FF10C4DB; Tue, 25 Oct 2022 00:25:45 -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=6QmrFK3QJ7B+XukDjmy/M6xq8ZMxcX0Yo9aBG07y5lo=; b=I+kU7cGMOo2GP5osCC4i8kBC2d VG3sIbbPMhyhVjWCil5bh/UPx1503jhkY8/ppRwOhDQvLn+81RPYHBaeFzoVOtLCoCHmSk4+qoCtS 5xznAVn6eN89QJQKY/ZrNgKPmggYtwYtA8mTR+zKQHL8KMQppZOzkFak8p3DwFhQVrte16vMlmh6Y AKqaOptpoPpOJkpoRpVlxWYYtP7vDjDhbjXQpsOYT03X8hK3zcSLhpO91YDKuZlE1FRCHbMgQqnlU grI3wf0yHFX3qbsY74rQVNr2D/SR9xxvfx14aob8oFdew7ci/2IRf25hUtJkczEBlNKIsHDLx6LGd PtVht19w==; Received: from 89-212-21-243.static.t-2.net ([89.212.21.243]:33544 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 1onEJZ-006HEZ-KA; Tue, 25 Oct 2022 09:25:40 +0200 From: Andrej Picej To: linux-watchdog@vger.kernel.org Cc: wim@linux-watchdog.org, linux@roeck-us.net, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, Anson.Huang@nxp.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/3] dt-bindings: watchdog: fsl-imx: document suspend in wait mode Date: Tue, 25 Oct 2022 09:25:32 +0200 Message-Id: <20221025072533.2980154-3-andrej.picej@norik.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221025072533.2980154-1-andrej.picej@norik.com> References: <20221025072533.2980154-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 Property "fsl,suspend-in-wait" suspends watchdog in "WAIT" mode which corresponds to Linux's Suspend-to-Idle S0 mode. If this property is not set and the device is put into Suspend-to-Idle mode, the watchdog triggers a reset after 128 seconds. Signed-off-by: Andrej Picej Reviewed-by: Fabio Estevam --- Changes in v2: - add a commit message, - add a list of devices which support this functionality --- .../bindings/watchdog/fsl-imx-wdt.yaml | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml b/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml index fb7695515be1..9289de97859b 100644 --- a/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml +++ b/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml @@ -55,6 +55,28 @@ 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 + (Suspend-to-Idle). Only supported on following devices: + - "fsl,imx25-wdt", + - "fsl,imx35-wdt", + - "fsl,imx50-wdt", + - "fsl,imx51-wdt", + - "fsl,imx53-wdt", + - "fsl,imx6q-wdt", + - "fsl,imx6sl-wdt", + - "fsl,imx6sll-wdt", + - "fsl,imx6sx-wdt", + - "fsl,imx6ul-wdt", + - "fsl,imx7d-wdt", + - "fsl,imx8mm-wdt", + - "fsl,imx8mn-wdt", + - "fsl,imx8mp-wdt", + - "fsl,imx8mq-wdt", + - "fsl,vf610-wdt". + required: - compatible - interrupts From patchwork Tue Oct 25 07:25:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrej Picej X-Patchwork-Id: 13018616 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 C180BC38A2D for ; Tue, 25 Oct 2022 07:26:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231703AbiJYH0D (ORCPT ); Tue, 25 Oct 2022 03:26:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55394 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231686AbiJYH0A (ORCPT ); Tue, 25 Oct 2022 03:26:00 -0400 Received: from cpanel.siel.si (cpanel.siel.si [46.19.9.99]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40589127921; Tue, 25 Oct 2022 00:25:45 -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=wurwz096UaaEsSn4IHr0tu8wV8ZQH7mn9aancPV4zd8=; b=d4Oy78GplZqeyjOY0WjCwXzp3Z QqkVwwM047e7pJJcWr25nWzQ7DUfIZIByE9b4rfgGBjxDZpL9IDCjq4vSlA3FGw8nbtpKvX6dFVoj RuENbg8sU/Ec1dINYP431RWswNZiQu/5SznhmlaOneen77EI16yNcmuADH8UwC5Q4ewnxAcRlOZfG /F1eGt1a4g9YHFvSEugND1V9xLtNid69IeK7IpML2GkCS1tvD3tXGre8KP8XdYtLCHgy8aIX2Yfhx 6pH9y3hrze5Mh0nZYfQ8A97uxZ7VsTf3gnhoY8meKBqU9/XsJuXZI3HHGLgc5dnE1aTjFR4WlSYSW df1aJYYg==; Received: from 89-212-21-243.static.t-2.net ([89.212.21.243]:33544 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 1onEJZ-006HEZ-Na; Tue, 25 Oct 2022 09:25:40 +0200 From: Andrej Picej To: linux-watchdog@vger.kernel.org Cc: wim@linux-watchdog.org, linux@roeck-us.net, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, Anson.Huang@nxp.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/3] ARM: dts: imx6ul/ull: suspend i.MX6UL watchdog in wait mode Date: Tue, 25 Oct 2022 09:25:33 +0200 Message-Id: <20221025072533.2980154-4-andrej.picej@norik.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221025072533.2980154-1-andrej.picej@norik.com> References: <20221025072533.2980154-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 Reviewed-by: Fabio Estevam --- Changes in v2: - no changes --- 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 = <