projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
733ab0c
)
clk: qcom: clk-krait: unlock spin after mux completion
author
Ansuel Smith
<ansuelsmth@gmail.com>
Sat, 30 Apr 2022 05:44:57 +0000
(07:44 +0200)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 17 Aug 2022 12:23:45 +0000
(14:23 +0200)
[ Upstream commit
df83d2c9e72910416f650ade1e07cc314ff02731
]
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
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/clk/qcom/clk-krait.c
patch
|
blob
|
history
diff --git
a/drivers/clk/qcom/clk-krait.c
b/drivers/clk/qcom/clk-krait.c
index
59f1af4
..
9004642
100644
(file)
--- 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)