clk: qcom: gdsc: Set retain_ff before moving to HW CTRL

commit 25708f73ff171bb4171950c9f4be5aa8504b8459 upstream.

Enable the retain_ff_enable bit of GDSCR only if the GDSC is already ON.
Once the GDSCR moves to HW control, SW no longer can determine the state
of the GDSCR and setting the retain_ff bit could destroy all the register
contents we intended to save.
Therefore, move the retain_ff configuration before switching the GDSC to
HW trigger mode.

Cc: stable@vger.kernel.org
Fixes: 173722995cdb ("clk: qcom: gdsc: Add support to enable retention of GSDCR")
Signed-off-by: Taniya Das <quic_tdas@quicinc.com>
Reviewed-by: Imran Shaik <quic_imrashai@quicinc.com>
Tested-by: Imran Shaik <quic_imrashai@quicinc.com> # on QCS8300
Link: https://lore.kernel.org/r/20250214-gdsc_fixes-v1-1-73e56d68a80f@quicinc.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/clk/qcom/gdsc.c b/drivers/clk/qcom/gdsc.c
index fdedf6dfe7b90c074b200353fc0c2b897863c79f..208fc430ec98f127f4f2f9af4dfd206be644fd2b 100644 (file)
--- a/drivers/clk/qcom/gdsc.c
+++ b/drivers/clk/qcom/gdsc.c
@@ -292,6 +292,9 @@ static int gdsc_enable(struct generic_pm_domain *domain)
         */
        udelay(1);
 
+       if (sc->flags & RETAIN_FF_ENABLE)
+               gdsc_retain_ff_on(sc);
+
        /* Turn on HW trigger mode if supported */
        if (sc->flags & HW_CTRL) {
                ret = gdsc_hwctrl(sc, true);
@@ -308,9 +311,6 @@ static int gdsc_enable(struct generic_pm_domain *domain)
                udelay(1);
        }
 
-       if (sc->flags & RETAIN_FF_ENABLE)
-               gdsc_retain_ff_on(sc);
-
        return 0;
 }
 
@@ -457,13 +457,6 @@ static int gdsc_init(struct gdsc *sc)
                                goto err_disable_supply;
                }
 
-               /* Turn on HW trigger mode if supported */
-               if (sc->flags & HW_CTRL) {
-                       ret = gdsc_hwctrl(sc, true);
-                       if (ret < 0)
-                               goto err_disable_supply;
-               }
-
                /*
                 * Make sure the retain bit is set if the GDSC is already on,
                 * otherwise we end up turning off the GDSC and destroying all
@@ -471,6 +464,14 @@ static int gdsc_init(struct gdsc *sc)
                 */
                if (sc->flags & RETAIN_FF_ENABLE)
                        gdsc_retain_ff_on(sc);
+
+               /* Turn on HW trigger mode if supported */
+               if (sc->flags & HW_CTRL) {
+                       ret = gdsc_hwctrl(sc, true);
+                       if (ret < 0)
+                               goto err_disable_supply;
+               }
+
        } else if (sc->flags & ALWAYS_ON) {
                /* If ALWAYS_ON GDSCs are not ON, turn them ON */
                gdsc_enable(&sc->pd);