Skip to contentSkip to conversation

net: bcmgenet: remove HFB_CTRL access

PATCH Applied Doug Berger 2 participants 2 messages Nov 20, 2018 – Nov 23, 2018

Subsystems (3)
Networking Network drivers Broadcom genet Ethernet driver
lore
Share & tools
lore

Doug Berger

author maintainer
#0 lore raw

PATCH 1/1 net: bcmgenet: remove HFB_CTRL access

Commit c5a54bbcecec ("net: bcmgenet: abort suspend on error") mistakenly introduced register accesses that should not occur in bcmgenet_wol_power_up_cfg().

Fixes c5a54bbcecec ("net: bcmgenet: abort suspend on error")
Signed-off-by Doug Berger <[email protected]>
---
 drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 4 ----
 1 file changed, 4 deletions(-)
drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c +0 -4
index b3596e0ee47b..57582efa362d 100644
@@ -191,10 +191,6 @@ void bcmgenet_wol_power_up_cfg(struct bcmgenet_priv *priv,
 	reg &= ~MPD_EN;
 	bcmgenet_umac_writel(priv, reg, UMAC_MPD_CTRL);
 
-	reg = bcmgenet_hfb_reg_readl(priv, HFB_CTRL);
-	reg &= ~(RBUF_HFB_EN | RBUF_ACPI_EN);
-	bcmgenet_hfb_reg_writel(priv, reg, HFB_CTRL);
-
 	/* Disable CRC Forward */
 	reg = bcmgenet_umac_readl(priv, UMAC_CMD);
 	reg &= ~CMD_CRC_FWD;
Signature · 1 line
2.7.4
maintainer Applied
#1 lore raw

From: Doug Berger <[email protected]>
Date: Tue, 20 Nov 2018 15:17:01 -0800

Quoted 6 lines

Commit c5a54bbcecec ("net: bcmgenet: abort suspend on error") mistakenly introduced register accesses that should not occur in bcmgenet_wol_power_up_cfg().

Fixes c5a54bbcecec ("net: bcmgenet: abort suspend on error")
Signed-off-by Doug Berger <[email protected]>

Applied.