hello, i have been testing the "watchdog" feature on sun7i today, and it was not triggering the reset.
i was a bit puzzled because i supposed it was a simple well working feature but.. there's still a known bug and the relative patch has not been applied! funny! please help me understand if it's really as i seem to understand. this is just a note to bump up this "oneliner" patch (from December 2014), because as it is now, the mainline kernel 4.0.x and 4.1.x have not a working watchdog at least for sun7i (that's what i tested but i suppose the other too..) bye On Tuesday, December 23, 2014 at 3:52:41 PM UTC+1, Chen-Yu Tsai wrote: > > On Tue, Dec 23, 2014 at 10:44 PM, Emilio López <[email protected] > <javascript:>> wrote: > > Hi Tobias, > > > > El 23/12/14 a las 10:28, Tobias Andresen escibió: > >> > >> --- > >> 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 b62301e..00de94b 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); > > > > > > You can drop the ()'s too, they're not needed now. > > > >> writel(reg, wdt_base + regs->wdt_cfg); > >> > >> /* Enable watchdog */ > >> > > > > What tree is this for? If this is a patch for mainline, please include > your > > signoff and Cc the relevant maintainers and mailing lists[1]; in this > case > > at least Maxime, Wim, linux-arm-kernel and linux-watchdog. > > Definitely for mainline. Code was introduced in > > f2147de33470 ("watchdog: sunxi: support parameterized compatible > strings") > > by yours truly. :( > > Tobias, You should also tag the commit with > > Fixes: f2147de33470 ("watchdog: sunxi: support parameterized > compatible strings") > Cc: [email protected] <javascript:> # 3.18 > > Thanks! > > ChenYu > > > [1] ./scripts/get_maintainer.pl on the kernel tree can help you figure > out > > who to send it to. > -- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
