diff options
| author |   Florian Fainelli <f.fainelli@gmail.com> | 2021-03-10 14:17:58 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2021-03-10 16:05:20 -0800 |
| commit | 47142ed6c34d544ae9f0463e58d482289cbe0d46 (patch) | |
| tree | dc43de7c76327e75533096bb90535160960dd204 /drivers/net/dsa/bcm_sf2.c | |
| parent | net: dsa: b53: VLAN filtering is global to all users (diff) | |
| download | linux-dev-47142ed6c34d544ae9f0463e58d482289cbe0d46.tar.xz linux-dev-47142ed6c34d544ae9f0463e58d482289cbe0d46.zip | |
net: dsa: bcm_sf2: Qualify phydev->dev_flags based on port
Similar to commit 92696286f3bb37ba50e4bd8d1beb24afb759a799 ("net:
bcmgenet: Set phydev->dev_flags only for internal PHYs") we need to
qualify the phydev->dev_flags based on whether the port is connected to
an internal or external PHY otherwise we risk having a flags collision
with a completely different interpretation depending on the driver.
Fixes: aa9aef77c761 ("net: dsa: bcm_sf2: communicate integrated PHY revision to PHY driver")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dsa/bcm_sf2.c')
| -rw-r--r-- | drivers/net/dsa/bcm_sf2.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c index 4dedd6e0b11b..ba5d546d06aa 100644 --- a/drivers/net/dsa/bcm_sf2.c +++ b/drivers/net/dsa/bcm_sf2.c @@ -588,8 +588,10 @@ static u32 bcm_sf2_sw_get_phy_flags(struct dsa_switch *ds, int port) * in bits 15:8 and the patch level in bits 7:0 which is exactly what * the REG_PHY_REVISION register layout is. */ - - return priv->hw_params.gphy_rev; + if (priv->int_phy_mask & BIT(port)) + return priv->hw_params.gphy_rev; + else + return 0; } static void bcm_sf2_sw_validate(struct dsa_switch *ds, int port, |