diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2020-02-24 15:56:32 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-03-12 13:00:08 +0100 |
| commit | 551132b2943f620801601f44dfa8c70d22b87a8b (patch) | |
| tree | 14232fe972e92acf259fc5a951dca9db0086fdf5 /drivers/net/dsa/bcm_sf2.c | |
| parent | 2f87f58ca90161f535b751ba0fc66da91ba8505a (diff) | |
| download | linux-stable-551132b2943f620801601f44dfa8c70d22b87a8b.tar.gz linux-stable-551132b2943f620801601f44dfa8c70d22b87a8b.tar.bz2 linux-stable-551132b2943f620801601f44dfa8c70d22b87a8b.zip | |
net: dsa: bcm_sf2: Forcibly configure IMP port for 1Gb/sec
[ 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>
Diffstat (limited to 'drivers/net/dsa/bcm_sf2.c')
| -rw-r--r-- | drivers/net/dsa/bcm_sf2.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c index fecd5e674e04..46dc913da852 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 */ |