| From bd6d7f47dfff2c3d0f51e2b698394b973157efe2 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 24 Feb 2020 15:56:32 -0800 |
| Subject: net: dsa: bcm_sf2: Forcibly configure IMP port for 1Gb/sec |
| |
| From: Florian Fainelli <f.fainelli@gmail.com> |
| |
| [ Upstream commit 98c5f7d44fef309e692c24c6d71131ee0f0871fb ] |
| |
| We are still experiencing some packet loss with the existing advanced |
| congestion buffering (ACB) settings with the IMP port configured for |
| 2Gb/sec, so revert to conservative link speeds that do not produce |
| packet loss until this is resolved. |
| |
| Fixes: 8f1880cbe8d0 ("net: dsa: bcm_sf2: Configure IMP port for 2Gb/sec") |
| Fixes: de34d7084edd ("net: dsa: bcm_sf2: Only 7278 supports 2Gb/sec IMP port") |
| Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> |
| Reviewed-by: Vivien Didelot <vivien.didelot@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 | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c |
| index d1955543acd1d..b0f5280a83cb6 100644 |
| --- a/drivers/net/dsa/bcm_sf2.c |
| +++ b/drivers/net/dsa/bcm_sf2.c |
| @@ -69,8 +69,7 @@ static void bcm_sf2_imp_setup(struct dsa_switch *ds, int port) |
| /* Force link status for IMP port */ |
| reg = core_readl(priv, offset); |
| reg |= (MII_SW_OR | LINK_STS); |
| - if (priv->type == BCM7278_DEVICE_ID) |
| - reg |= GMII_SPEED_UP_2G; |
| + reg &= ~GMII_SPEED_UP_2G; |
| core_writel(priv, reg, offset); |
| |
| /* Enable Broadcast, Multicast, Unicast forwarding to IMP port */ |
| -- |
| 2.20.1 |
| |
