diff options
| author | Emmanuel Vadot <manu@FreeBSD.org> | 2026-11-10 14:37:21 +0000 |
|---|---|---|
| committer | Emmanuel Vadot <manu@FreeBSD.org> | 2026-11-12 09:47:29 +0000 |
| commit | 92b59f3d010d0ed176e452a0264ab19659e9d7fd (patch) | |
| tree | 6234386e19c7010b88c6c2300a6db772ee1499e3 | |
| parent | 4f1a78adcd6503778b6d0722713b707382ada3a7 (diff) | |
aw_clk: Wait for the PLL to lock when enabling it
The nm, nmm, np and nkmp clocks wait for the lock bit after their rate
has been changed, but not when they are enabled. A PLL that was off
could then be used by its children, or by the consumers of the clock,
before it had locked.
Add aw_clk_wait_for_lock() and use it when the clock is enabled, for the
clocks that have a lock bit, and in place of the copies of the loop that
waited for the lock after a rate change. Tell when the PLL does not
lock, as the callers did not notice it.
Tested on: H6
| -rw-r--r-- | sys/dev/clk/allwinner/aw_clk.h | 25 | ||||
| -rw-r--r-- | sys/dev/clk/allwinner/aw_clk_frac.c | 10 | ||||
| -rw-r--r-- | sys/dev/clk/allwinner/aw_clk_mipi.c | 9 | ||||
| -rw-r--r-- | sys/dev/clk/allwinner/aw_clk_nkmp.c | 23 | ||||
| -rw-r--r-- | sys/dev/clk/allwinner/aw_clk_nm.c | 15 | ||||
| -rw-r--r-- | sys/dev/clk/allwinner/aw_clk_nmm.c | 14 | ||||
| -rw-r--r-- | sys/dev/clk/allwinner/aw_clk_np.c | 14 |
7 files changed, 61 insertions, 49 deletions
diff --git a/sys/dev/clk/allwinner/aw_clk.h b/sys/dev/clk/allwinner/aw_clk.h index 948adc27945f..f89b503060bd 100644 --- a/sys/dev/clk/allwinner/aw_clk.h +++ b/sys/dev/clk/allwinner/aw_clk.h @@ -26,6 +26,10 @@ #ifndef __AW_CLK_H__ #define __AW_CLK_H__ +#include <dev/clk/clk.h> + +#include "clkdev_if.h" + /* Allwinner clocks formula : @@ -97,6 +101,27 @@ struct aw_clk_frac { uint32_t freq_sel; }; +/* + * Wait for a PLL to report that it is locked, the hardware sets the lock + * bit once the output is stable. + */ +static inline void +aw_clk_wait_for_lock(struct clknode *clk, uint32_t offset, uint32_t lock_shift, + uint32_t retries) +{ + uint32_t retry, val; + + for (retry = 0; retry < retries; retry++) { + CLKDEV_READ_4(clknode_get_device(clk), offset, &val); + if ((val & (1 << lock_shift)) != 0) + return; + DELAY(1000); + } + + device_printf(clknode_get_device(clk), "%s did not lock\n", + clknode_get_name(clk)); +} + static inline uint32_t aw_clk_get_factor(uint32_t val, struct aw_clk_factor *factor) { diff --git a/sys/dev/clk/allwinner/aw_clk_frac.c b/sys/dev/clk/allwinner/aw_clk_frac.c index 2258ec988430..b7102d59cac6 100644 --- a/sys/dev/clk/allwinner/aw_clk_frac.c +++ b/sys/dev/clk/allwinner/aw_clk_frac.c @@ -188,7 +188,7 @@ aw_clk_frac_set_freq(struct clknode *clk, uint64_t fparent, uint64_t *fout, struct aw_clk_frac_sc *sc; uint64_t cur, best, best_frac; uint32_t val, m, n, best_m, best_n; - int retry, multiple, max_mult, best_mult; + int multiple, max_mult, best_mult; sc = clknode_get_softc(clk); @@ -293,12 +293,8 @@ aw_clk_frac_set_freq(struct clknode *clk, uint64_t fparent, uint64_t *fout, WRITE4(clk, sc->offset, val); DEVICE_UNLOCK(clk); - for (retry = 0; retry < sc->lock_retries; retry++) { - READ4(clk, sc->offset, &val); - if ((val & (1 << sc->lock_shift)) != 0) - break; - DELAY(1000); - } + aw_clk_wait_for_lock(clk, sc->offset, sc->lock_shift, + sc->lock_retries); *fout = best; *stop = 1; diff --git a/sys/dev/clk/allwinner/aw_clk_mipi.c b/sys/dev/clk/allwinner/aw_clk_mipi.c index 9875e179a277..8650da38e76c 100644 --- a/sys/dev/clk/allwinner/aw_clk_mipi.c +++ b/sys/dev/clk/allwinner/aw_clk_mipi.c @@ -149,7 +149,6 @@ aw_clk_mipi_set_freq(struct clknode *clk, uint64_t fparent, uint64_t *fout, uint32_t best_k, best_m, best_n; uint32_t k, m, n; uint32_t val; - uint32_t retry; sc = clknode_get_softc(clk); @@ -192,12 +191,8 @@ aw_clk_mipi_set_freq(struct clknode *clk, uint64_t fparent, uint64_t *fout, WRITE4(clk, sc->offset, val); DEVICE_UNLOCK(clk); - for (retry = 0; retry < sc->lock_retries; retry++) { - READ4(clk, sc->offset, &val); - if ((val & (1 << sc->lock_shift)) != 0) - break; - DELAY(1000); - } + aw_clk_wait_for_lock(clk, sc->offset, sc->lock_shift, + sc->lock_retries); *fout = best; *stop = 1; diff --git a/sys/dev/clk/allwinner/aw_clk_nkmp.c b/sys/dev/clk/allwinner/aw_clk_nkmp.c index ede89c1d1b8b..f653ed8abaca 100644 --- a/sys/dev/clk/allwinner/aw_clk_nkmp.c +++ b/sys/dev/clk/allwinner/aw_clk_nkmp.c @@ -111,6 +111,11 @@ aw_clk_nkmp_set_gate(struct clknode *clk, bool enable) WRITE4(clk, sc->offset, val); DEVICE_UNLOCK(clk); + if (enable && (sc->flags & AW_CLK_HAS_LOCK) != 0) { + aw_clk_wait_for_lock(clk, sc->offset, sc->lock_shift, + sc->lock_retries); + } + return (0); } @@ -191,7 +196,6 @@ aw_clk_nkmp_set_freq_scale(struct clknode *clk, struct aw_clk_nkmp_sc *sc, uint32_t factor_n, uint32_t factor_k, uint32_t factor_m, uint32_t factor_p) { uint32_t val, m, p; - int retry; DEVICE_LOCK(clk); READ4(clk, sc->offset, &val); @@ -235,12 +239,8 @@ aw_clk_nkmp_set_freq_scale(struct clknode *clk, struct aw_clk_nkmp_sc *sc, } if ((sc->flags & AW_CLK_HAS_LOCK) != 0) { - for (retry = 0; retry < sc->lock_retries; retry++) { - READ4(clk, sc->offset, &val); - if ((val & (1 << sc->lock_shift)) != 0) - break; - DELAY(1000); - } + aw_clk_wait_for_lock(clk, sc->offset, sc->lock_shift, + sc->lock_retries); } DEVICE_UNLOCK(clk); @@ -253,7 +253,6 @@ aw_clk_nkmp_set_freq(struct clknode *clk, uint64_t fparent, uint64_t *fout, struct aw_clk_nkmp_sc *sc; uint64_t best; uint32_t val, best_n, best_k, best_m, best_p; - int retry; sc = clknode_get_softc(clk); @@ -304,12 +303,8 @@ aw_clk_nkmp_set_freq(struct clknode *clk, uint64_t fparent, uint64_t *fout, } if ((sc->flags & AW_CLK_HAS_LOCK) != 0) { - for (retry = 0; retry < sc->lock_retries; retry++) { - READ4(clk, sc->offset, &val); - if ((val & (1 << sc->lock_shift)) != 0) - break; - DELAY(1000); - } + aw_clk_wait_for_lock(clk, sc->offset, sc->lock_shift, + sc->lock_retries); } } diff --git a/sys/dev/clk/allwinner/aw_clk_nm.c b/sys/dev/clk/allwinner/aw_clk_nm.c index cb49adda8597..cbbc932f92a5 100644 --- a/sys/dev/clk/allwinner/aw_clk_nm.c +++ b/sys/dev/clk/allwinner/aw_clk_nm.c @@ -107,6 +107,11 @@ aw_clk_nm_set_gate(struct clknode *clk, bool enable) WRITE4(clk, sc->offset, val); DEVICE_UNLOCK(clk); + if (enable && (sc->flags & AW_CLK_HAS_LOCK) != 0) { + aw_clk_wait_for_lock(clk, sc->offset, sc->lock_shift, + sc->lock_retries); + } + return (0); } @@ -178,7 +183,7 @@ aw_clk_nm_set_freq(struct clknode *clk, uint64_t fparent, uint64_t *fout, const char **p_names; uint64_t cur, best; uint32_t val, m, n, best_m, best_n; - int p_idx, best_parent, retry; + int p_idx, best_parent; sc = clknode_get_softc(clk); @@ -247,12 +252,8 @@ aw_clk_nm_set_freq(struct clknode *clk, uint64_t fparent, uint64_t *fout, DEVICE_UNLOCK(clk); if ((sc->flags & AW_CLK_HAS_LOCK) != 0) { - for (retry = 0; retry < sc->lock_retries; retry++) { - READ4(clk, sc->offset, &val); - if ((val & (1 << sc->lock_shift)) != 0) - break; - DELAY(1000); - } + aw_clk_wait_for_lock(clk, sc->offset, sc->lock_shift, + sc->lock_retries); } *fout = best; diff --git a/sys/dev/clk/allwinner/aw_clk_nmm.c b/sys/dev/clk/allwinner/aw_clk_nmm.c index 9f0e7d9fd2f7..123c2b849805 100644 --- a/sys/dev/clk/allwinner/aw_clk_nmm.c +++ b/sys/dev/clk/allwinner/aw_clk_nmm.c @@ -94,6 +94,11 @@ aw_clk_nmm_set_gate(struct clknode *clk, bool enable) WRITE4(clk, sc->offset, val); DEVICE_UNLOCK(clk); + if (enable && (sc->flags & AW_CLK_HAS_LOCK) != 0) { + aw_clk_wait_for_lock(clk, sc->offset, sc->lock_shift, + sc->lock_retries); + } + return (0); } @@ -143,7 +148,6 @@ aw_clk_nmm_set_freq(struct clknode *clk, uint64_t fparent, uint64_t *fout, struct aw_clk_nmm_sc *sc; uint64_t cur, best; uint32_t val, n, m0, m1, best_n, best_m0, best_m1; - int retry; sc = clknode_get_softc(clk); @@ -186,12 +190,8 @@ aw_clk_nmm_set_freq(struct clknode *clk, uint64_t fparent, uint64_t *fout, DEVICE_UNLOCK(clk); if ((sc->flags & AW_CLK_HAS_LOCK) != 0) { - for (retry = 0; retry < sc->lock_retries; retry++) { - READ4(clk, sc->offset, &val); - if ((val & (1 << sc->lock_shift)) != 0) - break; - DELAY(1000); - } + aw_clk_wait_for_lock(clk, sc->offset, sc->lock_shift, + sc->lock_retries); } *fout = best; diff --git a/sys/dev/clk/allwinner/aw_clk_np.c b/sys/dev/clk/allwinner/aw_clk_np.c index 3b520cdc5272..78483a791c95 100644 --- a/sys/dev/clk/allwinner/aw_clk_np.c +++ b/sys/dev/clk/allwinner/aw_clk_np.c @@ -93,6 +93,11 @@ aw_clk_np_set_gate(struct clknode *clk, bool enable) WRITE4(clk, sc->offset, val); DEVICE_UNLOCK(clk); + if (enable && (sc->flags & AW_CLK_HAS_LOCK) != 0) { + aw_clk_wait_for_lock(clk, sc->offset, sc->lock_shift, + sc->lock_retries); + } + return (0); } @@ -135,7 +140,6 @@ aw_clk_np_set_freq(struct clknode *clk, uint64_t fparent, uint64_t *fout, struct aw_clk_np_sc *sc; uint64_t cur, best; uint32_t val, n, p, best_n, best_p; - int retry; sc = clknode_get_softc(clk); @@ -175,12 +179,8 @@ aw_clk_np_set_freq(struct clknode *clk, uint64_t fparent, uint64_t *fout, DEVICE_UNLOCK(clk); if ((sc->flags & AW_CLK_HAS_LOCK) != 0) { - for (retry = 0; retry < sc->lock_retries; retry++) { - READ4(clk, sc->offset, &val); - if ((val & (1 << sc->lock_shift)) != 0) - break; - DELAY(1000); - } + aw_clk_wait_for_lock(clk, sc->offset, sc->lock_shift, + sc->lock_retries); } *fout = best; |
