summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Hung <dylan_hung@aspeedtech.com>2021-03-12 11:04:05 +1030
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-03-30 14:37:00 +0200
commitebc121d67059acfaf91111b81039e91d1aeeb69a (patch)
tree37b4a32e2def643c91e203f6d1a91fdd33ce37a7
parent6edbb31cfd1295372f897f1fb6405e06b5b0cafa (diff)
ftgmac100: Restart MAC HW once
[ Upstream commit 6897087323a2fde46df32917462750c069668b2f ] The interrupt handler may set the flag to reset the mac in the future, but that flag is not cleared once the reset has occurred. Fixes: 10cbd6407609 ("ftgmac100: Rework NAPI & interrupts handling") Signed-off-by: Dylan Hung <dylan_hung@aspeedtech.com> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Reviewed-by: Joel Stanley <joel@jms.id.au> Signed-off-by: Joel Stanley <joel@jms.id.au> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/net/ethernet/faraday/ftgmac100.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
index acf27c395286..964407deca35 100644
--- a/drivers/net/ethernet/faraday/ftgmac100.c
+++ b/drivers/net/ethernet/faraday/ftgmac100.c
@@ -1333,6 +1333,7 @@ static int ftgmac100_poll(struct napi_struct *napi, int budget)
*/
if (unlikely(priv->need_mac_restart)) {
ftgmac100_start_hw(priv);
+ priv->need_mac_restart = false;
/* Re-enable "bad" interrupts */
iowrite32(FTGMAC100_INT_BAD,