[PATCH net-next 04/13] net: mvpp2: reconfiguring the port interface is PPv2.2 specific

[Antoine Tenart]

This patch adds a check not to disable/enable a port when an interface
is updated when using PPv2.1 as the functions called are PPv2.2
specific.

Signed-off-by: Antoine Tenart <antoine.ten...@bootlin.com>
---
 drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c 
b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
index d5a103dd1610..c8bab294f4c7 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
@@ -4670,19 +4670,17 @@ static void mvpp2_mac_config(struct net_device *dev, 
unsigned int mode,
                return;
        }
 
-       if (change_interface) {
+       if (port->priv->hw_version == MVPP22 && change_interface) {
                /* Make sure the port is disabled when reconfiguring the mode */
                mvpp2_port_disable(port);
 
                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);
 
                mvpp2_port_enable(port);
        }
@@ -4698,7 +4696,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);
 }
 
-- 
2.20.1