Patch "regulator: core: Fix off-on-delay-us for always-on/boot-on regulators" has been added to the 5.15-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    regulator: core: Fix off-on-delay-us for always-on/boot-on regulators

to the 5.15-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     regulator-core-fix-off-on-delay-us-for-always-on-boo.patch
and it can be found in the queue-5.15 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit b9341ba590f2b69d02eb0dc0e22e0a3f3d40b738
Author: Christian Kohlschütter <christian@xxxxxxxxxxxxxxxx>
Date:   Tue Jul 19 16:02:00 2022 +0200

    regulator: core: Fix off-on-delay-us for always-on/boot-on regulators
    
    [ Upstream commit 218320fec29430438016f88dd4fbebfa1b95ad8d ]
    
    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ütter <christian@xxxxxxxxxxxxxxxx>
    Link: https://lore.kernel.org/r/FAFD5B39-E9C4-47C7-ACF1-2A04CD59758D@xxxxxxxxxxxxxxxx
    Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
    Stable-dep-of: 80d2c29e09e6 ("regulator: core: Use ktime_get_boottime() to determine how long a regulator was off")
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 450aa0756dd8c..c7b1e15bf7bb5 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1539,6 +1539,9 @@ static int set_machine_constraints(struct regulator_dev *rdev)
 			rdev->constraints->always_on = true;
 	}
 
+	if (rdev->desc->off_on_delay)
+		rdev->last_off = ktime_get();
+
 	/* If the constraints say the regulator should be on at this point
 	 * and we have control then make sure it is enabled.
 	 */
@@ -1572,8 +1575,6 @@ static int set_machine_constraints(struct regulator_dev *rdev)
 
 		if (rdev->constraints->always_on)
 			rdev->use_count++;
-	} else if (rdev->desc->off_on_delay) {
-		rdev->last_off = ktime_get();
 	}
 
 	print_constraints(rdev);