From: Stefan Wahren <stefan.wahren@i2se.com> To: Alistair Francis <alistair@alistair23.me>, linux-kernel@vger.kernel.org, linux@roeck-us.net, shawnguo@kernel.org, wim@linux-watchdog.org, linux-watchdog@vger.kernel.org, s.hauer@pengutronix.de, linux-arm-kernel@lists.infradead.org Cc: linux-imx@nxp.com, kernel@pengutronix.de, festevam@gmail.com, devicetree@vger.kernel.org, robh+dt@kernel.org Subject: Re: [PATCH 1/2] watchdog: imx2_wdg: Alow ping on suspend Date: Thu, 13 Jan 2022 19:55:58 +0100 [thread overview] Message-ID: <4c5df296-b930-f65f-1106-c00889f1cdc1@i2se.com> (raw) In-Reply-To: <20220109114120.386013-2-alistair@alistair23.me> Hi, Am 09.01.22 um 12:41 schrieb Alistair Francis: > The i.MX watchdog cannot be disabled by softwrae once it has been s/softwrae/software/ > enabled. This means that it can't be stopped before suspend. > > For systems that enter low power mode this is fine, as the watchdog will > be automatically stopped by hardwrae in low power mode. Not all i.MX s/hardwrae/hardware/ > platforms support low power mode in the mainline kernel. For example the > i.MX7D does not enter low power mode and so will be rebooted 2 minutes > after entering freeze or mem sleep states. > > This patch introduces a device tree property "fsl,ping-during-suspend" > that can be used to enable ping on suspend support for these systems. Introducing vendor specific properties for Linux behavior should be avoided. The DT should describe just the hardware. In case i.mx7d is affected, how about enabling this workaround for compatible fsl,imx7d-wdt? This has the advantage that in case low power mode will be implemented <https://elixir.bootlin.com/linux/latest/B/ident/fsl%2Cimx7d-wdt>, we don't have to care about DTB files. Best regards > > Signed-off-by: Alistair Francis <alistair@alistair23.me> > --- > .../bindings/watchdog/fsl-imx-wdt.yaml | 7 ++++++ > drivers/watchdog/imx2_wdt.c | 22 +++++++++++++------ > 2 files changed, 22 insertions(+), 7 deletions(-) > > diff --git a/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml b/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml > index fb7695515be1..b8660a3c456c 100644 > --- a/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml > +++ b/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml > @@ -55,6 +55,13 @@ properties: > If present, the watchdog device is configured to assert its > external reset (WDOG_B) instead of issuing a software reset. > > + fsl,ping-during-suspend: > + $ref: /schemas/types.yaml#/definitions/flag > + description: | > + If present, the kernel will ping the watchdog during suspend. > + This should be used on platforms that don't enter low power mode > + during suspend. > + > required: > - compatible > - interrupts > diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c > index 51bfb796898b..9a5fdb3173a8 100644 > --- a/drivers/watchdog/imx2_wdt.c > +++ b/drivers/watchdog/imx2_wdt.c > @@ -66,6 +66,7 @@ struct imx2_wdt_device { > struct watchdog_device wdog; > bool ext_reset; > bool clk_is_on; > + bool no_ping; > }; > > static bool nowayout = WATCHDOG_NOWAYOUT; > @@ -312,12 +313,14 @@ 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->no_ping = !of_property_read_bool(dev->of_node, "fsl,ping-during-suspend"); > platform_set_drvdata(pdev, wdog); > watchdog_set_drvdata(wdog, wdev); > watchdog_set_nowayout(wdog, nowayout); > watchdog_set_restart_priority(wdog, 128); > watchdog_init_timeout(wdog, timeout, dev); > - watchdog_stop_ping_on_suspend(wdog); > + if (wdev->no_ping) > + watchdog_stop_ping_on_suspend(wdog); > > if (imx2_wdt_is_running(wdev)) { > imx2_wdt_set_timeout(wdog, wdog->timeout); > @@ -366,9 +369,11 @@ static int __maybe_unused imx2_wdt_suspend(struct device *dev) > imx2_wdt_ping(wdog); > } > > - clk_disable_unprepare(wdev->clk); > + if (wdev->no_ping) { > + clk_disable_unprepare(wdev->clk); > > - wdev->clk_is_on = false; > + wdev->clk_is_on = false; > + } > > return 0; > } > @@ -380,11 +385,14 @@ static int __maybe_unused imx2_wdt_resume(struct device *dev) > struct imx2_wdt_device *wdev = watchdog_get_drvdata(wdog); > int ret; > > - ret = clk_prepare_enable(wdev->clk); > - if (ret) > - return ret; > + if (wdev->no_ping) { > + ret = clk_prepare_enable(wdev->clk); > > - wdev->clk_is_on = true; > + if (ret) > + return ret; > + > + wdev->clk_is_on = true; > + } > > if (watchdog_active(wdog) && !imx2_wdt_is_running(wdev)) { > /*
WARNING: multiple messages have this Message-ID (diff)
From: Stefan Wahren <stefan.wahren@i2se.com> To: Alistair Francis <alistair@alistair23.me>, linux-kernel@vger.kernel.org, linux@roeck-us.net, shawnguo@kernel.org, wim@linux-watchdog.org, linux-watchdog@vger.kernel.org, s.hauer@pengutronix.de, linux-arm-kernel@lists.infradead.org Cc: linux-imx@nxp.com, kernel@pengutronix.de, festevam@gmail.com, devicetree@vger.kernel.org, robh+dt@kernel.org Subject: Re: [PATCH 1/2] watchdog: imx2_wdg: Alow ping on suspend Date: Thu, 13 Jan 2022 19:55:58 +0100 [thread overview] Message-ID: <4c5df296-b930-f65f-1106-c00889f1cdc1@i2se.com> (raw) In-Reply-To: <20220109114120.386013-2-alistair@alistair23.me> Hi, Am 09.01.22 um 12:41 schrieb Alistair Francis: > The i.MX watchdog cannot be disabled by softwrae once it has been s/softwrae/software/ > enabled. This means that it can't be stopped before suspend. > > For systems that enter low power mode this is fine, as the watchdog will > be automatically stopped by hardwrae in low power mode. Not all i.MX s/hardwrae/hardware/ > platforms support low power mode in the mainline kernel. For example the > i.MX7D does not enter low power mode and so will be rebooted 2 minutes > after entering freeze or mem sleep states. > > This patch introduces a device tree property "fsl,ping-during-suspend" > that can be used to enable ping on suspend support for these systems. Introducing vendor specific properties for Linux behavior should be avoided. The DT should describe just the hardware. In case i.mx7d is affected, how about enabling this workaround for compatible fsl,imx7d-wdt? This has the advantage that in case low power mode will be implemented <https://elixir.bootlin.com/linux/latest/B/ident/fsl%2Cimx7d-wdt>, we don't have to care about DTB files. Best regards > > Signed-off-by: Alistair Francis <alistair@alistair23.me> > --- > .../bindings/watchdog/fsl-imx-wdt.yaml | 7 ++++++ > drivers/watchdog/imx2_wdt.c | 22 +++++++++++++------ > 2 files changed, 22 insertions(+), 7 deletions(-) > > diff --git a/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml b/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml > index fb7695515be1..b8660a3c456c 100644 > --- a/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml > +++ b/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml > @@ -55,6 +55,13 @@ properties: > If present, the watchdog device is configured to assert its > external reset (WDOG_B) instead of issuing a software reset. > > + fsl,ping-during-suspend: > + $ref: /schemas/types.yaml#/definitions/flag > + description: | > + If present, the kernel will ping the watchdog during suspend. > + This should be used on platforms that don't enter low power mode > + during suspend. > + > required: > - compatible > - interrupts > diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c > index 51bfb796898b..9a5fdb3173a8 100644 > --- a/drivers/watchdog/imx2_wdt.c > +++ b/drivers/watchdog/imx2_wdt.c > @@ -66,6 +66,7 @@ struct imx2_wdt_device { > struct watchdog_device wdog; > bool ext_reset; > bool clk_is_on; > + bool no_ping; > }; > > static bool nowayout = WATCHDOG_NOWAYOUT; > @@ -312,12 +313,14 @@ 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->no_ping = !of_property_read_bool(dev->of_node, "fsl,ping-during-suspend"); > platform_set_drvdata(pdev, wdog); > watchdog_set_drvdata(wdog, wdev); > watchdog_set_nowayout(wdog, nowayout); > watchdog_set_restart_priority(wdog, 128); > watchdog_init_timeout(wdog, timeout, dev); > - watchdog_stop_ping_on_suspend(wdog); > + if (wdev->no_ping) > + watchdog_stop_ping_on_suspend(wdog); > > if (imx2_wdt_is_running(wdev)) { > imx2_wdt_set_timeout(wdog, wdog->timeout); > @@ -366,9 +369,11 @@ static int __maybe_unused imx2_wdt_suspend(struct device *dev) > imx2_wdt_ping(wdog); > } > > - clk_disable_unprepare(wdev->clk); > + if (wdev->no_ping) { > + clk_disable_unprepare(wdev->clk); > > - wdev->clk_is_on = false; > + wdev->clk_is_on = false; > + } > > return 0; > } > @@ -380,11 +385,14 @@ static int __maybe_unused imx2_wdt_resume(struct device *dev) > struct imx2_wdt_device *wdev = watchdog_get_drvdata(wdog); > int ret; > > - ret = clk_prepare_enable(wdev->clk); > - if (ret) > - return ret; > + if (wdev->no_ping) { > + ret = clk_prepare_enable(wdev->clk); > > - wdev->clk_is_on = true; > + if (ret) > + return ret; > + > + wdev->clk_is_on = true; > + } > > if (watchdog_active(wdog) && !imx2_wdt_is_running(wdev)) { > /* _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-01-13 18:56 UTC|newest] Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-01-09 11:41 [PATCH 0/2] watchdog: imx_wdt2: Enable ping on suspend support Alistair Francis 2022-01-09 11:41 ` Alistair Francis 2022-01-09 11:41 ` [PATCH 1/2] watchdog: imx2_wdg: Alow ping on suspend Alistair Francis 2022-01-09 11:41 ` Alistair Francis 2022-01-13 18:55 ` Stefan Wahren [this message] 2022-01-13 18:55 ` Stefan Wahren 2022-01-13 19:43 ` Guenter Roeck 2022-01-13 19:43 ` Guenter Roeck 2022-01-09 11:41 ` [PATCH 2/2] ARM: dts: imx7d: remarkable2: set ping-during-suspend for watchdog Alistair Francis 2022-01-09 11:41 ` Alistair Francis
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=4c5df296-b930-f65f-1106-c00889f1cdc1@i2se.com \ --to=stefan.wahren@i2se.com \ --cc=alistair@alistair23.me \ --cc=devicetree@vger.kernel.org \ --cc=festevam@gmail.com \ --cc=kernel@pengutronix.de \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-imx@nxp.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-watchdog@vger.kernel.org \ --cc=linux@roeck-us.net \ --cc=robh+dt@kernel.org \ --cc=s.hauer@pengutronix.de \ --cc=shawnguo@kernel.org \ --cc=wim@linux-watchdog.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.