From: Grant Grundler <grundler@chromium.org>
To: Grant Grundler <grundler@chromium.org>
Cc: Guenter Roeck <groeck@chromium.org>,
Wim Van Sebroeck <wim@iguana.be>,
Guenter Roeck <linux@roeck-us.net>,
linux-watchdog@vger.kernel.org,
LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] watchdog: qcom: Report reboot reason
Date: Tue, 3 May 2016 18:36:24 -0700 [thread overview]
Message-ID: <CANEJEGvHdD1VevOrZtTPe+O7gw7Fzb8H30mmvvRxO75mFxSgMA@mail.gmail.com> (raw)
In-Reply-To: <CANEJEGupo0pLKUEcbouz4exwcYX__7NPExNYr123=m4mq17x4Q@mail.gmail.com>
Ping? Did this change get accepted?
cheers,
grant
On Tue, Apr 5, 2016 at 12:07 PM, Grant Grundler <grundler@chromium.org> wrote:
> On Mon, Apr 4, 2016 at 5:37 PM, Guenter Roeck <groeck@chromium.org> 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@chromium.org>
>> Signed-off-by: Guenter Roeck <groeck@chromium.org>
>
> Reviewed-by: Grant Grundler <grundler@chromium.org>
> Tested-by: Grant Grundler <grundler@chromium.org>
>
> 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
>>
next prev parent reply other threads:[~2016-05-04 1:36 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-05 0:37 [PATCH] watchdog: qcom: Report reboot reason Guenter Roeck
2016-04-05 19:07 ` Grant Grundler
2016-05-04 1:36 ` Grant Grundler [this message]
2016-05-04 2:01 ` Guenter Roeck
2016-05-04 2:07 ` Grant Grundler
2016-05-14 16:35 ` Wim Van Sebroeck
2016-05-16 16:17 ` Grant Grundler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CANEJEGvHdD1VevOrZtTPe+O7gw7Fzb8H30mmvvRxO75mFxSgMA@mail.gmail.com \
--to=grundler@chromium.org \
--cc=groeck@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=wim@iguana.be \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).