git: 4aa5c63dec82 - main - aw_clk: Do not wait for the lock of a disabled PLL
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 12 Nov 2026 09:51:27 UTC
The branch main has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=4aa5c63dec82ea8ee0c4cb693d8b11d15bbeb06d
commit 4aa5c63dec82ea8ee0c4cb693d8b11d15bbeb06d
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2026-11-10 15:34:17 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2026-11-12 09:47:29 +0000
aw_clk: Do not wait for the lock of a disabled PLL
A PLL that is disabled cannot lock. After a rate change the nm, nmm, np
and nkmp clocks waited a full second for the lock bit and then, with the
previous change, told that the PLL did not lock.
Wait only if the clock has no gate or if its gate is on. The lock of a
PLL that is enabled later is waited for when it is enabled.
Tested on: H6
---
sys/dev/clk/allwinner/aw_clk.h | 15 +++++++++++++++
sys/dev/clk/allwinner/aw_clk_nkmp.c | 4 ++--
sys/dev/clk/allwinner/aw_clk_nm.c | 2 +-
sys/dev/clk/allwinner/aw_clk_nmm.c | 2 +-
sys/dev/clk/allwinner/aw_clk_np.c | 2 +-
5 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/sys/dev/clk/allwinner/aw_clk.h b/sys/dev/clk/allwinner/aw_clk.h
index f89b503060bd..45598615a58a 100644
--- a/sys/dev/clk/allwinner/aw_clk.h
+++ b/sys/dev/clk/allwinner/aw_clk.h
@@ -122,6 +122,21 @@ aw_clk_wait_for_lock(struct clknode *clk, uint32_t offset, uint32_t lock_shift,
clknode_get_name(clk));
}
+/*
+ * A PLL that is disabled cannot lock, so there is nothing to wait for after
+ * its rate has been changed, the lock is waited for when it is enabled.
+ */
+static inline bool
+aw_clk_has_lock_to_wait(uint32_t flags, uint32_t gate_shift, uint32_t val)
+{
+ if ((flags & AW_CLK_HAS_LOCK) == 0)
+ return (false);
+ if ((flags & AW_CLK_HAS_GATE) == 0)
+ return (true);
+
+ return ((val & (1 << gate_shift)) != 0);
+}
+
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_nkmp.c b/sys/dev/clk/allwinner/aw_clk_nkmp.c
index f653ed8abaca..05f0d28b1aed 100644
--- a/sys/dev/clk/allwinner/aw_clk_nkmp.c
+++ b/sys/dev/clk/allwinner/aw_clk_nkmp.c
@@ -238,7 +238,7 @@ aw_clk_nkmp_set_freq_scale(struct clknode *clk, struct aw_clk_nkmp_sc *sc,
DELAY(2000);
}
- if ((sc->flags & AW_CLK_HAS_LOCK) != 0) {
+ if (aw_clk_has_lock_to_wait(sc->flags, sc->gate_shift, val)) {
aw_clk_wait_for_lock(clk, sc->offset, sc->lock_shift,
sc->lock_retries);
}
@@ -302,7 +302,7 @@ aw_clk_nkmp_set_freq(struct clknode *clk, uint64_t fparent, uint64_t *fout,
DEVICE_UNLOCK(clk);
}
- if ((sc->flags & AW_CLK_HAS_LOCK) != 0) {
+ if (aw_clk_has_lock_to_wait(sc->flags, sc->gate_shift, val)) {
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 cbbc932f92a5..281766b85f47 100644
--- a/sys/dev/clk/allwinner/aw_clk_nm.c
+++ b/sys/dev/clk/allwinner/aw_clk_nm.c
@@ -251,7 +251,7 @@ aw_clk_nm_set_freq(struct clknode *clk, uint64_t fparent, uint64_t *fout,
WRITE4(clk, sc->offset, val);
DEVICE_UNLOCK(clk);
- if ((sc->flags & AW_CLK_HAS_LOCK) != 0) {
+ if (aw_clk_has_lock_to_wait(sc->flags, sc->gate_shift, val)) {
aw_clk_wait_for_lock(clk, sc->offset, sc->lock_shift,
sc->lock_retries);
}
diff --git a/sys/dev/clk/allwinner/aw_clk_nmm.c b/sys/dev/clk/allwinner/aw_clk_nmm.c
index 123c2b849805..702cf474b9b7 100644
--- a/sys/dev/clk/allwinner/aw_clk_nmm.c
+++ b/sys/dev/clk/allwinner/aw_clk_nmm.c
@@ -189,7 +189,7 @@ aw_clk_nmm_set_freq(struct clknode *clk, uint64_t fparent, uint64_t *fout,
WRITE4(clk, sc->offset, val);
DEVICE_UNLOCK(clk);
- if ((sc->flags & AW_CLK_HAS_LOCK) != 0) {
+ if (aw_clk_has_lock_to_wait(sc->flags, sc->gate_shift, val)) {
aw_clk_wait_for_lock(clk, sc->offset, sc->lock_shift,
sc->lock_retries);
}
diff --git a/sys/dev/clk/allwinner/aw_clk_np.c b/sys/dev/clk/allwinner/aw_clk_np.c
index 78483a791c95..fce371e0e600 100644
--- a/sys/dev/clk/allwinner/aw_clk_np.c
+++ b/sys/dev/clk/allwinner/aw_clk_np.c
@@ -178,7 +178,7 @@ aw_clk_np_set_freq(struct clknode *clk, uint64_t fparent, uint64_t *fout,
WRITE4(clk, sc->offset, val);
DEVICE_UNLOCK(clk);
- if ((sc->flags & AW_CLK_HAS_LOCK) != 0) {
+ if (aw_clk_has_lock_to_wait(sc->flags, sc->gate_shift, val)) {
aw_clk_wait_for_lock(clk, sc->offset, sc->lock_shift,
sc->lock_retries);
}