Re: [PATCH v2] watchdog: sunxi: fix activation of system reset
On 08/24/2015 02:25 AM, Chen-Yu Tsai wrote:
Hi,
On Mon, Jul 27, 2015 at 3:32 AM, Maxime Ripard
wrote:
On Sat, Jul 25, 2015 at 08:25:18AM +0200, Francesco Lavra wrote:
Commit f2147de33470 ("watchdog: sunxi: support parameterized compatible
strings") introduced a regression in sunxi_wdt_start(), by which
the system reset function of the watchdog is not enabled upon
starting the watchdog. As a result, the system is not reset when the
watchdog expires. Fix it.
Signed-off-by: Francesco Lavra
Reviewed-by: Guenter Roeck
Fixes: f2147de33470 ("watchdog: sunxi: support parameterized compatible
strings")
Cc: sta...@vger.kernel.org
Acked-by: Maxime Ripard
What tree should this go in through?
Guenter, are you still taking watchdog patches?
The patch is included in the pull request I sent to Wim last week [1].
Guenter
---
[1] http://www.spinics.net/lists/linux-watchdog/msg07219.html
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH v2] watchdog: sunxi: fix activation of system reset
Hi,
On Mon, Jul 27, 2015 at 3:32 AM, Maxime Ripard
wrote:
> On Sat, Jul 25, 2015 at 08:25:18AM +0200, Francesco Lavra wrote:
>> Commit f2147de33470 ("watchdog: sunxi: support parameterized compatible
>> strings") introduced a regression in sunxi_wdt_start(), by which
>> the system reset function of the watchdog is not enabled upon
>> starting the watchdog. As a result, the system is not reset when the
>> watchdog expires. Fix it.
>>
>> Signed-off-by: Francesco Lavra
>> Reviewed-by: Guenter Roeck
>> Fixes: f2147de33470 ("watchdog: sunxi: support parameterized compatible
>> strings")
>> Cc: sta...@vger.kernel.org
>
> Acked-by: Maxime Ripard
What tree should this go in through?
Guenter, are you still taking watchdog patches?
Thanks
ChenYu
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH v2] watchdog: sunxi: fix activation of system reset
On 08/24/2015 02:25 AM, Chen-Yu Tsai wrote: Hi, On Mon, Jul 27, 2015 at 3:32 AM, Maxime Ripard maxime.rip...@free-electrons.com wrote: On Sat, Jul 25, 2015 at 08:25:18AM +0200, Francesco Lavra wrote: Commit f2147de33470 (watchdog: sunxi: support parameterized compatible strings) introduced a regression in sunxi_wdt_start(), by which the system reset function of the watchdog is not enabled upon starting the watchdog. As a result, the system is not reset when the watchdog expires. Fix it. Signed-off-by: Francesco Lavra francescolavra...@gmail.com Reviewed-by: Guenter Roeck li...@roeck-us.net Fixes: f2147de33470 (watchdog: sunxi: support parameterized compatible strings) Cc: sta...@vger.kernel.org Acked-by: Maxime Ripard maxime.rip...@free-electrons.com What tree should this go in through? Guenter, are you still taking watchdog patches? The patch is included in the pull request I sent to Wim last week [1]. Guenter --- [1] http://www.spinics.net/lists/linux-watchdog/msg07219.html -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH v2] watchdog: sunxi: fix activation of system reset
Hi, On Mon, Jul 27, 2015 at 3:32 AM, Maxime Ripard maxime.rip...@free-electrons.com wrote: On Sat, Jul 25, 2015 at 08:25:18AM +0200, Francesco Lavra wrote: Commit f2147de33470 (watchdog: sunxi: support parameterized compatible strings) introduced a regression in sunxi_wdt_start(), by which the system reset function of the watchdog is not enabled upon starting the watchdog. As a result, the system is not reset when the watchdog expires. Fix it. Signed-off-by: Francesco Lavra francescolavra...@gmail.com Reviewed-by: Guenter Roeck li...@roeck-us.net Fixes: f2147de33470 (watchdog: sunxi: support parameterized compatible strings) Cc: sta...@vger.kernel.org Acked-by: Maxime Ripard maxime.rip...@free-electrons.com What tree should this go in through? Guenter, are you still taking watchdog patches? Thanks ChenYu -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH v2] watchdog: sunxi: fix activation of system reset
On Sat, Jul 25, 2015 at 08:25:18AM +0200, Francesco Lavra wrote:
> Commit f2147de33470 ("watchdog: sunxi: support parameterized compatible
> strings") introduced a regression in sunxi_wdt_start(), by which
> the system reset function of the watchdog is not enabled upon
> starting the watchdog. As a result, the system is not reset when the
> watchdog expires. Fix it.
>
> Signed-off-by: Francesco Lavra
> Reviewed-by: Guenter Roeck
> Fixes: f2147de33470 ("watchdog: sunxi: support parameterized compatible
> strings")
> Cc: sta...@vger.kernel.org
Acked-by: Maxime Ripard
Thanks!
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
signature.asc
Description: Digital signature
Re: [PATCH v2] watchdog: sunxi: fix activation of system reset
On Sat, Jul 25, 2015 at 08:25:18AM +0200, Francesco Lavra wrote: Commit f2147de33470 (watchdog: sunxi: support parameterized compatible strings) introduced a regression in sunxi_wdt_start(), by which the system reset function of the watchdog is not enabled upon starting the watchdog. As a result, the system is not reset when the watchdog expires. Fix it. Signed-off-by: Francesco Lavra francescolavra...@gmail.com Reviewed-by: Guenter Roeck li...@roeck-us.net Fixes: f2147de33470 (watchdog: sunxi: support parameterized compatible strings) Cc: sta...@vger.kernel.org Acked-by: Maxime Ripard maxime.rip...@free-electrons.com Thanks! Maxime -- Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com signature.asc Description: Digital signature
[PATCH v2] watchdog: sunxi: fix activation of system reset
Commit f2147de33470 ("watchdog: sunxi: support parameterized compatible
strings") introduced a regression in sunxi_wdt_start(), by which
the system reset function of the watchdog is not enabled upon
starting the watchdog. As a result, the system is not reset when the
watchdog expires. Fix it.
Signed-off-by: Francesco Lavra
Reviewed-by: Guenter Roeck
Fixes: f2147de33470 ("watchdog: sunxi: support parameterized compatible
strings")
Cc: sta...@vger.kernel.org
---
Changes in v2:
- Added Reviewed-by, Fixes, and Cc tags
- Fixed commit message
---
drivers/watchdog/sunxi_wdt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/watchdog/sunxi_wdt.c b/drivers/watchdog/sunxi_wdt.c
index a29afb3..47bd8a1 100644
--- a/drivers/watchdog/sunxi_wdt.c
+++ b/drivers/watchdog/sunxi_wdt.c
@@ -184,7 +184,7 @@ static int sunxi_wdt_start(struct watchdog_device *wdt_dev)
/* Set system reset function */
reg = readl(wdt_base + regs->wdt_cfg);
reg &= ~(regs->wdt_reset_mask);
- reg |= ~(regs->wdt_reset_val);
+ reg |= regs->wdt_reset_val;
writel(reg, wdt_base + regs->wdt_cfg);
/* Enable watchdog */
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH v2] watchdog: sunxi: fix activation of system reset
Commit f2147de33470 (watchdog: sunxi: support parameterized compatible strings) introduced a regression in sunxi_wdt_start(), by which the system reset function of the watchdog is not enabled upon starting the watchdog. As a result, the system is not reset when the watchdog expires. Fix it. Signed-off-by: Francesco Lavra francescolavra...@gmail.com Reviewed-by: Guenter Roeck li...@roeck-us.net Fixes: f2147de33470 (watchdog: sunxi: support parameterized compatible strings) Cc: sta...@vger.kernel.org --- Changes in v2: - Added Reviewed-by, Fixes, and Cc tags - Fixed commit message --- drivers/watchdog/sunxi_wdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/watchdog/sunxi_wdt.c b/drivers/watchdog/sunxi_wdt.c index a29afb3..47bd8a1 100644 --- a/drivers/watchdog/sunxi_wdt.c +++ b/drivers/watchdog/sunxi_wdt.c @@ -184,7 +184,7 @@ static int sunxi_wdt_start(struct watchdog_device *wdt_dev) /* Set system reset function */ reg = readl(wdt_base + regs-wdt_cfg); reg = ~(regs-wdt_reset_mask); - reg |= ~(regs-wdt_reset_val); + reg |= regs-wdt_reset_val; writel(reg, wdt_base + regs-wdt_cfg); /* Enable watchdog */ -- 1.9.1 -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
