From: Alexander Stein <alexander.stein@ew.tq-group.com> To: Andrej Picej <andrej.picej@norik.com> Cc: linux-watchdog@vger.kernel.org, linux-arm-kernel@lists.infradead.org, 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: Re: [PATCH v2 1/3] watchdog: imx2_wdg: suspend watchdog in WAIT mode Date: Tue, 25 Oct 2022 11:38:26 +0200 [thread overview] Message-ID: <13126397.uLZWGnKmhe@steina-w> (raw) In-Reply-To: <20221025072533.2980154-2-andrej.picej@norik.com> Am Dienstag, 25. Oktober 2022, 09:25:31 CEST schrieb Andrej Picej: > 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 <andrej.picej@norik.com> > Reviewed-by: Fabio Estevam <festevam@gmail.com> > --- > 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 > }; So the models listed in Documentation/devicetree/bindings/watchdog/fsl-imx- wdt.yaml not supporting this feature are * fsl,imx21-wdt * fsl,imx27-wdt * fsl,imx31-wdt * fsl,ls1012a-wdt * fsl,ls1043a-wdt ? But all models are listed as compatible to fsl,imx21-wdt. So there is something wrong here. IMHO this sounds like the compatible list has to be split and updated. Depending on that this feature can be detected. Maintaining another list seems error prone to me. Best regards, Alexander > 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. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
WARNING: multiple messages have this Message-ID (diff)
From: Alexander Stein <alexander.stein@ew.tq-group.com> To: Andrej Picej <andrej.picej@norik.com> Cc: linux-watchdog@vger.kernel.org, linux-arm-kernel@lists.infradead.org, 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: Re: [PATCH v2 1/3] watchdog: imx2_wdg: suspend watchdog in WAIT mode Date: Tue, 25 Oct 2022 11:38:26 +0200 [thread overview] Message-ID: <13126397.uLZWGnKmhe@steina-w> (raw) In-Reply-To: <20221025072533.2980154-2-andrej.picej@norik.com> Am Dienstag, 25. Oktober 2022, 09:25:31 CEST schrieb Andrej Picej: > 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 <andrej.picej@norik.com> > Reviewed-by: Fabio Estevam <festevam@gmail.com> > --- > 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 > }; So the models listed in Documentation/devicetree/bindings/watchdog/fsl-imx- wdt.yaml not supporting this feature are * fsl,imx21-wdt * fsl,imx27-wdt * fsl,imx31-wdt * fsl,ls1012a-wdt * fsl,ls1043a-wdt ? But all models are listed as compatible to fsl,imx21-wdt. So there is something wrong here. IMHO this sounds like the compatible list has to be split and updated. Depending on that this feature can be detected. Maintaining another list seems error prone to me. Best regards, Alexander > 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.
next prev parent reply other threads:[~2022-10-25 9:39 UTC|newest] Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-10-25 7:25 [PATCH v2 0/3] Suspending i.MX watchdog in WAIT mode Andrej Picej 2022-10-25 7:25 ` Andrej Picej 2022-10-25 7:25 ` [PATCH v2 1/3] watchdog: imx2_wdg: suspend " Andrej Picej 2022-10-25 7:25 ` Andrej Picej 2022-10-25 9:38 ` Alexander Stein [this message] 2022-10-25 9:38 ` Alexander Stein 2022-10-25 11:21 ` Andrej Picej 2022-10-25 11:21 ` Andrej Picej 2022-10-26 6:01 ` Alexander Stein 2022-10-26 6:01 ` Alexander Stein 2022-10-26 7:03 ` Andrej Picej 2022-10-26 7:03 ` Andrej Picej 2022-10-25 12:27 ` Marco Felsch 2022-10-25 12:27 ` Marco Felsch 2022-10-25 13:01 ` Andrej Picej 2022-10-25 13:01 ` Andrej Picej 2022-10-25 14:21 ` Guenter Roeck 2022-10-25 14:21 ` Guenter Roeck 2022-10-26 6:59 ` Andrej Picej 2022-10-26 6:59 ` Andrej Picej 2022-10-25 7:25 ` [PATCH v2 2/3] dt-bindings: watchdog: fsl-imx: document suspend in wait mode Andrej Picej 2022-10-25 7:25 ` Andrej Picej 2022-10-25 13:48 ` Krzysztof Kozlowski 2022-10-25 13:48 ` Krzysztof Kozlowski 2022-10-26 6:38 ` Andrej Picej 2022-10-26 6:38 ` Andrej Picej 2022-10-26 14:12 ` Krzysztof Kozlowski 2022-10-26 14:12 ` Krzysztof Kozlowski 2022-10-27 7:16 ` Andrej Picej 2022-10-27 7:16 ` Andrej Picej 2022-10-25 7:25 ` [PATCH v2 3/3] ARM: dts: imx6ul/ull: suspend i.MX6UL watchdog " Andrej Picej 2022-10-25 7:25 ` Andrej Picej
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=13126397.uLZWGnKmhe@steina-w \ --to=alexander.stein@ew.tq-group.com \ --cc=Anson.Huang@nxp.com \ --cc=andrej.picej@norik.com \ --cc=devicetree@vger.kernel.org \ --cc=festevam@gmail.com \ --cc=kernel@pengutronix.de \ --cc=krzysztof.kozlowski+dt@linaro.org \ --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.