net: phy: dp83869: fix default value for tx-/rx-internal-delay
authorJosua Mayer <josua@solid-run.com>
Thu, 23 Mar 2023 10:25:36 +0000 (12:25 +0200)
committerJakub Kicinski <kuba@kernel.org>
Fri, 24 Mar 2023 21:52:35 +0000 (14:52 -0700)
dp83869 internally uses a look-up table for mapping supported delays in
nanoseconds to register values.
When specific delays are defined in device-tree, phy_get_internal_delay
does the lookup automatically returning an index.

The default case wrongly assigns the nanoseconds value from the lookup
table, resulting in numeric value 2000 applied to delay configuration
register, rather than the expected index values 0-7 (7 for 2000).
Ultimately this issue broke RX for 1Gbps links.

Fix default delay configuration by assigning the intended index value
directly.

Cc: stable@vger.kernel.org
Fixes: 736b25afe284 ("net: dp83869: Add RGMII internal delay configuration")
Co-developed-by: Yazan Shhady <yazan.shhady@solid-run.com>
Signed-off-by: Yazan Shhady <yazan.shhady@solid-run.com>
Signed-off-by: Josua Mayer <josua@solid-run.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Link: https://lore.kernel.org/r/20230323102536.31988-1-josua@solid-run.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/phy/dp83869.c

index b4ff9c5073a3c485e6bba87284eb386152bdf09b..9ab5eff502b71640b1022baf1d6b7567a65c240f 100644 (file)
@@ -588,15 +588,13 @@ static int dp83869_of_init(struct phy_device *phydev)
                                                       &dp83869_internal_delay[0],
                                                       delay_size, true);
        if (dp83869->rx_int_delay < 0)
-               dp83869->rx_int_delay =
-                               dp83869_internal_delay[DP83869_CLK_DELAY_DEF];
+               dp83869->rx_int_delay = DP83869_CLK_DELAY_DEF;
 
        dp83869->tx_int_delay = phy_get_internal_delay(phydev, dev,
                                                       &dp83869_internal_delay[0],
                                                       delay_size, false);
        if (dp83869->tx_int_delay < 0)
-               dp83869->tx_int_delay =
-                               dp83869_internal_delay[DP83869_CLK_DELAY_DEF];
+               dp83869->tx_int_delay = DP83869_CLK_DELAY_DEF;
 
        return ret;
 }