From 13c70a0e0bb2f7a99caee54a4c22b0a3cc99b0e1 Mon Sep 17 00:00:00 2001
From: Nicolai Buchwitz <nb@tipi-net.de>
Date: Mon, 30 Mar 2026 16:32:35 +0200
Subject: [PATCH] Revert "net: bcmgenet: Workaround #2 for Pi4 Ethernet fail"

This reverts commit dfad8d6677d4c11a5b6d599f81802486f5c1d973.
---
 drivers/net/ethernet/broadcom/genet/bcmgenet.c | 8 --------
 1 file changed, 8 deletions(-)

--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -65,9 +65,6 @@
 
 /* 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)
 {
@@ -2563,11 +2560,6 @@ static void reset_umac(struct bcmgenet_p
 	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);
