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;
From:   Rahul Tanwar <rtanwar@maxlinear.com>
To:     <sboyd@kernel.org>, <mturquette@baylibre.com>,
        <linux-clk@vger.kernel.org>
CC:     <linux-kernel@vger.kernel.org>, <linux-lgm-soc@maxlinear.com>,
        "Rahul Tanwar" <rtanwar@maxlinear.com>
Subject: [PATCH RESEND 3/3] clk: mxl: Avoid disabling gate clocks from clk driver
Date:   Mon, 25 Jul 2022 18:27:29 +0800
Message-ID: <f63435d71b9772de9628355c05c7de95d38dbbb1.1658742240.git.rtanwar@maxlinear.com>
In-Reply-To: <cover.1658742240.git.rtanwar@maxlinear.com>
References: <cover.1658742240.git.rtanwar@maxlinear.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=WINDOWS-1252
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

In MxL's LGM SoC, gate clocks are supposed to be enabled or disabled
from EPU (power management IP) in certain power saving modes. If gate
clocks are allowed to be enabled/disabled from CGU clk driver, then
there arises a conflict where in case clk driver disables a gate clk,
and then EPU tries to disable the same gate clk, then it will hang
polling for the clk gated successful status.

To avoid such a conflict, disable gate clocks enabling/disabling from
CGU clk driver. But add a GATE_CLK_HW flag to control this in order to
be backward compatible with other SoCs which share the same CGU IP but
not the same EPU IP.

Signed-off-by: Rahul Tanwar <rtanwar@maxlinear.com>
---
 drivers/clk/x86/clk-cgu.c | 32 ++++++++++++++++++++++++--------
 drivers/clk/x86/clk-cgu.h |  1 +
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/drivers/clk/x86/clk-cgu.c b/drivers/clk/x86/clk-cgu.c
index 1f7e93de67bc..d24173cfe0b0 100644
--- a/drivers/clk/x86/clk-cgu.c
+++ b/drivers/clk/x86/clk-cgu.c
@@ -258,8 +258,12 @@ static int lgm_clk_gate_enable(struct clk_hw *hw)
 =09struct lgm_clk_gate *gate =3D to_lgm_clk_gate(hw);
 =09unsigned int reg;
=20
-=09reg =3D GATE_HW_REG_EN(gate->reg);
-=09lgm_set_clk_val(gate->membase, reg, gate->shift, 1, 1);
+=09if (gate->flags & GATE_CLK_HW) {
+=09=09reg =3D GATE_HW_REG_EN(gate->reg);
+=09=09lgm_set_clk_val(gate->membase, reg, gate->shift, 1, 1);
+=09} else {
+=09=09gate->reg =3D 1;
+=09}
=20
 =09return 0;
 }
@@ -269,8 +273,12 @@ static void lgm_clk_gate_disable(struct clk_hw *hw)
 =09struct lgm_clk_gate *gate =3D to_lgm_clk_gate(hw);
 =09unsigned int reg;
=20
-=09reg =3D GATE_HW_REG_DIS(gate->reg);
-=09lgm_set_clk_val(gate->membase, reg, gate->shift, 1, 1);
+=09if (gate->flags & GATE_CLK_HW) {
+=09=09reg =3D GATE_HW_REG_DIS(gate->reg);
+=09=09lgm_set_clk_val(gate->membase, reg, gate->shift, 1, 1);
+=09} else {
+=09=09gate->reg =3D 0;
+=09}
 }
=20
 static int lgm_clk_gate_is_enabled(struct clk_hw *hw)
@@ -278,8 +286,12 @@ static int lgm_clk_gate_is_enabled(struct clk_hw *hw)
 =09struct lgm_clk_gate *gate =3D to_lgm_clk_gate(hw);
 =09unsigned int reg, ret;
=20
-=09reg =3D GATE_HW_REG_STAT(gate->reg);
-=09ret =3D lgm_get_clk_val(gate->membase, reg, gate->shift, 1);
+=09if (gate->flags & GATE_CLK_HW) {
+=09=09reg =3D GATE_HW_REG_STAT(gate->reg);
+=09=09ret =3D lgm_get_clk_val(gate->membase, reg, gate->shift, 1);
+=09} else {
+=09=09ret =3D gate->reg;
+=09}
=20
 =09return ret;
 }
@@ -315,7 +327,8 @@ lgm_clk_register_gate(struct lgm_clk_provider *ctx,
 =09init.num_parents =3D pname ? 1 : 0;
=20
 =09gate->membase =3D ctx->membase;
-=09gate->reg =3D reg;
+=09if (cflags & GATE_CLK_HW)
+=09=09gate->reg =3D reg;
 =09gate->shift =3D shift;
 =09gate->flags =3D cflags;
 =09gate->hw.init =3D &init;
@@ -326,7 +339,10 @@ lgm_clk_register_gate(struct lgm_clk_provider *ctx,
 =09=09return ERR_PTR(ret);
=20
 =09if (cflags & CLOCK_FLAG_VAL_INIT) {
-=09=09lgm_set_clk_val(gate->membase, reg, shift, 1, list->gate_val);
+=09=09if (cflags & GATE_CLK_HW)
+=09=09=09lgm_set_clk_val(gate->membase, reg, shift, 1, list->gate_val);
+=09=09else
+=09=09=09gate->reg =3D 1;
 =09}
=20
 =09return hw;
diff --git a/drivers/clk/x86/clk-cgu.h b/drivers/clk/x86/clk-cgu.h
index 0aa0f35d63a0..73ce84345f81 100644
--- a/drivers/clk/x86/clk-cgu.h
+++ b/drivers/clk/x86/clk-cgu.h
@@ -197,6 +197,7 @@ struct lgm_clk_branch {
 /* clock flags definition */
 #define CLOCK_FLAG_VAL_INIT=09BIT(16)
 #define MUX_CLK_SW=09=09BIT(17)
+#define GATE_CLK_HW=09=09BIT(18)
=20
 #define LGM_MUX(_id, _name, _pdata, _f, _reg,=09=09\
 =09=09_shift, _width, _cf, _v)=09=09\
--=20
2.17.1