d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clock framework fixes:

Browse Source 
- The clk_test_freq() (aka CLK_SET_DRYRUN) doesn't change frequency,
   don't cache it result.
 - Fix busy condition for clk_set_freq().

MFC after: 3 weeks
This commit is contained in:
mmel 2016-12-04 16:02:59 +00:00
parent 0e2c4a5d91
commit 36694ec494
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/dev/extres/clk/clk.c
View File

@ -830,9 +830,10 @@ clknode_set_freq(struct clknode *clknode, uint64_t freq, int flags,
* OR * OR
* clock is glitch free and is enabled by calling consumer only * clock is glitch free and is enabled by calling consumer only
*/ */
if ((clknode->enable_cnt > 1) && if ((flags & CLK_SET_DRYRUN) == 0 &&
((clknode->enable_cnt > enablecnt) || clknode->enable_cnt > 1 &&
!(clknode->flags & CLK_NODE_GLITCH_FREE))) { clknode->enable_cnt > enablecnt &&
(clknode->flags & CLK_NODE_GLITCH_FREE) == 0) {
return (EBUSY); return (EBUSY);
} }
@ -856,9 +857,10 @@ clknode_set_freq(struct clknode *clknode, uint64_t freq, int flags,
if (done) { if (done) {
/* Success - invalidate frequency cache for all children. */ /* Success - invalidate frequency cache for all children. */
if ((flags & CLK_SET_DRYRUN) == 0) {
clknode->freq = freq; clknode->freq = freq;
if ((flags & CLK_SET_DRYRUN) == 0)
clknode_refresh_cache(clknode, parent_freq); clknode_refresh_cache(clknode, parent_freq);
}
} else if (clknode->parent != NULL) { } else if (clknode->parent != NULL) {
/* Nothing changed, pass request to parent. */ /* Nothing changed, pass request to parent. */
rv = clknode_set_freq(clknode->parent, freq, flags, enablecnt); rv = clknode_set_freq(clknode->parent, freq, flags, enablecnt);