net: mvpp2: some AN fields require the link to be down when updated

The GMAC configuration helper modifies values in the auto-negotiation
register. Some of its values require the port to be forced down when
modifying their values. This patches fixes the check made on the bit to
be updated in this register, so that the port is forced down when
needed. This fix cases where some of those parameters were updated, but
not taken into account, such as when using RGMII interfaces.

Fixes: d14e078f23cc ("net: marvell: mvpp2: only reprogram what is necessary on mac_config")
Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
index 2a6faddeb95f04a21bd0bbccd57ec68dc23b0b32..908dfe86db92fae7b57eab665b3df721bb5bfae1 100644 (file)
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
@@ -4626,9 +4626,19 @@ static void mvpp2_gmac_config(struct mvpp2_port *port, unsigned int mode,
                }
        }
 
+/* Some fields of the auto-negotiation register require the port to be down when
+ * their value is updated.
+ */
+#define MVPP2_GMAC_AN_PORT_DOWN_MASK   \
+               (MVPP2_GMAC_IN_BAND_AUTONEG | \
+                MVPP2_GMAC_IN_BAND_AUTONEG_BYPASS | \
+                MVPP2_GMAC_CONFIG_MII_SPEED | MVPP2_GMAC_CONFIG_GMII_SPEED | \
+                MVPP2_GMAC_AN_SPEED_EN | MVPP2_GMAC_CONFIG_FULL_DUPLEX | \
+                MVPP2_GMAC_AN_DUPLEX_EN)
+
        if ((old_ctrl0 ^ ctrl0) & MVPP2_GMAC_PORT_TYPE_MASK ||
            (old_ctrl2 ^ ctrl2) & MVPP2_GMAC_INBAND_AN_MASK ||
-           (old_an ^ an) & MVPP2_GMAC_IN_BAND_AUTONEG) {
+           (old_an ^ an) & MVPP2_GMAC_AN_PORT_DOWN_MASK) {
                /* Force link down */
                old_an &= ~MVPP2_GMAC_FORCE_LINK_PASS;
                old_an |= MVPP2_GMAC_FORCE_LINK_DOWN;