Message ID | 20221028075019.2757812-1-marcus.folkesson@gmail.com (mailing list archive) |
---|---|
State | Accepted |
Headers | show |
Series | watchdog: rn5t618: add support for read out bootstatus | expand |
On 10/28/22 00:50, Marcus Folkesson wrote: > The PMIC does store the power-off factor internally. > Read it out and report it as bootstatus. > > Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/watchdog/rn5t618_wdt.c | 12 ++++++++++++ > include/linux/mfd/rn5t618.h | 9 +++++++++ > 2 files changed, 21 insertions(+) > > diff --git a/drivers/watchdog/rn5t618_wdt.c b/drivers/watchdog/rn5t618_wdt.c > index 6e524c8e26a8..40d8ebd8c0ac 100644 > --- a/drivers/watchdog/rn5t618_wdt.c > +++ b/drivers/watchdog/rn5t618_wdt.c > @@ -144,6 +144,8 @@ static int rn5t618_wdt_probe(struct platform_device *pdev) > struct rn5t618 *rn5t618 = dev_get_drvdata(dev->parent); > struct rn5t618_wdt *wdt; > int min_timeout, max_timeout; > + int ret; > + unsigned int val; > > wdt = devm_kzalloc(dev, sizeof(struct rn5t618_wdt), GFP_KERNEL); > if (!wdt) > @@ -160,6 +162,16 @@ static int rn5t618_wdt_probe(struct platform_device *pdev) > wdt->wdt_dev.timeout = max_timeout; > wdt->wdt_dev.parent = dev; > > + /* Read out previous power-off factor */ > + ret = regmap_read(wdt->rn5t618->regmap, RN5T618_POFFHIS, &val); > + if (ret) > + return ret; > + > + if (val & RN5T618_POFFHIS_VINDET) > + wdt->wdt_dev.bootstatus = WDIOF_POWERUNDER; > + else if (val & RN5T618_POFFHIS_WDG) > + wdt->wdt_dev.bootstatus = WDIOF_CARDRESET; > + > watchdog_set_drvdata(&wdt->wdt_dev, wdt); > watchdog_init_timeout(&wdt->wdt_dev, timeout, dev); > watchdog_set_nowayout(&wdt->wdt_dev, nowayout); > diff --git a/include/linux/mfd/rn5t618.h b/include/linux/mfd/rn5t618.h > index 8aa0bda1af4f..aacb6d51e99c 100644 > --- a/include/linux/mfd/rn5t618.h > +++ b/include/linux/mfd/rn5t618.h > @@ -227,6 +227,15 @@ > #define RN5T618_WATCHDOG_WDOGTIM_S 0 > #define RN5T618_PWRIRQ_IR_WDOG BIT(6) > > +#define RN5T618_POFFHIS_PWRON BIT(0) > +#define RN5T618_POFFHIS_TSHUT BIT(1) > +#define RN5T618_POFFHIS_VINDET BIT(2) > +#define RN5T618_POFFHIS_IODET BIT(3) > +#define RN5T618_POFFHIS_CPU BIT(4) > +#define RN5T618_POFFHIS_WDG BIT(5) > +#define RN5T618_POFFHIS_DCLIM BIT(6) > +#define RN5T618_POFFHIS_N_OE BIT(7) > + > enum { > RN5T618_DCDC1, > RN5T618_DCDC2,
On Fri, 28 Oct 2022, Marcus Folkesson wrote: > The PMIC does store the power-off factor internally. > Read it out and report it as bootstatus. > > Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com> > --- > drivers/watchdog/rn5t618_wdt.c | 12 ++++++++++++ > include/linux/mfd/rn5t618.h | 9 +++++++++ Acked-by: Lee Jones <lee@kernel.org> > 2 files changed, 21 insertions(+) > > diff --git a/drivers/watchdog/rn5t618_wdt.c b/drivers/watchdog/rn5t618_wdt.c > index 6e524c8e26a8..40d8ebd8c0ac 100644 > --- a/drivers/watchdog/rn5t618_wdt.c > +++ b/drivers/watchdog/rn5t618_wdt.c > @@ -144,6 +144,8 @@ static int rn5t618_wdt_probe(struct platform_device *pdev) > struct rn5t618 *rn5t618 = dev_get_drvdata(dev->parent); > struct rn5t618_wdt *wdt; > int min_timeout, max_timeout; > + int ret; > + unsigned int val; > > wdt = devm_kzalloc(dev, sizeof(struct rn5t618_wdt), GFP_KERNEL); > if (!wdt) > @@ -160,6 +162,16 @@ static int rn5t618_wdt_probe(struct platform_device *pdev) > wdt->wdt_dev.timeout = max_timeout; > wdt->wdt_dev.parent = dev; > > + /* Read out previous power-off factor */ > + ret = regmap_read(wdt->rn5t618->regmap, RN5T618_POFFHIS, &val); > + if (ret) > + return ret; > + > + if (val & RN5T618_POFFHIS_VINDET) > + wdt->wdt_dev.bootstatus = WDIOF_POWERUNDER; > + else if (val & RN5T618_POFFHIS_WDG) > + wdt->wdt_dev.bootstatus = WDIOF_CARDRESET; > + > watchdog_set_drvdata(&wdt->wdt_dev, wdt); > watchdog_init_timeout(&wdt->wdt_dev, timeout, dev); > watchdog_set_nowayout(&wdt->wdt_dev, nowayout); > diff --git a/include/linux/mfd/rn5t618.h b/include/linux/mfd/rn5t618.h > index 8aa0bda1af4f..aacb6d51e99c 100644 > --- a/include/linux/mfd/rn5t618.h > +++ b/include/linux/mfd/rn5t618.h > @@ -227,6 +227,15 @@ > #define RN5T618_WATCHDOG_WDOGTIM_S 0 > #define RN5T618_PWRIRQ_IR_WDOG BIT(6) > > +#define RN5T618_POFFHIS_PWRON BIT(0) > +#define RN5T618_POFFHIS_TSHUT BIT(1) > +#define RN5T618_POFFHIS_VINDET BIT(2) > +#define RN5T618_POFFHIS_IODET BIT(3) > +#define RN5T618_POFFHIS_CPU BIT(4) > +#define RN5T618_POFFHIS_WDG BIT(5) > +#define RN5T618_POFFHIS_DCLIM BIT(6) > +#define RN5T618_POFFHIS_N_OE BIT(7) > + > enum { > RN5T618_DCDC1, > RN5T618_DCDC2,
diff --git a/drivers/watchdog/rn5t618_wdt.c b/drivers/watchdog/rn5t618_wdt.c index 6e524c8e26a8..40d8ebd8c0ac 100644 --- a/drivers/watchdog/rn5t618_wdt.c +++ b/drivers/watchdog/rn5t618_wdt.c @@ -144,6 +144,8 @@ static int rn5t618_wdt_probe(struct platform_device *pdev) struct rn5t618 *rn5t618 = dev_get_drvdata(dev->parent); struct rn5t618_wdt *wdt; int min_timeout, max_timeout; + int ret; + unsigned int val; wdt = devm_kzalloc(dev, sizeof(struct rn5t618_wdt), GFP_KERNEL); if (!wdt) @@ -160,6 +162,16 @@ static int rn5t618_wdt_probe(struct platform_device *pdev) wdt->wdt_dev.timeout = max_timeout; wdt->wdt_dev.parent = dev; + /* Read out previous power-off factor */ + ret = regmap_read(wdt->rn5t618->regmap, RN5T618_POFFHIS, &val); + if (ret) + return ret; + + if (val & RN5T618_POFFHIS_VINDET) + wdt->wdt_dev.bootstatus = WDIOF_POWERUNDER; + else if (val & RN5T618_POFFHIS_WDG) + wdt->wdt_dev.bootstatus = WDIOF_CARDRESET; + watchdog_set_drvdata(&wdt->wdt_dev, wdt); watchdog_init_timeout(&wdt->wdt_dev, timeout, dev); watchdog_set_nowayout(&wdt->wdt_dev, nowayout); diff --git a/include/linux/mfd/rn5t618.h b/include/linux/mfd/rn5t618.h index 8aa0bda1af4f..aacb6d51e99c 100644 --- a/include/linux/mfd/rn5t618.h +++ b/include/linux/mfd/rn5t618.h @@ -227,6 +227,15 @@ #define RN5T618_WATCHDOG_WDOGTIM_S 0 #define RN5T618_PWRIRQ_IR_WDOG BIT(6) +#define RN5T618_POFFHIS_PWRON BIT(0) +#define RN5T618_POFFHIS_TSHUT BIT(1) +#define RN5T618_POFFHIS_VINDET BIT(2) +#define RN5T618_POFFHIS_IODET BIT(3) +#define RN5T618_POFFHIS_CPU BIT(4) +#define RN5T618_POFFHIS_WDG BIT(5) +#define RN5T618_POFFHIS_DCLIM BIT(6) +#define RN5T618_POFFHIS_N_OE BIT(7) + enum { RN5T618_DCDC1, RN5T618_DCDC2,
The PMIC does store the power-off factor internally. Read it out and report it as bootstatus. Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com> --- drivers/watchdog/rn5t618_wdt.c | 12 ++++++++++++ include/linux/mfd/rn5t618.h | 9 +++++++++ 2 files changed, 21 insertions(+)