net: mvpp2: reconfiguring the port interface is PPv2.2 specific

This patch adds a check on the PPv2 version in-use not to reconfigure
the port mode when an interface is updated when using PPv2.1 as the
functions called are PPv2.2 specific.

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 5a2638b7443af430fd1ce47b7cc8bc8e2f525715..9467a2258ee0d76db45f5225c41d98306cabd934 100644 (file)
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
@@ -4672,16 +4672,14 @@ static void mvpp2_mac_config(struct net_device *dev, unsigned int mode,
 
        /* Make sure the port is disabled when reconfiguring the mode */
        mvpp2_port_disable(port);
-       if (change_interface) {
+       if (port->priv->hw_version == MVPP22 && change_interface) {
                mvpp22_gop_mask_irq(port);
 
-               if (port->priv->hw_version == MVPP22) {
-                       port->phy_interface = state->interface;
+               port->phy_interface = state->interface;
 
-                       /* Reconfigure the serdes lanes */
-                       phy_power_off(port->comphy);
-                       mvpp22_mode_reconfigure(port);
-               }
+               /* Reconfigure the serdes lanes */
+               phy_power_off(port->comphy);
+               mvpp22_mode_reconfigure(port);
        }
 
        /* mac (re)configuration */
@@ -4695,7 +4693,7 @@ static void mvpp2_mac_config(struct net_device *dev, unsigned int mode,
        if (port->priv->hw_version == MVPP21 && port->flags & MVPP2_F_LOOPBACK)
                mvpp2_port_loopback_set(port, state);
 
-       if (change_interface)
+       if (port->priv->hw_version == MVPP22 && change_interface)
                mvpp22_gop_unmask_irq(port);
 
        mvpp2_port_enable(port);