[PATCH v2] watchdog: sunxi: fix activation of system reset

[PATCH v2] watchdog: sunxi: fix activation of system reset

[Francesco Lavra]

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.fl@gmail.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Fixes: f2147de33470 ("watchdog: sunxi: support parameterized compatible strings")
Cc: stable at 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

[PATCH v2] watchdog: sunxi: fix activation of system reset

[Maxime Ripard]

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.fl@gmail.com>
> Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> Fixes: f2147de33470 ("watchdog: sunxi: support parameterized compatible strings")
> Cc: stable at vger.kernel.org

Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>

Thanks!
Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150726/a7d3ce57/attachment.sig>

[PATCH v2] watchdog: sunxi: fix activation of system reset

[Chen-Yu Tsai]

Hi,

On Mon, Jul 27, 2015 at 3:32 AM, Maxime Ripard
<maxime.ripard@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.fl@gmail.com>
>> Reviewed-by: Guenter Roeck <linux@roeck-us.net>
>> Fixes: f2147de33470 ("watchdog: sunxi: support parameterized compatible strings")
>> Cc: stable at vger.kernel.org
>
> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>

What tree should this go in through?
Guenter, are you still taking watchdog patches?


Thanks
ChenYu

[PATCH v2] watchdog: sunxi: fix activation of system reset

[Guenter Roeck]

On 08/24/2015 02:25 AM, Chen-Yu Tsai wrote:
> Hi,
>
> On Mon, Jul 27, 2015 at 3:32 AM, Maxime Ripard
> <maxime.ripard@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.fl@gmail.com>
>>> Reviewed-by: Guenter Roeck <linux@roeck-us.net>
>>> Fixes: f2147de33470 ("watchdog: sunxi: support parameterized compatible strings")
>>> Cc: stable at vger.kernel.org
>>
>> Acked-by: Maxime Ripard <maxime.ripard@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