Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6a57a90 authored by Baruch Siach's avatar Baruch Siach Committed by Greg Kroah-Hartman
Browse files

net: mvpp2: fix phylink handling of invalid PHY modes 



[ Upstream commit 0fb628f0f250c74b1023edd0ca4a57c8b35b9b2c ]

The .validate phylink callback should empty the supported bitmap when
the interface mode is invalid.

Cc: Maxime Chevallier <maxime.chevallier@bootlin.com>
Cc: Antoine Tenart <antoine.tenart@bootlin.com>
Reported-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarBaruch Siach <baruch@tkos.co.il>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent f124acc9

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

+32 −1
Original line number Diff line number Diff line
@@ -4262,8 +4262,27 @@ static void mvpp2_phylink_validate(struct net_device *dev, 
				   unsigned long *supported,

				   struct phylink_link_state *state)

{

	struct mvpp2_port *port = netdev_priv(dev);

	__ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };



	/* Invalid combinations */

	switch (state->interface) {

	case PHY_INTERFACE_MODE_10GKR:

	case PHY_INTERFACE_MODE_XAUI:

		if (port->gop_id != 0)

			goto empty_set;

		break;

	case PHY_INTERFACE_MODE_RGMII:

	case PHY_INTERFACE_MODE_RGMII_ID:

	case PHY_INTERFACE_MODE_RGMII_RXID:

	case PHY_INTERFACE_MODE_RGMII_TXID:

		if (port->gop_id == 0)

			goto empty_set;

		break;

	default:

		break;

	}



	phylink_set(mask, Autoneg);

	phylink_set_port_modes(mask);

	phylink_set(mask, Pause);
@@ -4271,6 +4290,7 @@ static void mvpp2_phylink_validate(struct net_device *dev, 


	switch (state->interface) {

	case PHY_INTERFACE_MODE_10GKR:

	case PHY_INTERFACE_MODE_XAUI:

	case PHY_INTERFACE_MODE_NA:

		phylink_set(mask, 10000baseCR_Full);

		phylink_set(mask, 10000baseSR_Full);
@@ -4279,7 +4299,11 @@ static void mvpp2_phylink_validate(struct net_device *dev, 
		phylink_set(mask, 10000baseER_Full);

		phylink_set(mask, 10000baseKR_Full);

		/* Fall-through */

	default:

	case PHY_INTERFACE_MODE_RGMII:

	case PHY_INTERFACE_MODE_RGMII_ID:

	case PHY_INTERFACE_MODE_RGMII_RXID:

	case PHY_INTERFACE_MODE_RGMII_TXID:

	case PHY_INTERFACE_MODE_SGMII:

		phylink_set(mask, 10baseT_Half);

		phylink_set(mask, 10baseT_Full);

		phylink_set(mask, 100baseT_Half);
@@ -4291,11 +4315,18 @@ static void mvpp2_phylink_validate(struct net_device *dev, 
		phylink_set(mask, 1000baseT_Full);

		phylink_set(mask, 1000baseX_Full);

		phylink_set(mask, 2500baseX_Full);

		break;

	default:

		goto empty_set;

	}



	bitmap_and(supported, supported, mask, __ETHTOOL_LINK_MODE_MASK_NBITS);

	bitmap_and(state->advertising, state->advertising, mask,

		   __ETHTOOL_LINK_MODE_MASK_NBITS);

	return;



empty_set:

	bitmap_zero(supported, __ETHTOOL_LINK_MODE_MASK_NBITS);

}



static void mvpp22_xlg_link_state(struct mvpp2_port *port,