svn commit: r337346 - head/sys/dev/extres/clk

[Emmanuel Vadot]

Author: manu
Date: Sun Aug  5 06:15:35 2018
New Revision: 337346
URL: https://svnweb.freebsd.org/changeset/base/337346

Log:
  extres: clkdiv: Fix div_with_table
  
  We didn't allowed a divider register value of 0 which can exists and
  also didn't wrote the value but the divider, which result of a wrong
  frequency to be selected

Modified:
  head/sys/dev/extres/clk/clk_div.c

Modified: head/sys/dev/extres/clk/clk_div.c
==============================================================================
--- head/sys/dev/extres/clk/clk_div.c   Sun Aug  5 06:10:13 2018        
(r337345)
+++ head/sys/dev/extres/clk/clk_div.c   Sun Aug  5 06:15:35 2018        
(r337346)
@@ -97,19 +97,21 @@ clknode_div_table_get_divider(struct clknode_div_sc *s
        return (0);
 }
 
-static uint32_t
-clknode_div_table_get_value(struct clknode_div_sc *sc, uint32_t divider)
+static int
+clknode_div_table_get_value(struct clknode_div_sc *sc, uint32_t *divider)
 {
        struct clk_div_table *table;
 
        if (!(sc->div_flags & CLK_DIV_WITH_TABLE))
-               return (divider);
+               return (0);
 
        for (table = sc->div_table; table->divider != 0; table++)
-               if (table->divider == sc->divider)
-                       return (table->value);
+               if (table->divider == *divider) {
+                       *divider = table->value;
+                       return (0);
+               }
 
-       return (0);
+       return (ENOENT);
 }
 
 static int
@@ -164,7 +166,7 @@ clknode_div_set_freq(struct clknode *clk, uint64_t fin
 {
        struct clknode_div_sc *sc;
        uint64_t divider, _fin, _fout;
-       uint32_t reg, i_div, f_div, hw_i_div;
+       uint32_t div_value, reg, i_div, f_div, hw_i_div;
        int rv;
 
        sc = clknode_get_softc(clk);
@@ -215,9 +217,11 @@ clknode_div_set_freq(struct clknode *clk, uint64_t fin
                    (*fout != (_fin / divider)))
                        return (ERANGE);
 
-               divider = clknode_div_table_get_value(sc, divider);
-               if (divider == 0)
+               div_value = divider;
+               if (clknode_div_table_get_value(sc, &div_value) != 0)
                        return (ERANGE);
+               if (div_value != divider)
+                       i_div = div_value;
 
                DEVICE_LOCK(clk);
                rv = MD4(clk, sc->offset,
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"