| From 7f5226aa24fe443156a5a7f972080de01a131e90 Mon Sep 17 00:00:00 2001 |
| From: Florian Fainelli <f.fainelli@gmail.com> |
| Date: Wed, 5 Feb 2020 12:32:04 -0800 |
| Subject: [PATCH] net: systemport: Avoid RBUF stuck in Wake-on-LAN mode |
| |
| commit 263a425a482fc495d6d3f9a29b9103a664c38b69 upstream. |
| |
| After a number of suspend and resume cycles, it is possible for the RBUF |
| to be stuck in Wake-on-LAN mode, despite the MPD enable bit being |
| cleared which instructed the RBUF to exit that mode. |
| |
| Avoid creating that problematic condition by clearing the RX_EN and |
| TX_EN bits in the UniMAC prior to disable the Magic Packet Detector |
| logic which is guaranteed to make the RBUF exit Wake-on-LAN mode. |
| |
| Fixes: 83e82f4c706b ("net: systemport: add Wake-on-LAN support") |
| Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c |
| index be2d1f41bc0c..16dfbd104925 100644 |
| --- a/drivers/net/ethernet/broadcom/bcmsysport.c |
| +++ b/drivers/net/ethernet/broadcom/bcmsysport.c |
| @@ -2731,6 +2731,9 @@ static int __maybe_unused bcm_sysport_resume(struct device *d) |
| |
| umac_reset(priv); |
| |
| + /* Disable the UniMAC RX/TX */ |
| + umac_enable_set(priv, CMD_RX_EN | CMD_TX_EN, 0); |
| + |
| /* We may have been suspended and never received a WOL event that |
| * would turn off MPD detection, take care of that now |
| */ |
| -- |
| 2.7.4 |
| |
