net: stmmac: mdio: convert MDC clock divisor selection to tables

Convert the MDC clock divisor selection to tabular format.

Note that there is a change for 300MHz, but this is not a problem,
as the MDC clock remains within the useable ranges, which are:

	STMMAC_CSR_500_800M	/324 1.54 - 2.47MHz
	STMMAC_CSR_300_500M	/204 1.47 - 2.45MHz
	STMMAC_CSR_250_300M	/124 2.02 - 2.42MHz
	STMMAC_CSR_150_250M	/102 1.47 - 2.45MHz
	STMMAC_CSR_100_150M	/62  1.61 - 2.42MHz
	STMMAC_CSR_60_100M	/42  1.43 - 2.38MHz
	STMMAC_CSR_35_60M	/26  1.35 - 2.31MHz
	STMMAC_CSR_20_35M	/16  1.25 - 2.19MHz

Thus, with the change of divisor for exactly 300MHz, MDC temporarily
changes from 2.42MHz to 1.47MHz for the sake of consistency.

The databook does not specify whether the frequency limits for the
CSR divider are inclusive or exclusive.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Tested-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
Link: https://patch.msgid.link/E1vy69y-0000000Btwd-3oq7@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
index 485a0d790baacde4c294148e8990c5fc5165b8ce..c4123d2260bdede02bf3b321b8b5acb509f1bc3c 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
@@ -473,6 +473,52 @@ void stmmac_pcs_clean(struct net_device *ndev)
        priv->hw->xpcs = NULL;
 }
 
+struct stmmac_clk_rate {
+       unsigned long rate;
+       u8 cr;
+};
+
+/* The standard clk_csr_i to GMII_Address CR field mapping. The rate provided
+ * in this table is the exclusive maximum frequency for the divisor. The
+ * comments for each entry give the divisor and the resulting range of MDC
+ * clock frequencies.
+ */
+static const struct stmmac_clk_rate stmmac_std_csr_to_mdc[] = {
+       { CSR_F_35M, STMMAC_CSR_20_35M },
+       { CSR_F_60M, STMMAC_CSR_35_60M },
+       { CSR_F_100M, STMMAC_CSR_60_100M },
+       { CSR_F_150M, STMMAC_CSR_100_150M },
+       { CSR_F_250M, STMMAC_CSR_150_250M },
+       { CSR_F_300M, STMMAC_CSR_250_300M },
+       { CSR_F_500M, STMMAC_CSR_300_500M },
+       { CSR_F_800M, STMMAC_CSR_500_800M },
+       { },
+};
+
+/* The sun8i clk_csr_i to GMII_Address CR field mapping uses rate as the
+ * exclusive minimum frequency for the divisor. Note that the last entry
+ * is valid and also acts as the sentinel.
+ */
+static const struct stmmac_clk_rate stmmac_sun8i_csr_to_mdc[] = {
+       { 160000000, 3 },
+       { 80000000, 2 },
+       { 40000000, 1 },
+       { 0, 0 },
+};
+
+/* The xgmac clk_csr_i to GMII_Address CR field mapping similarly uses rate
+ * as the exclusive minimum frequency for the divisor, and again the last
+ * entry is valid and also the sentinel.
+ */
+static const struct stmmac_clk_rate stmmac_xgmac_csr_to_mdc[] = {
+       { 400000000, 5 },
+       { 350000000, 4 },
+       { 300000000, 3 },
+       { 250000000, 2 },
+       { 150000000, 1 },
+       { 0, 0 },
+};
+
 /**
  * stmmac_clk_csr_set - dynamically set the MDC clock
  * @priv: driver private structure
@@ -490,6 +536,7 @@ static u32 stmmac_clk_csr_set(struct stmmac_priv *priv)
 {
        unsigned long clk_rate;
        u32 value = ~0;
+       int i;
 
        clk_rate = clk_get_rate(priv->plat->stmmac_clk);
 
@@ -500,47 +547,26 @@ static u32 stmmac_clk_csr_set(struct stmmac_priv *priv)
         * the frequency of clk_csr_i. So we do not change the default
         * divider.
         */
-       if (clk_rate < CSR_F_35M)
-               value = STMMAC_CSR_20_35M;
-       else if (clk_rate < CSR_F_60M)
-               value = STMMAC_CSR_35_60M;
-       else if (clk_rate < CSR_F_100M)
-               value = STMMAC_CSR_60_100M;
-       else if (clk_rate < CSR_F_150M)
-               value = STMMAC_CSR_100_150M;
-       else if (clk_rate < CSR_F_250M)
-               value = STMMAC_CSR_150_250M;
-       else if (clk_rate <= CSR_F_300M)
-               value = STMMAC_CSR_250_300M;
-       else if (clk_rate < CSR_F_500M)
-               value = STMMAC_CSR_300_500M;
-       else if (clk_rate < CSR_F_800M)
-               value = STMMAC_CSR_500_800M;
+       for (i = 0; stmmac_std_csr_to_mdc[i].rate; i++)
+               if (clk_rate < stmmac_std_csr_to_mdc[i].rate) {
+                       value = stmmac_std_csr_to_mdc[i].cr;
+                       break;
+               }
 
        if (priv->plat->flags & STMMAC_FLAG_HAS_SUN8I) {
-               if (clk_rate > 160000000)
-                       value = 0x03;
-               else if (clk_rate > 80000000)
-                       value = 0x02;
-               else if (clk_rate > 40000000)
-                       value = 0x01;
-               else
-                       value = 0;
+               /* Note the different test - this is intentional. */
+               for (i = 0; stmmac_sun8i_csr_to_mdc[i].rate; i++)
+                       if (clk_rate > stmmac_sun8i_csr_to_mdc[i].rate)
+                               break;
+               value = stmmac_sun8i_csr_to_mdc[i].cr;
        }
 
        if (priv->plat->core_type == DWMAC_CORE_XGMAC) {
-               if (clk_rate > 400000000)
-                       value = 0x5;
-               else if (clk_rate > 350000000)
-                       value = 0x4;
-               else if (clk_rate > 300000000)
-                       value = 0x3;
-               else if (clk_rate > 250000000)
-                       value = 0x2;
-               else if (clk_rate > 150000000)
-                       value = 0x1;
-               else
-                       value = 0x0;
+               /* Note the different test - this is intentional. */
+               for (i = 0; stmmac_xgmac_csr_to_mdc[i].rate; i++)
+                       if (clk_rate > stmmac_xgmac_csr_to_mdc[i].rate)
+                               break;
+               value = stmmac_xgmac_csr_to_mdc[i].cr;
        }
 
        return value;