[V3,3/8] clk: qcom: clk-alpha-pll: Fix zonda set_rate failure when PLL is disabled

Commit Message

Satya Priya Kakitapalli July 31, 2024, 6:29 a.m. UTC

Currently, clk_zonda_pll_set_rate polls for the PLL to lock even if the
PLL is disabled. However, if the PLL is disabled then LOCK_DET will
never assert and we'll return an error. There is no reason to poll
LOCK_DET if the PLL is already disabled, so skip polling in this case.

Fixes: f21b6bfecc27 ("clk: qcom: clk-alpha-pll: add support for zonda pll")
Cc: [e-mail]
Signed-off-by: Satya Priya Kakitapalli <[e-mail]>
---
 drivers/clk/qcom/clk-alpha-pll.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

Dmitry Baryshkov July 31, 2024, 1:14 p.m. UTC | #1

On Wed, Jul 31, 2024 at 11:59:11AM GMT, Satya Priya Kakitapalli wrote:
> Currently, clk_zonda_pll_set_rate polls for the PLL to lock even if the
> PLL is disabled. However, if the PLL is disabled then LOCK_DET will
> never assert and we'll return an error. There is no reason to poll
> LOCK_DET if the PLL is already disabled, so skip polling in this case.
> 
> Fixes: f21b6bfecc27 ("clk: qcom: clk-alpha-pll: add support for zonda pll")
> Cc: [e-mail]
> Signed-off-by: Satya Priya Kakitapalli <[e-mail]>
> ---
>  drivers/clk/qcom/clk-alpha-pll.c | 3 +++
>  1 file changed, 3 insertions(+)
> 

Reviewed-by: Dmitry Baryshkov <[e-mail]>

Patch

diff --git a/drivers/clk/qcom/clk-alpha-pll.c b/drivers/clk/qcom/clk-alpha-pll.c
index eb5626095916..2ebeb277cb4d 100644
--- a/drivers/clk/qcom/clk-alpha-pll.c
+++ b/drivers/clk/qcom/clk-alpha-pll.c
@@ -2136,6 +2136,9 @@  static int clk_zonda_pll_set_rate(struct clk_hw *hw, unsigned long rate,
 	regmap_write(pll->clkr.regmap, PLL_ALPHA_VAL(pll), a);
 	regmap_write(pll->clkr.regmap, PLL_L_VAL(pll), l);
 
+	if (!clk_hw_is_enabled(hw))
+		return 0;
+
 	/* Wait before polling for the frequency latch */
 	udelay(5);