watchdog: imx7ulp: Strictly follow the sequence for wdog operations
Subsystems (2)
PATCH v3 1/2 watchdog: imx7ulp: Strictly follow the sequence for wdog operations
According to reference manual, the i.MX7ULP WDOG's operations except refresh should follow below sequence:
1. disable global interrupts;
2. unlock the wdog and wait unlock bit set;
3. reconfigure the wdog and wait for reconfiguration bit set;
4. enabel global interrupts.
Strictly follow the recommended sequence can make it more robust.
---
changes since V2:
- change the wait timeout to 20us according to experiment;
- drop WARN_ON when timeout, and check its return value in each caller for unlock wait, no need to handle the return value for reconfiguration.
--- drivers/watchdog/imx7ulp_wdt.c | 74 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 61 insertions(+), 13 deletions(-)
drivers/watchdog/imx7ulp_wdt.c +61 -13
@@ -5,6 +5,7 @@#include <linux/clk.h> #include <linux/io.h> +#include <linux/iopoll.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/of.h>
@@ -36,6 +37,7 @@#define DEFAULT_TIMEOUT 60#define MAX_TIMEOUT 128#define WDOG_CLOCK_RATE 1000 +#define WDOG_WAIT_TIMEOUT 20static bool nowayout =WATCHDOG_NOWAYOUT ;module_param (nowayout, bool,0000 );
@@ -48,17 +50,40 @@ struct imx7ulp_wdt_device {struct clk *clk; }; -static void imx7ulp_wdt_enable (struct watchdog_device *wdog,bool enable) +static int imx7ulp_wdt_wait (void __iomem *base,u32 mask) +{ +u32 val =readl (base +WDOG_CS ); + +if (!(val & mask) &&readl_poll_timeout_atomic (base +WDOG_CS , val, + val & mask,0 , +WDOG_WAIT_TIMEOUT )) +return -ETIMEDOUT ; + +return 0 ; +} + +static int imx7ulp_wdt_enable (struct watchdog_device *wdog,bool enable) {struct imx7ulp_wdt_device *wdt =watchdog_get_drvdata (wdog);u32 val =readl (wdt->base +WDOG_CS ); +int ret; +local_irq_disable ();writel (UNLOCK , wdt->base +WDOG_CNT ); + ret =imx7ulp_wdt_wait (wdt->base,WDOG_CS_ULK ); +if (ret) + goto enable_out;if (enable)writel (val |WDOG_CS_EN , wdt->base +WDOG_CS );else writel (val & ~WDOG_CS_EN , wdt->base +WDOG_CS ); +imx7ulp_wdt_wait (wdt->base,WDOG_CS_RCS ); + +enable_out: +local_irq_enable (); + +return ret; }static bool imx7ulp_wdt_is_enabled (void __iomem *base)
@@ -79,17 +104,12 @@ static int imx7ulp_wdt_ping(struct watchdog_device *wdog)static int imx7ulp_wdt_start (struct watchdog_device *wdog) { - -imx7ulp_wdt_enable (wdog, true); - -return 0 ; +return imx7ulp_wdt_enable (wdog, true); }static int imx7ulp_wdt_stop (struct watchdog_device *wdog) { -imx7ulp_wdt_enable (wdog, false); - -return 0 ; +return imx7ulp_wdt_enable (wdog, false); } static int imx7ulp_wdt_set_timeout(struct watchdog_device *wdog,
@@ -97,22 +117,37 @@ static int imx7ulp_wdt_set_timeout(struct watchdog_device *wdog, {struct imx7ulp_wdt_device *wdt =watchdog_get_drvdata (wdog);u32 val =WDOG_CLOCK_RATE * timeout; +int ret; +local_irq_disable ();writel (UNLOCK , wdt->base +WDOG_CNT ); + ret =imx7ulp_wdt_wait (wdt->base,WDOG_CS_ULK ); +if (ret) + goto timeout_out;writel (val, wdt->base +WDOG_TOVAL ); +imx7ulp_wdt_wait (wdt->base,WDOG_CS_RCS ); + +timeout_out: +local_irq_enable (); wdog->timeout = timeout; -return 0 ; +return ret; }static int imx7ulp_wdt_restart (struct watchdog_device *wdog,unsigned long action,void *data) {struct imx7ulp_wdt_device *wdt =watchdog_get_drvdata (wdog); +int ret; + + ret =imx7ulp_wdt_enable (wdog, true); +if (ret) +return ret; -imx7ulp_wdt_enable (wdog, true); -imx7ulp_wdt_set_timeout (&wdt->wdd,1 ); + ret =imx7ulp_wdt_set_timeout (&wdt->wdd,1 ); +if (ret) +return ret;/* wait for wdog to fire */ while (true)
@@ -136,19 +171,30 @@ static const struct watchdog_info imx7ulp_wdt_info = { WDIOF_MAGICCLOSE, }; -static void imx7ulp_wdt_init (void __iomem *base,unsigned int timeout) +static int imx7ulp_wdt_init (void __iomem *base,unsigned int timeout) {u32 val; +int ret; +local_irq_disable ();/* unlock the wdog for reconfiguration */ writel_relaxed (UNLOCK_SEQ0 , base +WDOG_CNT );writel_relaxed (UNLOCK_SEQ1 , base +WDOG_CNT ); + ret =imx7ulp_wdt_wait (base,WDOG_CS_ULK ); +if (ret) + goto init_out;/* set an initial timeout value in TOVAL */ writel (timeout, base +WDOG_TOVAL );/* enable 32bit command sequence and reconfigure */ val =WDOG_CS_CMD32EN |WDOG_CS_CLK |WDOG_CS_UPDATE ;writel (val, base +WDOG_CS ); +imx7ulp_wdt_wait (base,WDOG_CS_RCS ); + +init_out: +local_irq_enable (); + +return ret; }static void imx7ulp_wdt_action (void *data)
@@ -199,7 +245,9 @@ static int imx7ulp_wdt_probe(struct platform_device *pdev)watchdog_stop_on_reboot (wdog);watchdog_stop_on_unregister (wdog);watchdog_set_drvdata (wdog, imx7ulp_wdt); -imx7ulp_wdt_init (imx7ulp_wdt->base, wdog->timeout *WDOG_CLOCK_RATE ); + ret =imx7ulp_wdt_init (imx7ulp_wdt->base, wdog->timeout *WDOG_CLOCK_RATE ); +if (ret) +return ret;return devm_watchdog_register_device (dev, wdog); }
Signature · 1 line
2.7.4
PATCH v3 2/2 watchdog: imx7ulp: Watchdog should continue running for wait/stop mode
When kernel idle, system will enter wait/stop mode, wdog should continue running in this scenario, and the refresh thread can wake up system from wait/stop mode.
---
no change.
--- drivers/watchdog/imx7ulp_wdt.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/watchdog/imx7ulp_wdt.c +4 -1
@@ -22,6 +22,8 @@#define WDOG_CS_CLK (LPO_CLK << LPO_CLK_SHIFT)#define WDOG_CS_EN BIT(7)#define WDOG_CS_UPDATE BIT(5) +#define WDOG_CS_WAIT BIT(1) +#define WDOG_CS_STOP BIT(0)#define WDOG_CNT 0x4#define WDOG_TOVAL 0x8
@@ -187,7 +189,8 @@ static int imx7ulp_wdt_init(void __iomem *base, unsigned int timeout)/* set an initial timeout value in TOVAL */ writel (timeout, base +WDOG_TOVAL );/* enable 32bit command sequence and reconfigure */ - val =WDOG_CS_CMD32EN |WDOG_CS_CLK |WDOG_CS_UPDATE ; + val =WDOG_CS_CMD32EN |WDOG_CS_CLK |WDOG_CS_UPDATE | +WDOG_CS_WAIT |WDOG_CS_STOP ;writel (val, base +WDOG_CS );imx7ulp_wdt_wait (base,WDOG_CS_RCS );
Signature · 1 line
2.7.4
Re: [PATCH V3 2/2] watchdog: imx7ulp: Watchdog should continue running for wait/stop mode
Quoted 5 lines · Anson Huang
When kernel idle, system will enter wait/stop mode, wdog should continue running in this scenario, and the refresh thread can wake up system from wait/stop mode.
Signed-off-by Anson Huang <[email protected]>
Quoted 32 lines
---
no change.--- drivers/watchdog/imx7ulp_wdt.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)drivers/watchdog/imx7ulp_wdt.c +4
-1@@ -22,6 +22,8 @@#define WDOG_CS_CLK (LPO_CLK << LPO_CLK_SHIFT)#define WDOG_CS_EN BIT(7)#define WDOG_CS_UPDATE BIT(5) +#define WDOG_CS_WAIT BIT(1) +#define WDOG_CS_STOP BIT(0)#define WDOG_CNT 0x4#define WDOG_TOVAL 0x8@@ -187,7 +189,8 @@ static int imx7ulp_wdt_init(void __iomem *base, unsigned int timeout)/* set an initial timeout value in TOVAL */ writel (timeout, base +WDOG_TOVAL );/* enable 32bit command sequence and reconfigure */ - val =WDOG_CS_CMD32EN |WDOG_CS_CLK |WDOG_CS_UPDATE ; + val =WDOG_CS_CMD32EN |WDOG_CS_CLK |WDOG_CS_UPDATE | +WDOG_CS_WAIT |WDOG_CS_STOP ;writel (val, base +WDOG_CS );imx7ulp_wdt_wait (base,WDOG_CS_RCS );Signature · 1 line
2.7.4
Guenter Roeck
maintainerQuoted 110 lines · Anson Huang
According to reference manual, the i.MX7ULP WDOG's operations except refresh should follow below sequence:
1. disable global interrupts;
2. unlock the wdog and wait unlock bit set;
3. reconfigure the wdog and wait for reconfiguration bit set;
4. enabel global interrupts.Strictly follow the recommended sequence can make it more robust.
Signed-off-by Anson Huang <[email protected]>---
changes since V2:
- change the wait timeout to 20us according to experiment;
- dropWARN_ONwhen timeout, and check its return value in each caller for unlock wait, no need to handle the return value for reconfiguration.--- drivers/watchdog/imx7ulp_wdt.c | 74 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 61 insertions(+), 13 deletions(-)drivers/watchdog/imx7ulp_wdt.c +30
-8@@ -5,6 +5,7 @@#include <linux/clk.h> #include <linux/io.h> +#include <linux/iopoll.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/of.h> @@ -36,6 +37,7 @@#define DEFAULT_TIMEOUT 60#define MAX_TIMEOUT 128#define WDOG_CLOCK_RATE 1000 +#define WDOG_WAIT_TIMEOUT 20static bool nowayout =WATCHDOG_NOWAYOUT ;module_param (nowayout, bool,0000 );@@ -48,17 +50,40 @@ struct imx7ulp_wdt_device {struct clk *clk; }; -static void imx7ulp_wdt_enable (struct watchdog_device *wdog,bool enable) +static int imx7ulp_wdt_wait (void __iomem *base,u32 mask) +{ +u32 val =readl (base +WDOG_CS ); + +if (!(val & mask) &&readl_poll_timeout_atomic (base +WDOG_CS , val, + val & mask,0 , +WDOG_WAIT_TIMEOUT )) +return -ETIMEDOUT ; + +return 0 ; +} + +static int imx7ulp_wdt_enable (struct watchdog_device *wdog,bool enable) {struct imx7ulp_wdt_device *wdt =watchdog_get_drvdata (wdog);u32 val =readl (wdt->base +WDOG_CS ); +int ret; +local_irq_disable ();writel (UNLOCK , wdt->base +WDOG_CNT ); + ret =imx7ulp_wdt_wait (wdt->base,WDOG_CS_ULK ); +if (ret) + goto enable_out;if (enable)writel (val |WDOG_CS_EN , wdt->base +WDOG_CS );else writel (val & ~WDOG_CS_EN , wdt->base +WDOG_CS ); +imx7ulp_wdt_wait (wdt->base,WDOG_CS_RCS ); + +enable_out: +local_irq_enable (); + +return ret; }static bool imx7ulp_wdt_is_enabled (void __iomem *base)@@ -79,17 +104,12 @@ static int imx7ulp_wdt_ping(struct watchdog_device *wdog)static int imx7ulp_wdt_start (struct watchdog_device *wdog) { - -imx7ulp_wdt_enable (wdog, true); - -return 0 ; +return imx7ulp_wdt_enable (wdog, true); }static int imx7ulp_wdt_stop (struct watchdog_device *wdog) { -imx7ulp_wdt_enable (wdog, false); - -return 0 ; +return imx7ulp_wdt_enable (wdog, false); } static int imx7ulp_wdt_set_timeout(struct watchdog_device *wdog,@@ -97,22 +117,37 @@ static int imx7ulp_wdt_set_timeout(struct watchdog_device *wdog, {struct imx7ulp_wdt_device *wdt =watchdog_get_drvdata (wdog);u32 val =WDOG_CLOCK_RATE * timeout; +int ret; +local_irq_disable ();writel (UNLOCK , wdt->base +WDOG_CNT );
drivers/watchdog/imx7ulp_wdt.c static int imx7ulp_wdt_set_timeout(struct watchdog_device *wdog, · line 133
Quoted 10 lines
drivers/watchdog/imx7ulp_wdt.c +7
-0+ ret =imx7ulp_wdt_wait (wdt->base,WDOG_CS_ULK ); +if (ret) + goto timeout_out;writel (val, wdt->base +WDOG_TOVAL ); +imx7ulp_wdt_wait (wdt->base,WDOG_CS_RCS ); + +timeout_out: +local_irq_enable (); wdog->timeout = timeout;
This needs to be moved up - the timeout did not get changed on error.
Guenter
Quoted 69 lines
drivers/watchdog/imx7ulp_wdt.c +24
-5-return 0 ; +return ret; }static int imx7ulp_wdt_restart (struct watchdog_device *wdog,unsigned long action,void *data) {struct imx7ulp_wdt_device *wdt =watchdog_get_drvdata (wdog); +int ret; + + ret =imx7ulp_wdt_enable (wdog, true); +if (ret) +return ret; -imx7ulp_wdt_enable (wdog, true); -imx7ulp_wdt_set_timeout (&wdt->wdd,1 ); + ret =imx7ulp_wdt_set_timeout (&wdt->wdd,1 ); +if (ret) +return ret;/* wait for wdog to fire */ while (true)@@ -136,19 +171,30 @@ static const struct watchdog_info imx7ulp_wdt_info = { WDIOF_MAGICCLOSE, }; -static void imx7ulp_wdt_init (void __iomem *base,unsigned int timeout) +static int imx7ulp_wdt_init (void __iomem *base,unsigned int timeout) {u32 val; +int ret; +local_irq_disable ();/* unlock the wdog for reconfiguration */ writel_relaxed (UNLOCK_SEQ0 , base +WDOG_CNT );writel_relaxed (UNLOCK_SEQ1 , base +WDOG_CNT ); + ret =imx7ulp_wdt_wait (base,WDOG_CS_ULK ); +if (ret) + goto init_out;/* set an initial timeout value in TOVAL */ writel (timeout, base +WDOG_TOVAL );/* enable 32bit command sequence and reconfigure */ val =WDOG_CS_CMD32EN |WDOG_CS_CLK |WDOG_CS_UPDATE ;writel (val, base +WDOG_CS ); +imx7ulp_wdt_wait (base,WDOG_CS_RCS ); + +init_out: +local_irq_enable (); + +return ret; }static void imx7ulp_wdt_action (void *data)@@ -199,7 +245,9 @@ static int imx7ulp_wdt_probe(struct platform_device *pdev)watchdog_stop_on_reboot (wdog);watchdog_stop_on_unregister (wdog);watchdog_set_drvdata (wdog, imx7ulp_wdt); -imx7ulp_wdt_init (imx7ulp_wdt->base, wdog->timeout *WDOG_CLOCK_RATE ); + ret =imx7ulp_wdt_init (imx7ulp_wdt->base, wdog->timeout *WDOG_CLOCK_RATE ); +if (ret) +return ret;return devm_watchdog_register_device (dev, wdog); }Signature · 1 line
2.7.4
Hi, Guenter
Quoted 123 lines
Subject: Re: [PATCH V3 1/2] watchdog: imx7ulp: Strictly follow the sequence for wdog operations
Quoted 7 lines · Anson Huang
According to reference manual, the i.MX7ULP WDOG's operations except refresh should follow below sequence:
1. disable global interrupts;
2. unlock the wdog and wait unlock bit set; 3. reconfigure the wdog and wait for reconfiguration bit set; 4. enabel global interrupts.Quoted 7 lines
Strictly follow the recommended sequence can make it more robust.
Signed-off-by Anson Huang <[email protected]>---
changes since V2:
- change the wait timeout to 20us according to experiment;
- dropWARN_ONwhen timeout, and check its return value in each callerfor
Quoted 19 lines
unlock wait, no need to handle the return value for reconfiguration.
--- drivers/watchdog/imx7ulp_wdt.c | 74 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 61 insertions(+), 13 deletions(-)(quoted diff) +0
-0
b/drivers/watchdog/imx7ulp_wdt.cindex 7993c8c..010ddd1 100644drivers/watchdog/imx7ulp_wdt.c +1
-0@@ -5,6 +5,7 @@#include <linux/clk.h> #include <linux/io.h> +#include <linux/iopoll.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/of.h> drivers/watchdog/imx7ulp_wdt.c line 42
Quoted 6 lines
drivers/watchdog/imx7ulp_wdt.c +1
-0@@ -36,6 +37,7 @@#define DEFAULT_TIMEOUT 60#define MAX_TIMEOUT 128#define WDOG_CLOCK_RATE 1000 +#define WDOG_WAIT_TIMEOUT 20static bool nowayout =WATCHDOG_NOWAYOUT ;module_param(nowayout,
Quoted 78 lines
drivers/watchdog/imx7ulp_wdt.c +0
-0bool, 0000); @@ -48,17 +50,40 @@ struct imx7ulp_wdt_device {drivers/watchdog/imx7ulp_wdt.c +0
-1struct clk *clk; }; -static void imx7ulp_wdt_enable(struct watchdog_device *wdog, boolenable)
drivers/watchdog/imx7ulp_wdt.c +27
-8+static int imx7ulp_wdt_wait (void __iomem *base,u32 mask) { +u32 val =readl (base +WDOG_CS ); + +if (!(val & mask) &&readl_poll_timeout_atomic (base +WDOG_CS , val, + val & mask,0 , +WDOG_WAIT_TIMEOUT )) +return -ETIMEDOUT ; + +return 0 ; +} + +static int imx7ulp_wdt_enable (struct watchdog_device *wdog,bool +enable) {struct imx7ulp_wdt_device *wdt =watchdog_get_drvdata (wdog);u32 val =readl (wdt->base +WDOG_CS ); +int ret; +local_irq_disable ();writel (UNLOCK , wdt->base +WDOG_CNT ); + ret =imx7ulp_wdt_wait (wdt->base,WDOG_CS_ULK ); +if (ret) + goto enable_out;if (enable)writel (val |WDOG_CS_EN , wdt->base +WDOG_CS );else writel (val & ~WDOG_CS_EN , wdt->base +WDOG_CS ); +imx7ulp_wdt_wait (wdt->base,WDOG_CS_RCS ); + +enable_out: +local_irq_enable (); + +return ret; } static bool imx7ulp_wdt_is_enabled(void __iomem *base) @@ -79,17 +104,12 @@ static int imx7ulp_wdt_ping(struct watchdog_device *wdog) static int imx7ulp_wdt_start(struct watchdog_device *wdog) { - -imx7ulp_wdt_enable (wdog, true); - -return 0 ; +return imx7ulp_wdt_enable (wdog, true); }static int imx7ulp_wdt_stop (struct watchdog_device *wdog) { -imx7ulp_wdt_enable (wdog, false); - -return 0 ; +return imx7ulp_wdt_enable (wdog, false); } static int imx7ulp_wdt_set_timeout(struct watchdog_device *wdog, @@ -97,22 +117,37 @@ static int imx7ulp_wdt_set_timeout(struct
watchdog_device*wdog, {drivers/watchdog/imx7ulp_wdt.c +9
-0struct imx7ulp_wdt_device *wdt =watchdog_get_drvdata (wdog);u32 val =WDOG_CLOCK_RATE * timeout; +int ret; +local_irq_disable ();writel (UNLOCK , wdt->base +WDOG_CNT ); + ret =imx7ulp_wdt_wait (wdt->base,WDOG_CS_ULK ); +if (ret) + goto timeout_out;writel (val, wdt->base +WDOG_TOVAL ); +imx7ulp_wdt_wait (wdt->base,WDOG_CS_RCS ); + +timeout_out: +local_irq_enable ();
Quoted 3 lines
Quoted 1 line
wdog->timeout= timeout;This needs to be moved up - the timeout did not get changed on error.
Ah, yes, will fix it in V4.
Thanks,
Anson