From 2b541904af5976992f3ad6ffe04bd11665be06da Mon Sep 17 00:00:00 2001 From: Emmanuel Vadot Date: Sat, 20 Jan 2018 14:47:27 +0000 Subject: [PATCH] clk: Get new parent freq after set_freq During set_freq a clknode might have reparent (using a better parent that have a higher frequency for example), before refreshing the cache, re-get the parent frequency. Reviewed by: mmel --- sys/dev/extres/clk/clk.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/dev/extres/clk/clk.c b/sys/dev/extres/clk/clk.c index 55d21698fa3..c6a1f466ceb 100644 --- a/sys/dev/extres/clk/clk.c +++ b/sys/dev/extres/clk/clk.c @@ -916,6 +916,14 @@ clknode_set_freq(struct clknode *clknode, uint64_t freq, int flags, /* Success - invalidate frequency cache for all children. */ if ((flags & CLK_SET_DRYRUN) == 0) { clknode->freq = freq; + /* Clock might have reparent during set_freq */ + if (clknode->parent_cnt > 0) { + rv = clknode_get_freq(clknode->parent, + &parent_freq); + if (rv != 0) { + return (rv); + } + } clknode_refresh_cache(clknode, parent_freq); } } else if (clknode->parent != NULL) {