git: 5559613c8e2f - main - aw_clk: Use clk_freq_diff() to find the best factors
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 12 Nov 2026 09:51:23 UTC
The branch main has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=5559613c8e2fb82dfca1aa835dc7dfa242e3e4e1
commit 5559613c8e2fb82dfca1aa835dc7dfa242e3e4e1
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2026-11-10 14:32:19 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2026-11-12 09:47:28 +0000
aw_clk: Use clk_freq_diff() to find the best factors
The find_best functions of the nmm, np, m and frac clocks compared the
candidates with abs() of the difference to the requested frequency. The
frequencies are 64 bits and abs() takes an int, so the difference was
truncated: for a PLL of 2.4GHz or more it can become negative or small
and the wrong factors were chosen.
Use clk_freq_diff() as the nm clock already does.
Tested on: H6
---
sys/dev/clk/allwinner/aw_clk_frac.c | 5 +++--
sys/dev/clk/allwinner/aw_clk_m.c | 3 ++-
sys/dev/clk/allwinner/aw_clk_nmm.c | 3 ++-
sys/dev/clk/allwinner/aw_clk_np.c | 3 ++-
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/sys/dev/clk/allwinner/aw_clk_frac.c b/sys/dev/clk/allwinner/aw_clk_frac.c
index 57249dafbcc2..2258ec988430 100644
--- a/sys/dev/clk/allwinner/aw_clk_frac.c
+++ b/sys/dev/clk/allwinner/aw_clk_frac.c
@@ -170,7 +170,7 @@ aw_clk_frac_find_best(struct aw_clk_frac_sc *sc, uint64_t fparent, uint64_t fout
*factor_m = m;
return (cur);
}
- if (abs((fout - cur)) < abs((fout - best))) {
+ if (clk_freq_diff(fout, cur) < clk_freq_diff(fout, best)) {
best = cur;
*factor_n = n;
*factor_m = m;
@@ -226,7 +226,8 @@ aw_clk_frac_set_freq(struct clknode *clk, uint64_t fparent, uint64_t *fout,
dprintf("This is the one: n=%d m=%d mult=%d\n", best_n, best_m, best_mult);
break;
}
- if (abs(((*fout * multiple) - cur)) < abs(((*fout * multiple) - best))) {
+ if (clk_freq_diff(*fout * multiple, cur) <
+ clk_freq_diff(*fout * multiple, best)) {
best = cur;
best_mult = multiple;
best_n = n;
diff --git a/sys/dev/clk/allwinner/aw_clk_m.c b/sys/dev/clk/allwinner/aw_clk_m.c
index 5d7dd971cc7a..8a4fdb9825fc 100644
--- a/sys/dev/clk/allwinner/aw_clk_m.c
+++ b/sys/dev/clk/allwinner/aw_clk_m.c
@@ -144,7 +144,8 @@ aw_clk_m_find_best(struct aw_clk_m_sc *sc, uint64_t fparent, uint64_t *fout,
for (m = min_m; m <= max_m; ) {
cur = fparent / m;
- if (abs(*fout - cur) < abs(*fout - best)) {
+ if (clk_freq_diff(*fout, cur) <
+ clk_freq_diff(*fout, best)) {
best = cur;
*factor_m = m;
}
diff --git a/sys/dev/clk/allwinner/aw_clk_nmm.c b/sys/dev/clk/allwinner/aw_clk_nmm.c
index e8935d84acbc..cb41a5fd2fc8 100644
--- a/sys/dev/clk/allwinner/aw_clk_nmm.c
+++ b/sys/dev/clk/allwinner/aw_clk_nmm.c
@@ -119,7 +119,8 @@ aw_clk_nmm_find_best(struct aw_clk_nmm_sc *sc, uint64_t fparent, uint64_t *fout,
for (m1 = min_m1; m1 <= max_m1; ) {
for (n = min_n; n <= max_n; ) {
cur = fparent * n / m0 / m1;
- if (abs(*fout - cur) < abs(*fout - best)) {
+ if (clk_freq_diff(*fout, cur) <
+ clk_freq_diff(*fout, best)) {
best = cur;
*factor_n = n;
*factor_m0 = m0;
diff --git a/sys/dev/clk/allwinner/aw_clk_np.c b/sys/dev/clk/allwinner/aw_clk_np.c
index 9c55063552ed..7d9430e74a22 100644
--- a/sys/dev/clk/allwinner/aw_clk_np.c
+++ b/sys/dev/clk/allwinner/aw_clk_np.c
@@ -113,7 +113,8 @@ aw_clk_np_find_best(struct aw_clk_np_sc *sc, uint64_t fparent, uint64_t *fout,
for (p = min_p; p <= max_p; ) {
for (n = min_n; n <= max_n; ) {
cur = fparent * n / p;
- if (abs(*fout - cur) < abs(*fout - best)) {
+ if (clk_freq_diff(*fout, cur) <
+ clk_freq_diff(*fout, best)) {
best = cur;
*factor_n = n;
*factor_p = p;