Re: [PATCH] mfd: stpmic1: Attempt system shutdown twice in case PMIC is confused
From: Marek Vasut
Date: Thu Jan 15 2026 - 12:40:19 EST
On 1/13/26 1:33 PM, Lee Jones wrote:
On Fri, 09 Jan 2026, Marek Vasut wrote:I sent V2 like that now.
Attempt to shut down again, in case the first attempt failed.
The STPMIC1 might get confused and the first regmap_update_bits()
returns with -ETIMEDOUT / -110 . If that or similar transient
failure occurs, try to shut down again. If the second attempt
fails, there is some bigger problem, report it to user.
Fixes: 6e9df38f359a ("mfd: stpmic1: Add PMIC poweroff via sys-off handler")
Signed-off-by: Marek Vasut <marex@xxxxxxxxxxxx>
---
Cc: Lee Jones <lee@xxxxxxxxxx>
Cc: Pascal PAILLET-LME <p.paillet@xxxxxx>
Cc: Paul Cercueil <paul@xxxxxxxxxxxxxxx>
Cc: Sean Nyekjaer <sean@xxxxxxxxxx>
Cc: kernel@xxxxxxxxxxxxxxxxxx
---
drivers/mfd/stpmic1.c | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/drivers/mfd/stpmic1.c b/drivers/mfd/stpmic1.c
index 081827bc05961..9ef4049d7db10 100644
--- a/drivers/mfd/stpmic1.c
+++ b/drivers/mfd/stpmic1.c
@@ -121,9 +121,23 @@ static const struct regmap_irq_chip stpmic1_regmap_irq_chip = {
static int stpmic1_power_off(struct sys_off_data *data)
{
struct stpmic1 *ddata = data->cb_data;
+ int ret;
+
+ ret = regmap_update_bits(ddata->regmap, MAIN_CR, SOFTWARE_SWITCH_OFF, SOFTWARE_SWITCH_OFF);
+ if (!ret)
+ return NOTIFY_DONE;
+
+ /*
+ * Attempt to shut down again, in case the first attempt failed.
+ * The STPMIC1 might get confused and the first regmap_update_bits()
+ * returns with -ETIMEDOUT / -110 . If that or similar transient
+ * failure occurs, try to shut down again. If the second attempt
+ * fails, there is some bigger problem, report it to user.
+ */
+ ret = regmap_update_bits(ddata->regmap, MAIN_CR, SOFTWARE_SWITCH_OFF, SOFTWARE_SWITCH_OFF);
I think it would be better to put it into a loop with 2 retries.