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

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

net: mvpp2: 10G modes aren't supported on all ports 



The mvpp2_phylink_validate() function sets all modes that are
supported by a given PPv2 port. A recent change made all ports to
advertise they support 10G modes in certain cases. This is not true,
as only the port #0 can do so. This patch fixes it.

Fixes: 01b3fd5a ("net: mvpp2: fix detection of 10G SFP modules")
Cc: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: default avatarAntoine Tenart <antoine.tenart@bootlin.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a915b982

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

+8 −6
Original line number Diff line number Diff line
@@ -4405,12 +4405,14 @@ static void mvpp2_phylink_validate(struct net_device *dev, 
	case PHY_INTERFACE_MODE_10GKR:

	case PHY_INTERFACE_MODE_XAUI:

	case PHY_INTERFACE_MODE_NA:

		if (port->gop_id == 0) {

			phylink_set(mask, 10000baseCR_Full);

			phylink_set(mask, 10000baseSR_Full);

			phylink_set(mask, 10000baseLR_Full);

			phylink_set(mask, 10000baseLRM_Full);

			phylink_set(mask, 10000baseER_Full);

			phylink_set(mask, 10000baseKR_Full);

		}

		/* Fall-through */

	case PHY_INTERFACE_MODE_RGMII:

	case PHY_INTERFACE_MODE_RGMII_ID: