Skip to content

Commit

Permalink
net: bcmgenet: Workaround #2 for Pi4 Ethernet fail
Browse files Browse the repository at this point in the history
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: #3108

Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  • Loading branch information
Phil Elwell authored and popcornmix committed May 13, 2024
1 parent 0a94f1b commit 26fdf32
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions drivers/net/ethernet/broadcom/genet/bcmgenet.c
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@

/* Forward declarations */
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)
{
Expand Down Expand Up @@ -2493,6 +2496,11 @@ static void reset_umac(struct bcmgenet_priv *priv)
bcmgenet_rbuf_ctrl_set(priv, 0);
udelay(10);

if (skip_umac_reset) {
pr_warn("Skipping UMAC reset\n");
return;
}

/* issue soft reset and disable MAC while updating its registers */
spin_lock_bh(&priv->reg_lock);
bcmgenet_umac_writel(priv, CMD_SW_RESET, UMAC_CMD);
Expand Down

0 comments on commit 26fdf32

Please sign in to comment.