raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 01:49:46 +00:00
Code Issues Projects Releases Wiki Activity

net: bcmgenet: Workaround #2 for Pi4 Ethernet fail

Browse Source 
Some combinations of Pi 4Bs and Ethernet switches don't reliably get a
DCHP-assigned IP address, leaving the unit with a self=assigned 169.254
address. In the failure case, the Pi is left able to receive packets
but not send them, suggesting that the MAC<->PHY link is getting into
a bad state.

It has been found empirically that skipping a reset step by the genet
driver prevents the failures. No downsides have been discovered yet,
and unlike the forced renegotiation it doesn't increase the time to
get an IP address, so the workaround is enabled by default; add

  genet.skip_umac_reset=n

to the command line to disable it.

See: https://github.com/raspberrypi/linux/issues/3108

Signed-off-by: Phil Elwell <phil@raspberrypi.org>
This commit is contained in:
Phil Elwell
2019-08-09 08:51:43 +01:00
committed by Dom Cobley
parent dbe886f5a8
commit ecc07b04b0
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ethernet/broadcom/genet/bcmgenet.c
View File

@@ -65,6 +65,9 @@
/* Forward declarations */ /* Forward declarations */
static void bcmgenet_set_rx_mode(struct net_device *dev); static void bcmgenet_set_rx_mode(struct net_device *dev);
static bool skip_umac_reset = true;
module_param(skip_umac_reset, bool, 0444);
MODULE_PARM_DESC(skip_umac_reset, "Skip UMAC reset step");
static inline void bcmgenet_writel(u32 value, void __iomem *offset) static inline void bcmgenet_writel(u32 value, void __iomem *offset)
{ {
@@ -2566,6 +2569,11 @@ static void reset_umac(struct bcmgenet_priv *priv)
bcmgenet_rbuf_ctrl_set(priv, 0); bcmgenet_rbuf_ctrl_set(priv, 0);
udelay(10); udelay(10);
if (skip_umac_reset) {
pr_warn("Skipping UMAC reset\n");
return;
}
/* issue soft reset and disable MAC while updating its registers */ /* issue soft reset and disable MAC while updating its registers */
spin_lock_bh(&priv->reg_lock); spin_lock_bh(&priv->reg_lock);
bcmgenet_umac_writel(priv, CMD_SW_RESET, UMAC_CMD); bcmgenet_umac_writel(priv, CMD_SW_RESET, UMAC_CMD);