Commit d78a1809 authored by Antoine Tenart's avatar Antoine Tenart Committed by David S. Miller
Browse files

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: default avatarAntoine Tenart <antoine.tenart@bootlin.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 052f7c8b

drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c

+6 −8
Original line number Diff line number Diff line
@@ -4672,17 +4672,15 @@ 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;



		/* Reconfigure the serdes lanes */

		phy_power_off(port->comphy);

		mvpp22_mode_reconfigure(port);

	}

	}



	/* mac (re)configuration */

	if (mvpp2_is_xlg(state->interface))
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE