| From cf9c783fd8fe8eddb181e4a3eaa30296951d3ac7 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 10 Mar 2021 14:17:58 -0800 |
| Subject: net: dsa: bcm_sf2: Qualify phydev->dev_flags based on port |
| |
| From: Florian Fainelli <f.fainelli@gmail.com> |
| |
| [ Upstream commit 47142ed6c34d544ae9f0463e58d482289cbe0d46 ] |
| |
| 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> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/dsa/bcm_sf2.c | 6 ++++-- |
| 1 file changed, 4 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c |
| index ca425c15953b..0ee1c0a7b165 100644 |
| --- a/drivers/net/dsa/bcm_sf2.c |
| +++ b/drivers/net/dsa/bcm_sf2.c |
| @@ -479,8 +479,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, |
| -- |
| 2.30.1 |
| |
