Re: [PATCH] watchdog: qcom: Report reboot reason

[Guenter Roeck]

On 05/03/2016 06:36 PM, Grant Grundler wrote:
> Ping? Did this change get accepted?

Hi Grant,

Should be. It is in my watchdog-next branch. I plan to send
a pull request to Wim early next week.

Guenter

> cheers,
> grant
>
> On Tue, Apr 5, 2016 at 12:07 PM, Grant Grundler <grundler@xxxxxxxxxxxx> wrote:
> > On Mon, Apr 4, 2016 at 5:37 PM, Guenter Roeck <groeck@xxxxxxxxxxxx> wrote:
> > > The Qualcom watchdog timer block reports if the system was reset by the
> > > watchdog. Pass the information to user space.
> > >
> > > Cc: Grant Grundler <grundler@xxxxxxxxxxxx>
> > > Signed-off-by: Guenter Roeck <groeck@xxxxxxxxxxxx>
> >
> > Reviewed-by: Grant Grundler <grundler@xxxxxxxxxxxx>
> > Tested-by: Grant Grundler <grundler@xxxxxxxxxxxx>
> >
> > Thanks Guenter! :)
> >
> > FTR, this landed in the chromeos-3.14 (and chromeos-3.18 shortly)
> > branches and will be included in a future update for TP-Link Onhub
> > devices.
> >
> > cheers,
> > grant
> >
> > > ---
> > >   drivers/watchdog/qcom-wdt.c | 7 ++++++-
> > >   1 file changed, 6 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/watchdog/qcom-wdt.c b/drivers/watchdog/qcom-wdt.c
> > > index 20563cc..a043fa4 100644
> > > --- a/drivers/watchdog/qcom-wdt.c
> > > +++ b/drivers/watchdog/qcom-wdt.c
> > > @@ -21,6 +21,7 @@
> > >
> > >   #define WDT_RST                0x38
> > >   #define WDT_EN         0x40
> > > +#define WDT_STS                0x44
> > >   #define WDT_BITE_TIME  0x5C
> > >
> > >   struct qcom_wdt {
> > > @@ -108,7 +109,8 @@ static const struct watchdog_ops qcom_wdt_ops = {
> > >   static const struct watchdog_info qcom_wdt_info = {
> > >          .options        = WDIOF_KEEPALIVEPING
> > >                          | WDIOF_MAGICCLOSE
> > > -                       | WDIOF_SETTIMEOUT,
> > > +                       | WDIOF_SETTIMEOUT
> > > +                       | WDIOF_CARDRESET,
> > >          .identity       = KBUILD_MODNAME,
> > >   };
> > >
> > > @@ -171,6 +173,9 @@ static int qcom_wdt_probe(struct platform_device *pdev)
> > >          wdt->wdd.max_timeout = 0x10000000U / wdt->rate;
> > >          wdt->wdd.parent = &pdev->dev;
> > >
> > > +       if (readl(wdt->base + WDT_STS) & 1)
> > > +               wdt->wdd.bootstatus = WDIOF_CARDRESET;
> > > +
> > >          /*
> > >           * If 'timeout-sec' unspecified in devicetree, assume a 30 second
> > >           * default, unless the max timeout is less than 30 seconds, then use
> > > --
> > > 2.8.0.rc3.226.g39d4020
> --
> To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at  http://vger.kernel.org/majordomo-info.html