From nobody Sat Feb 7 22:21:05 2026 Received: from mx.nabladev.com (mx.nabladev.com [178.251.229.89]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A4C7943CEF8; Thu, 22 Jan 2026 11:14:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=178.251.229.89 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769080470; cv=none; b=oUkQiYXyTtaH58f2iWKTyqlVUtCLIjqN4PfblmR1VemuXVjweGGnyI/aU0czZj+d8Bcz9Ybd8/kMxb/5RhO11s75ojYDsPHo8Rm+JbHV+mCfzxiHcFT9lCYkMn3rZqjUjxhIenFzTprqQtLjc+OZiad8TIatE3S15TDaUn4l6vw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769080470; c=relaxed/simple; bh=KMXnHjcVP+Dic9ae46yMQMb2pqnDQPcVbnMbRIY5KIA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=So1IwzBt0YrsDly2f9PDv3cqqy6qzLeKNQvu1qXwlPDtoWTFiZPE0P/+O5cUz/Jl+4MNQX+KHEMrlLEeO+B2XwPXdJC7bAVtrKfAOj01F/4iRXIPvKDaLLuBwLnNTjbwiuwScc7KFtdDgTKLi8WAcuVTYGAKbSv363xZtujaUEQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nabladev.com; spf=pass smtp.mailfrom=nabladev.com; dkim=pass (2048-bit key) header.d=nabladev.com header.i=@nabladev.com header.b=jVNCIP4z; arc=none smtp.client-ip=178.251.229.89 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nabladev.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nabladev.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nabladev.com header.i=@nabladev.com header.b="jVNCIP4z" Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id D485F101EFF; Thu, 22 Jan 2026 12:14:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nabladev.com; s=dkim; t=1769080466; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding; bh=tSEU4Qn5141dWvsEb87q1JsnC2fOoJgbp7RUPUGNmek=; b=jVNCIP4zo22LfCciLLlDb71ztcCbet1ihmNKqgTtsX++BA4GeXy+fFwjSZlhFc521slrl4 7a/tO+fMwX1zn8Uq7SbXBiauv4vlT2hLpD6tu+s+r2Vg+BJBmYH7VbVIY7B92oM9fRsHip fn1cCsY/oBHGSfGoMZ4x56uoLnW3tpsgWUehwFDbWf1I2RE98DlPq05YzofeQrGD+3NQiU KUjmAEUCUW2qUD1osj8FTyK0nv8rBMRNvF8OhJSkX8SCMsdGN17OwabPSWRnPVwYK1NBt3 JoRbjkZoPnZK3A0StKnphpC0xhTbpSB2ZTGV6L8ljpKILfqq2fsS1WO/dmsM1w== From: Marek Vasut To: linux-kernel@vger.kernel.org Cc: Marek Vasut , stable@vger.kernel.org, Lee Jones , Pascal PAILLET-LME , Paul Cercueil , Sean Nyekjaer , kernel@dh-electronics.com Subject: [PATCH v3] mfd: stpmic1: Attempt system shutdown twice in case PMIC is confused Date: Thu, 22 Jan 2026 12:13:21 +0100 Message-ID: <20260122111423.62591-1-marex@nabladev.com> X-Mailer: git-send-email 2.51.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Last-TLS-Session-Version: TLSv1.3 Content-Type: text/plain; charset="utf-8" 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. Cc: stable@vger.kernel.org Fixes: 6e9df38f359a ("mfd: stpmic1: Add PMIC poweroff via sys-off handler") Signed-off-by: Marek Vasut --- Cc: Lee Jones Cc: Pascal PAILLET-LME Cc: Paul Cercueil Cc: Sean Nyekjaer Cc: kernel@dh-electronics.com --- V2: - Use a retry loop - Cc stable V3: Adjust the loop further, define STPMIC1_MAX_RETRIES, rename the loop control variable, print error message only when the loop ran STPMIC1_MAX_RETRIES times --- drivers/mfd/stpmic1.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/drivers/mfd/stpmic1.c b/drivers/mfd/stpmic1.c index 081827bc05961..7c677b0344c60 100644 --- a/drivers/mfd/stpmic1.c +++ b/drivers/mfd/stpmic1.c @@ -16,6 +16,8 @@ =20 #include =20 +#define STPMIC1_MAX_RETRIES 2 + #define STPMIC1_MAIN_IRQ 0 =20 static const struct regmap_range stpmic1_readable_ranges[] =3D { @@ -121,9 +123,23 @@ static const struct regmap_irq_chip stpmic1_regmap_irq= _chip =3D { static int stpmic1_power_off(struct sys_off_data *data) { struct stpmic1 *ddata =3D data->cb_data; + int ret; + + /* + * 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. + */ + for (int retries =3D 0; retries < STPMIC1_MAX_RETRIES; retries++) { + ret =3D regmap_update_bits(ddata->regmap, MAIN_CR, SOFTWARE_SWITCH_OFF, + SOFTWARE_SWITCH_OFF); + if (!ret) + return NOTIFY_DONE; + } =20 - regmap_update_bits(ddata->regmap, MAIN_CR, - SOFTWARE_SWITCH_OFF, SOFTWARE_SWITCH_OFF); + dev_err(ddata->dev, "Failed to access PMIC I2C bus (%d)\n", ret); =20 return NOTIFY_DONE; } --=20 2.51.0