@@ -10,6 +10,7 @@
#include <linux/delay.h>
#include <linux/err.h>
#include <linux/io.h>
+#include <linux/iopoll.h>
#include <linux/of.h>
#include <linux/of_address.h>
#include <linux/slab.h>
@@ -325,9 +326,19 @@ struct clock_config {
#define NO_ID ~0
+struct stm32_clk_rdy_gate {
+ struct clk_gate gate;
+ u32 timeout_us;
+ u8 rdy_bit_idx;
+};
+
+#define to_clk_rdy_gate(_gate) container_of(_gate, struct stm32_clk_rdy_gate, gate)
+
struct gate_cfg {
u32 reg_off;
+ u32 timeout_us;
u8 bit_idx;
+ u8 rdy_bit_idx;
u8 gate_flags;
};
@@ -469,6 +480,36 @@ static void mp1_gate_clk_disable(struct clk_hw *hw)
.is_enabled = clk_gate_is_enabled,
};
+static int ready_gate_clk_enable(struct clk_hw *hw)
+{
+ struct clk_gate *gate = to_clk_gate(hw);
+ struct stm32_clk_rdy_gate *rdy_gate = to_clk_rdy_gate(gate);
+ int ret = 0;
+
+ if (!clk_gate_ops.is_enabled(hw)) {
+ u32 val;
+
+ clk_gate_ops.enable(hw);
+ ret = readl_relaxed_poll_timeout_atomic(
+ gate->reg,
+ val, (val & BIT(rdy_gate->rdy_bit_idx)),
+ 100, rdy_gate->timeout_us);
+ }
+
+ return ret;
+}
+
+static void ready_gate_clk_disable(struct clk_hw *hw)
+{
+ clk_gate_ops.disable(hw);
+}
+
+static const struct clk_ops ready_gate_clk_ops = {
+ .enable = ready_gate_clk_enable,
+ .disable = ready_gate_clk_disable,
+ .is_enabled = clk_gate_is_enabled,
+};
+
static struct clk_hw *_get_stm32_mux(void __iomem *base,
const struct stm32_mux_cfg *cfg,
spinlock_t *lock)
@@ -535,7 +576,7 @@ static struct clk_hw *_get_stm32_div(void __iomem *base,
const struct stm32_gate_cfg *cfg, spinlock_t *lock)
{
struct stm32_clk_mgate *mgate;
- struct clk_gate *gate;
+ struct stm32_clk_rdy_gate *rdy_gate;
struct clk_hw *gate_hw;
if (cfg->mgate) {
@@ -554,10 +595,15 @@ static struct clk_hw *_get_stm32_div(void __iomem *base,
gate_hw = &mgate->gate.hw;
} else {
- gate = kzalloc(sizeof(*gate), GFP_KERNEL);
- if (!gate)
+ struct clk_gate *gate;
+
+ rdy_gate = kzalloc(sizeof(*rdy_gate), GFP_KERNEL);
+ if (!rdy_gate)
return ERR_PTR(-ENOMEM);
+ gate = &rdy_gate->gate;
+ rdy_gate->rdy_bit_idx = cfg->gate->rdy_bit_idx;
+ rdy_gate->timeout_us = cfg->gate->timeout_us;
gate->reg = cfg->gate->reg_off + base;
gate->bit_idx = cfg->gate->bit_idx;
gate->flags = cfg->gate->gate_flags;
@@ -1211,6 +1257,23 @@ static struct clk_hw *_clk_register_cktim(struct device *dev,
_STM32_GATE(_gate_offset, _gate_bit_idx, _gate_flags,\
NULL, NULL)\
+#define _READY_GATE(_gate_offset, _gate_bit_idx, _rdy_bit_idx, _timeout_us, _gate_flags)\
+ (&(struct stm32_gate_cfg) {\
+ &(struct gate_cfg) {\
+ .reg_off = _gate_offset,\
+ .bit_idx = _gate_bit_idx,\
+ .rdy_bit_idx = _rdy_bit_idx,\
+ .timeout_us = _timeout_us, \
+ .gate_flags = _gate_flags,\
+ },\
+ .ops = &ready_gate_clk_ops,\
+ })
+
+#define GATE_READY(_id, _name, _parent, _flags, _offset, _bit_idx, \
+ _rdy_bit_idx, _timeout_us, _gate_flags) \
+ STM32_GATE(_id, _name, _parent, _flags,\
+ _READY_GATE(_offset, _bit_idx, _rdy_bit_idx, _timeout_us, _gate_flags))
+
#define _GATE_MP1(_gate_offset, _gate_bit_idx, _gate_flags)\
_STM32_GATE(_gate_offset, _gate_bit_idx, _gate_flags,\
NULL, &mp1_gate_clk_ops)\
@@ -1668,7 +1731,9 @@ enum {
RCC_OCENSETR, 4, 0),
GATE_MP1(CK_HSI, "ck_hsi", "clk-hsi-div", 0, RCC_OCENSETR, 0, 0),
GATE(CK_LSI, "ck_lsi", "clk-lsi", 0, RCC_RDLSICR, 0, 0),
- GATE(CK_LSE, "ck_lse", "clk-lse", 0, RCC_BDCR, 0, 0),
+ GATE_READY(CK_LSE, "ck_lse", "clk-lse", 0, RCC_BDCR, 0, 2,
+ /* Ready bit set after 4096 cycles of 32kHz clock 2* for safety */
+ USEC_PER_SEC / 32768 * 4096 * 2, 0),
FIXED_FACTOR(CK_HSE_DIV2, "clk-hse-div2", "ck_hse", 0, 1, 2),
After enabling the LSE clock it is necessary to wait to for the ready bit to be set. This takes 4096 cycles of the clock frequency (typically 32kHz) Currently this is not done and causes the RTC driver to fail to probe when built as a module: stm32_rtc 5c004000.rtc: Can't enter in init mode. Prescaler config failed. The reason is that if no built in driver uses LSE the clock framework will switch it off at the end of kernel boot. When the RTC driver is later probed as a module it will enable the LSE clock but since there is no wait the RTC driver will time out waiting for the RTC to initialise. When the RTC driver is built in it works, provided the LSE has already been enabled by the bootloader. Signed-off-by: Martin Fuzzey <martin.fuzzey@flowbird.group> --- drivers/clk/clk-stm32mp1.c | 73 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 69 insertions(+), 4 deletions(-)