aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/dsa/bcm_sf2.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/dsa/bcm_sf2.c')
-rw-r--r--drivers/net/dsa/bcm_sf2.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c
index 3811fdbda13e..28c963a21dac 100644
--- a/drivers/net/dsa/bcm_sf2.c
+++ b/drivers/net/dsa/bcm_sf2.c
@@ -478,6 +478,7 @@ static void bcm_sf2_sw_validate(struct dsa_switch *ds, int port,
478 unsigned long *supported, 478 unsigned long *supported,
479 struct phylink_link_state *state) 479 struct phylink_link_state *state)
480{ 480{
481 struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);
481 __ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, }; 482 __ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };
482 483
483 if (!phy_interface_mode_is_rgmii(state->interface) && 484 if (!phy_interface_mode_is_rgmii(state->interface) &&
@@ -487,8 +488,10 @@ static void bcm_sf2_sw_validate(struct dsa_switch *ds, int port,
487 state->interface != PHY_INTERFACE_MODE_INTERNAL && 488 state->interface != PHY_INTERFACE_MODE_INTERNAL &&
488 state->interface != PHY_INTERFACE_MODE_MOCA) { 489 state->interface != PHY_INTERFACE_MODE_MOCA) {
489 bitmap_zero(supported, __ETHTOOL_LINK_MODE_MASK_NBITS); 490 bitmap_zero(supported, __ETHTOOL_LINK_MODE_MASK_NBITS);
490 dev_err(ds->dev, 491 if (port != core_readl(priv, CORE_IMP0_PRT_ID))
491 "Unsupported interface: %d\n", state->interface); 492 dev_err(ds->dev,
493 "Unsupported interface: %d for port %d\n",
494 state->interface, port);
492 return; 495 return;
493 } 496 }
494 497
@@ -526,6 +529,9 @@ static void bcm_sf2_sw_mac_config(struct dsa_switch *ds, int port,
526 u32 id_mode_dis = 0, port_mode; 529 u32 id_mode_dis = 0, port_mode;
527 u32 reg, offset; 530 u32 reg, offset;
528 531
532 if (port == core_readl(priv, CORE_IMP0_PRT_ID))
533 return;
534
529 if (priv->type == BCM7445_DEVICE_ID) 535 if (priv->type == BCM7445_DEVICE_ID)
530 offset = CORE_STS_OVERRIDE_GMIIP_PORT(port); 536 offset = CORE_STS_OVERRIDE_GMIIP_PORT(port);
531 else 537 else