diff mbox series

[2/3] watchdog: pm8916_wdt: Report reboot reason

Message ID 20220627111432.2625168-3-stephan.gerhold@kernkonzept.com
State Superseded
Headers show
Series watchdog: pm8916_wdt: Some minor improvements | expand

Commit Message

Stephan Gerhold June 27, 2022, 11:14 a.m. UTC
The PM8916 PMIC provides "power-off reason" (POFF_REASON) registers
to allow detecting why the board was powered off or rebooted. This
can be used to expose if a reset happened due to a watchdog timeout.
The watchdog API also provides status bits for overtemperature and
undervoltage which happen to be reported in the same PMIC register.

Make this information available as part of the watchdog device
so userspace can decide to handle the situation accordingly.

Signed-off-by: Stephan Gerhold <stephan.gerhold@kernkonzept.com>
---
 drivers/watchdog/pm8916_wdt.c | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

Comments

Guenter Roeck June 27, 2022, 2:09 p.m. UTC | #1
On 6/27/22 04:14, Stephan Gerhold wrote:
> The PM8916 PMIC provides "power-off reason" (POFF_REASON) registers
> to allow detecting why the board was powered off or rebooted. This
> can be used to expose if a reset happened due to a watchdog timeout.
> The watchdog API also provides status bits for overtemperature and
> undervoltage which happen to be reported in the same PMIC register.
> 
> Make this information available as part of the watchdog device
> so userspace can decide to handle the situation accordingly.
> 
> Signed-off-by: Stephan Gerhold <stephan.gerhold@kernkonzept.com>
> ---
>   drivers/watchdog/pm8916_wdt.c | 25 ++++++++++++++++++++++++-
>   1 file changed, 24 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/watchdog/pm8916_wdt.c b/drivers/watchdog/pm8916_wdt.c
> index 670cd79f4cf9..3fc03fdae466 100644
> --- a/drivers/watchdog/pm8916_wdt.c
> +++ b/drivers/watchdog/pm8916_wdt.c
> @@ -9,6 +9,12 @@
>   #include <linux/regmap.h>
>   #include <linux/watchdog.h>
>   
> +#define PON_POFF_REASON1		0x0c
> +#define PON_POFF_REASON1_PMIC_WD	BIT(2)
> +#define PON_POFF_REASON2		0x0d
> +#define PON_POFF_REASON2_UVLO		BIT(5)
> +#define PON_POFF_REASON2_OTST3		BIT(6)
> +
>   #define PON_INT_RT_STS			0x10
>   #define PMIC_WD_BARK_STS_BIT		BIT(6)
>   
> @@ -110,12 +116,14 @@ static irqreturn_t pm8916_wdt_isr(int irq, void *arg)
>   }
>   
>   static const struct watchdog_info pm8916_wdt_ident = {
> -	.options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE,
> +	.options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE |
> +		   WDIOF_OVERHEAT | WDIOF_CARDRESET | WDIOF_POWERUNDER,
>   	.identity = "QCOM PM8916 PON WDT",
>   };
>   
>   static const struct watchdog_info pm8916_wdt_pt_ident = {
>   	.options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE |
> +		   WDIOF_OVERHEAT | WDIOF_CARDRESET | WDIOF_POWERUNDER |
>   		   WDIOF_PRETIMEOUT,
>   	.identity = "QCOM PM8916 PON WDT",
>   };
> @@ -135,6 +143,7 @@ static int pm8916_wdt_probe(struct platform_device *pdev)
>   	struct pm8916_wdt *wdt;
>   	struct device *parent;
>   	int err, irq;
> +	u8 poff[2];
>   
>   	wdt = devm_kzalloc(dev, sizeof(*wdt), GFP_KERNEL);
>   	if (!wdt)
> @@ -175,6 +184,20 @@ static int pm8916_wdt_probe(struct platform_device *pdev)
>   		wdt->wdev.info = &pm8916_wdt_ident;
>   	}
>   
> +	err = regmap_bulk_read(wdt->regmap, wdt->baseaddr + PON_POFF_REASON1,
> +			       &poff, ARRAY_SIZE(poff));
> +	if (err == 0) {
> +		dev_dbg(dev, "POFF reason: %#x %#x\n", poff[0], poff[1]);
> +		if (poff[0] & PON_POFF_REASON1_PMIC_WD)
> +			wdt->wdev.bootstatus |= WDIOF_CARDRESET;
> +		if (poff[1] & PON_POFF_REASON2_UVLO)
> +			wdt->wdev.bootstatus |= WDIOF_POWERUNDER;
> +		if (poff[1] & PON_POFF_REASON2_OTST3)
> +			wdt->wdev.bootstatus |= WDIOF_OVERHEAT;
> +	} else {
> +		dev_err(dev, "failed to read POFF reason: %d\n", err);
> +	}

Error handling first, please:

	if (err) {
	} else {
	}

Also, decide if this is indeed an error or not. If it is an error, abort
probe. Otherwise use dev_warn() and explain why the problem is ignored /
not fatal.

Thanks,
Guenter

> +
>   	/* Configure watchdog to hard-reset mode */
>   	err = regmap_write(wdt->regmap,
>   			   wdt->baseaddr + PON_PMIC_WD_RESET_S2_CTL,
diff mbox series

Patch

diff --git a/drivers/watchdog/pm8916_wdt.c b/drivers/watchdog/pm8916_wdt.c
index 670cd79f4cf9..3fc03fdae466 100644
--- a/drivers/watchdog/pm8916_wdt.c
+++ b/drivers/watchdog/pm8916_wdt.c
@@ -9,6 +9,12 @@ 
 #include <linux/regmap.h>
 #include <linux/watchdog.h>
 
+#define PON_POFF_REASON1		0x0c
+#define PON_POFF_REASON1_PMIC_WD	BIT(2)
+#define PON_POFF_REASON2		0x0d
+#define PON_POFF_REASON2_UVLO		BIT(5)
+#define PON_POFF_REASON2_OTST3		BIT(6)
+
 #define PON_INT_RT_STS			0x10
 #define PMIC_WD_BARK_STS_BIT		BIT(6)
 
@@ -110,12 +116,14 @@  static irqreturn_t pm8916_wdt_isr(int irq, void *arg)
 }
 
 static const struct watchdog_info pm8916_wdt_ident = {
-	.options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE,
+	.options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE |
+		   WDIOF_OVERHEAT | WDIOF_CARDRESET | WDIOF_POWERUNDER,
 	.identity = "QCOM PM8916 PON WDT",
 };
 
 static const struct watchdog_info pm8916_wdt_pt_ident = {
 	.options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE |
+		   WDIOF_OVERHEAT | WDIOF_CARDRESET | WDIOF_POWERUNDER |
 		   WDIOF_PRETIMEOUT,
 	.identity = "QCOM PM8916 PON WDT",
 };
@@ -135,6 +143,7 @@  static int pm8916_wdt_probe(struct platform_device *pdev)
 	struct pm8916_wdt *wdt;
 	struct device *parent;
 	int err, irq;
+	u8 poff[2];
 
 	wdt = devm_kzalloc(dev, sizeof(*wdt), GFP_KERNEL);
 	if (!wdt)
@@ -175,6 +184,20 @@  static int pm8916_wdt_probe(struct platform_device *pdev)
 		wdt->wdev.info = &pm8916_wdt_ident;
 	}
 
+	err = regmap_bulk_read(wdt->regmap, wdt->baseaddr + PON_POFF_REASON1,
+			       &poff, ARRAY_SIZE(poff));
+	if (err == 0) {
+		dev_dbg(dev, "POFF reason: %#x %#x\n", poff[0], poff[1]);
+		if (poff[0] & PON_POFF_REASON1_PMIC_WD)
+			wdt->wdev.bootstatus |= WDIOF_CARDRESET;
+		if (poff[1] & PON_POFF_REASON2_UVLO)
+			wdt->wdev.bootstatus |= WDIOF_POWERUNDER;
+		if (poff[1] & PON_POFF_REASON2_OTST3)
+			wdt->wdev.bootstatus |= WDIOF_OVERHEAT;
+	} else {
+		dev_err(dev, "failed to read POFF reason: %d\n", err);
+	}
+
 	/* Configure watchdog to hard-reset mode */
 	err = regmap_write(wdt->regmap,
 			   wdt->baseaddr + PON_PMIC_WD_RESET_S2_CTL,