| Message ID | 20220520100948.19622-2-johan+linaro@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | clk: qcom: gdsc: add support for collapse-vote registers | expand |
On Fri, 20 May 2022 at 13:10, Johan Hovold <johan+linaro@kernel.org> wrote: > > Add a helper for updating the SW_COLLAPSE bit during initialisation and > state updates. > > Note that the update during initialisation was relying on the > SW_COLLAPSE bit not having been set earlier rather than passing in zero > explicitly to clear the collapse vote. I think this part deserves a separate commit with proper Fixes: tag. > > Signed-off-by: Johan Hovold <johan+linaro@kernel.org> > --- > drivers/clk/qcom/gdsc.c | 23 +++++++++++++++++------ > 1 file changed, 17 insertions(+), 6 deletions(-) > > diff --git a/drivers/clk/qcom/gdsc.c b/drivers/clk/qcom/gdsc.c > index 44520efc6c72..c676416e685f 100644 > --- a/drivers/clk/qcom/gdsc.c > +++ b/drivers/clk/qcom/gdsc.c > @@ -132,10 +132,24 @@ static int gdsc_poll_status(struct gdsc *sc, enum gdsc_status status) > return -ETIMEDOUT; > } > > +static int gdsc_update_collapse_bit(struct gdsc *sc, bool val) > +{ > + u32 reg, mask; > + int ret; > + > + reg = sc->gdscr; > + mask = SW_COLLAPSE_MASK; > + > + ret = regmap_update_bits(sc->regmap, reg, mask, val ? mask : 0); > + if (ret) > + return ret; > + > + return 0; > +} > + > static int gdsc_toggle_logic(struct gdsc *sc, enum gdsc_status status) > { > int ret; > - u32 val = (status == GDSC_ON) ? 0 : SW_COLLAPSE_MASK; > > if (status == GDSC_ON && sc->rsupply) { > ret = regulator_enable(sc->rsupply); > @@ -143,9 +157,7 @@ static int gdsc_toggle_logic(struct gdsc *sc, enum gdsc_status status) > return ret; > } > > - ret = regmap_update_bits(sc->regmap, sc->gdscr, SW_COLLAPSE_MASK, val); > - if (ret) > - return ret; > + ret = gdsc_update_collapse_bit(sc, status == GDSC_OFF); > > /* If disabling votable gdscs, don't poll on status */ > if ((sc->flags & VOTABLE) && status == GDSC_OFF) { > @@ -425,8 +437,7 @@ static int gdsc_init(struct gdsc *sc) > * If a Votable GDSC is ON, make sure we have a Vote. > */ > if (sc->flags & VOTABLE) { > - ret = regmap_update_bits(sc->regmap, sc->gdscr, > - SW_COLLAPSE_MASK, val); > + ret = gdsc_update_collapse_bit(sc, false); > if (ret) > return ret; > } > -- > 2.35.1 >
On Fri, May 20, 2022 at 02:50:17PM +0300, Dmitry Baryshkov wrote: > On Fri, 20 May 2022 at 13:10, Johan Hovold <johan+linaro@kernel.org> wrote: > > > > Add a helper for updating the SW_COLLAPSE bit during initialisation and > > state updates. > > > > > > Note that the update during initialisation was relying on the > > SW_COLLAPSE bit not having been set earlier rather than passing in zero > > explicitly to clear the collapse vote. > > I think this part deserves a separate commit with proper Fixes: tag. No, it's not a bug. The value passed in is explicitly set a bit higher up in the same function so that the SW_COLLAPSE bit is (currently) never set. It mostly just looks weird and probably wasn't intentional. > > @@ -425,8 +437,7 @@ static int gdsc_init(struct gdsc *sc) > > * If a Votable GDSC is ON, make sure we have a Vote. > > */ > > if (sc->flags & VOTABLE) { > > - ret = regmap_update_bits(sc->regmap, sc->gdscr, > > - SW_COLLAPSE_MASK, val); > > + ret = gdsc_update_collapse_bit(sc, false); > > if (ret) > > return ret; > > } Johan
diff --git a/drivers/clk/qcom/gdsc.c b/drivers/clk/qcom/gdsc.c index 44520efc6c72..c676416e685f 100644 --- a/drivers/clk/qcom/gdsc.c +++ b/drivers/clk/qcom/gdsc.c @@ -132,10 +132,24 @@ static int gdsc_poll_status(struct gdsc *sc, enum gdsc_status status) return -ETIMEDOUT; } +static int gdsc_update_collapse_bit(struct gdsc *sc, bool val) +{ + u32 reg, mask; + int ret; + + reg = sc->gdscr; + mask = SW_COLLAPSE_MASK; + + ret = regmap_update_bits(sc->regmap, reg, mask, val ? mask : 0); + if (ret) + return ret; + + return 0; +} + static int gdsc_toggle_logic(struct gdsc *sc, enum gdsc_status status) { int ret; - u32 val = (status == GDSC_ON) ? 0 : SW_COLLAPSE_MASK; if (status == GDSC_ON && sc->rsupply) { ret = regulator_enable(sc->rsupply); @@ -143,9 +157,7 @@ static int gdsc_toggle_logic(struct gdsc *sc, enum gdsc_status status) return ret; } - ret = regmap_update_bits(sc->regmap, sc->gdscr, SW_COLLAPSE_MASK, val); - if (ret) - return ret; + ret = gdsc_update_collapse_bit(sc, status == GDSC_OFF); /* If disabling votable gdscs, don't poll on status */ if ((sc->flags & VOTABLE) && status == GDSC_OFF) { @@ -425,8 +437,7 @@ static int gdsc_init(struct gdsc *sc) * If a Votable GDSC is ON, make sure we have a Vote. */ if (sc->flags & VOTABLE) { - ret = regmap_update_bits(sc->regmap, sc->gdscr, - SW_COLLAPSE_MASK, val); + ret = gdsc_update_collapse_bit(sc, false); if (ret) return ret; }
Add a helper for updating the SW_COLLAPSE bit during initialisation and state updates. Note that the update during initialisation was relying on the SW_COLLAPSE bit not having been set earlier rather than passing in zero explicitly to clear the collapse vote. Signed-off-by: Johan Hovold <johan+linaro@kernel.org> --- drivers/clk/qcom/gdsc.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-)