Skip to content

Commit 3cf5568

Browse files
nbuchwitzpelwell
authored andcommitted
Revert "net: bcmgenet: Workaround #2 for Pi4 Ethernet fail"
This reverts commit dfad8d6.
1 parent 54ba628 commit 3cf5568

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

drivers/net/ethernet/broadcom/genet/bcmgenet.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,6 @@
6565

6666
/* Forward declarations */
6767
static void bcmgenet_set_rx_mode(struct net_device *dev);
68-
static bool skip_umac_reset = true;
69-
module_param(skip_umac_reset, bool, 0444);
70-
MODULE_PARM_DESC(skip_umac_reset, "Skip UMAC reset step");
7168

7269
static inline void bcmgenet_writel(u32 value, void __iomem *offset)
7370
{
@@ -2562,11 +2559,6 @@ static void reset_umac(struct bcmgenet_priv *priv)
25622559
bcmgenet_rbuf_ctrl_set(priv, 0);
25632560
udelay(10);
25642561

2565-
if (skip_umac_reset) {
2566-
pr_warn("Skipping UMAC reset\n");
2567-
return;
2568-
}
2569-
25702562
/* issue soft reset and disable MAC while updating its registers */
25712563
spin_lock_bh(&priv->reg_lock);
25722564
bcmgenet_umac_writel(priv, CMD_SW_RESET, UMAC_CMD);

0 commit comments

Comments
 (0)