Skip to contentSkip to conversation

net: dsa: bcm_sf2: Do not configure PHYLINK on CPU port

PATCH Applied Florian Fainelli 2 participants 2 messages Aug 22, 2019

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: dsa: bcm_sf2: Do not configure PHYLINK on CPU port

The SF2 binding does not specify that the CPU port should have properties mandatory for successfully instantiating a PHYLINK object. As such, there will be missing properties (including fixed-link) and when attempting to validate and later configure link modes, we will have an incorrect set of parameters (interface, speed, duplex).

Simply prevent the CPU port from being configured through PHYLINK since bcm_sf2_imp_setup() takes care of that already.

Fixes 0e27921816ad ("net: dsa: Use PHYLINK for the CPU/DSA ports")
---
 drivers/net/dsa/bcm_sf2.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/net/dsa/bcm_sf2.c +8 -2
index 3811fdbda13e..28c963a21dac 100644
@@ -478,6 +478,7 @@ static void bcm_sf2_sw_validate(struct dsa_switch *ds, int port,
 				unsigned long *supported,
 				struct phylink_link_state *state)
 {
+	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);
 	__ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };
 
 	if (!phy_interface_mode_is_rgmii(state->interface) &&
@@ -487,8 +488,10 @@ static void bcm_sf2_sw_validate(struct dsa_switch *ds, int port,
 	    state->interface != PHY_INTERFACE_MODE_INTERNAL &&
 	    state->interface != PHY_INTERFACE_MODE_MOCA) {
 		bitmap_zero(supported, __ETHTOOL_LINK_MODE_MASK_NBITS);
-		dev_err(ds->dev,
-			"Unsupported interface: %d\n", state->interface);
+		if (port != core_readl(priv, CORE_IMP0_PRT_ID))
+			dev_err(ds->dev,
+				"Unsupported interface: %d for port %d\n",
+				state->interface, port);
 		return;
 	}
 
@@ -526,6 +529,9 @@ static void bcm_sf2_sw_mac_config(struct dsa_switch *ds, int port,
 	u32 id_mode_dis = 0, port_mode;
 	u32 reg, offset;
 
+	if (port == core_readl(priv, CORE_IMP0_PRT_ID))
+		return;
+
 	if (priv->type == BCM7445_DEVICE_ID)
 		offset = CORE_STS_OVERRIDE_GMIIP_PORT(port);
 	else
Signature · 1 line
2.17.1
maintainer Applied
#1 lore raw

From: Florian Fainelli <[email protected]>
Date: Wed, 21 Aug 2019 17:07:46 -0700

Quoted 11 lines

The SF2 binding does not specify that the CPU port should have properties mandatory for successfully instantiating a PHYLINK object. As such, there will be missing properties (including fixed-link) and when attempting to validate and later configure link modes, we will have an incorrect set of parameters (interface, speed, duplex).

Simply prevent the CPU port from being configured through PHYLINK since bcm_sf2_imp_setup() takes care of that already.

Fixes 0e27921816ad ("net: dsa: Use PHYLINK for the CPU/DSA ports")

Applied, thanks Florian.