| Message ID | 20200205203204.14511-1-f.fainelli@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net] net: systemport: Avoid RBUF stuck in Wake-on-LAN mode | expand |
From: Florian Fainelli <f.fainelli@gmail.com> Date: Wed, 5 Feb 2020 12:32:04 -0800 > 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. Must be some weird state latching or something like that... > 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> Applied and queued up for -stable, thanks.
diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c index f07ac0e0af59..e0611cba87f9 100644 --- a/drivers/net/ethernet/broadcom/bcmsysport.c +++ b/drivers/net/ethernet/broadcom/bcmsysport.c @@ -2736,6 +2736,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 */
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> --- drivers/net/ethernet/broadcom/bcmsysport.c | 3 +++ 1 file changed, 3 insertions(+)