summaryrefslogtreecommitdiffstats
path: root/drivers/clk/qcom
diff options
context:
space:
mode:
authorAnsuel Smith <ansuelsmth@gmail.com>2022-04-30 07:44:57 +0200
committerBjorn Andersson <bjorn.andersson@linaro.org>2022-06-27 15:41:37 -0500
commitdf83d2c9e72910416f650ade1e07cc314ff02731 (patch)
tree6bd8755c4167597694bc0272bef562b922f58061 /drivers/clk/qcom
parentfcfbfe373d41b4728ffec075f8f91b6572a88c27 (diff)
downloadlinux-stable-df83d2c9e72910416f650ade1e07cc314ff02731.tar.gz
linux-stable-df83d2c9e72910416f650ade1e07cc314ff02731.tar.bz2
linux-stable-df83d2c9e72910416f650ade1e07cc314ff02731.zip
clk: qcom: clk-krait: unlock spin after mux completion
Unlock spinlock after the mux switch is completed to prevent any corner case of mux request while the switch still needs to be done. Fixes: 4d7dc77babfe ("clk: qcom: Add support for Krait clocks") Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> Link: https://lore.kernel.org/r/20220430054458.31321-3-ansuelsmth@gmail.com
Diffstat (limited to 'drivers/clk/qcom')
-rw-r--r--drivers/clk/qcom/clk-krait.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/clk/qcom/clk-krait.c b/drivers/clk/qcom/clk-krait.c
index 59f1af415b58..90046428693c 100644
--- a/drivers/clk/qcom/clk-krait.c
+++ b/drivers/clk/qcom/clk-krait.c
@@ -32,11 +32,16 @@ static void __krait_mux_set_sel(struct krait_mux_clk *mux, int sel)
regval |= (sel & mux->mask) << (mux->shift + LPL_SHIFT);
}
krait_set_l2_indirect_reg(mux->offset, regval);
- spin_unlock_irqrestore(&krait_clock_reg_lock, flags);
/* Wait for switch to complete. */
mb();
udelay(1);
+
+ /*
+ * Unlock now to make sure the mux register is not
+ * modified while switching to the new parent.
+ */
+ spin_unlock_irqrestore(&krait_clock_reg_lock, flags);
}
static int krait_mux_set_parent(struct clk_hw *hw, u8 index)