Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Content-Type: text/plain;
        charset=utf-8
Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.100.31\))
Subject: [PATCH REBASE] regulator: core: Fix off-on-delay-us for
 always-on/boot-on regulators
From:   Christian Kohlschuetter <christian@kohlschuetter.com>
In-Reply-To: <YtVTyzLREdkzYiKS@sirena.org.uk>
Date:   Mon, 18 Jul 2022 19:24:37 +0200
Cc:     Liam Girdwood <lgirdwood@gmail.com>,
        linux-kernel <linux-kernel@vger.kernel.org>
Content-Transfer-Encoding: quoted-printable
Message-Id: <3270C618-E361-4BC1-B63A-917AE09DA60E@kohlschuetter.com>
References: <E25D6465-6475-42B4-90EB-3D2C3CAF3B20@kohlschuetter.com>
 <YtVTyzLREdkzYiKS@sirena.org.uk>
To:     Mark Brown <broonie@kernel.org>
Precedence: bulk

Regulators marked with "regulator-always-on" or "regulator-boot-on"
as well as an "off-on-delay-us", may run into cycling issues that are
hard to detect.

This is caused by the "last_off" state not being initialized in this
case.

Fix the "last_off" initialization by setting it to the current kernel
time upon initialization, regardless of always_on/boot_on state.

Signed-off-by: Christian Kohlsch=C3=BCtter <christian@kohlschutter.com>
---
 drivers/regulator/core.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 1e54a833f..398c8d6af 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1565,6 +1565,9 @@ static int set_machine_constraints(struct =
regulator_dev *rdev)
 			rdev->constraints->always_on =3D true;
 	}
=20
+	if (rdev->desc->off_on_delay)
+		rdev->last_off =3D ktime_get();
+
 	/* If the constraints say the regulator should be on at this =
point
 	 * and we have control then make sure it is enabled.
 	 */
@@ -1592,8 +1595,6 @@ static int set_machine_constraints(struct =
regulator_dev *rdev)
=20
 		if (rdev->constraints->always_on)
 			rdev->use_count++;
-	} else if (rdev->desc->off_on_delay) {
-		rdev->last_off =3D ktime_get();
 	}
=20
 	print_constraints(rdev);
--=20
2.36.1