From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759674AbcDETHd (ORCPT ); Tue, 5 Apr 2016 15:07:33 -0400 Received: from mail-vk0-f45.google.com ([209.85.213.45]:32816 "EHLO mail-vk0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751811AbcDETHb (ORCPT ); Tue, 5 Apr 2016 15:07:31 -0400 MIME-Version: 1.0 In-Reply-To: <1459816666-87185-1-git-send-email-groeck@chromium.org> References: <1459816666-87185-1-git-send-email-groeck@chromium.org> Date: Tue, 5 Apr 2016 12:07:30 -0700 X-Google-Sender-Auth: tuL0ZSoQV5eZOZ_QdkV1t_KJ8F4 Message-ID: Subject: Re: [PATCH] watchdog: qcom: Report reboot reason From: Grant Grundler To: Guenter Roeck Cc: Wim Van Sebroeck , Guenter Roeck , linux-watchdog@vger.kernel.org, LKML Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Apr 4, 2016 at 5:37 PM, Guenter Roeck wrote: > The Qualcom watchdog timer block reports if the system was reset by the > watchdog. Pass the information to user space. > > Cc: Grant Grundler > Signed-off-by: Guenter Roeck Reviewed-by: Grant Grundler Tested-by: Grant Grundler 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 >