raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 18:09:56 +00:00
Code Issues Projects Releases Wiki Activity

net: fec: fix rare tx timeout

Browse Source 
[ Upstream commit 657ade07df ]

During certain heavy network loads TX could time out
with TX ring dump.
TX is sometimes never restarted after reaching
"tx_stop_threshold" because function "fec_enet_tx_queue"
only tests the first queue.

In addition the TX timeout callback function failed to
recover because it also operated only on the first queue.

Signed-off-by: Rickard x Andersson <rickaran@axis.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Rickard x Andersson
2018-10-02 14:49:32 +02:00
committed by Greg Kroah-Hartman
parent 784f839589
commit 1837dbb25c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ethernet/freescale/fec_main.c
View File

@@ -1155,7 +1155,7 @@ static void fec_enet_timeout_work(struct work_struct *work)
napi_disable(&fep->napi); napi_disable(&fep->napi);
netif_tx_lock_bh(ndev); netif_tx_lock_bh(ndev);
fec_restart(ndev); fec_restart(ndev);
netif_wake_queue(ndev); netif_tx_wake_all_queues(ndev);
netif_tx_unlock_bh(ndev); netif_tx_unlock_bh(ndev);
napi_enable(&fep->napi); napi_enable(&fep->napi);
} }
@@ -1270,7 +1270,7 @@ skb_done:
/* Since we have freed up a buffer, the ring is no longer full /* Since we have freed up a buffer, the ring is no longer full
*/ */
if (netif_queue_stopped(ndev)) { if (netif_tx_queue_stopped(nq)) {
entries_free = fec_enet_get_free_txdesc_num(txq); entries_free = fec_enet_get_free_txdesc_num(txq);
if (entries_free >= txq->tx_wake_threshold) if (entries_free >= txq->tx_wake_threshold)
netif_tx_wake_queue(nq); netif_tx_wake_queue(nq);
@@ -1747,7 +1747,7 @@ static void fec_enet_adjust_link(struct net_device *ndev)
napi_disable(&fep->napi); napi_disable(&fep->napi);
netif_tx_lock_bh(ndev); netif_tx_lock_bh(ndev);
fec_restart(ndev); fec_restart(ndev);
netif_wake_queue(ndev); netif_tx_wake_all_queues(ndev);
netif_tx_unlock_bh(ndev); netif_tx_unlock_bh(ndev);
napi_enable(&fep->napi); napi_enable(&fep->napi);
} }
@@ -2249,7 +2249,7 @@ static int fec_enet_set_pauseparam(struct net_device *ndev,
napi_disable(&fep->napi); napi_disable(&fep->napi);
netif_tx_lock_bh(ndev); netif_tx_lock_bh(ndev);
fec_restart(ndev); fec_restart(ndev);
netif_wake_queue(ndev); netif_tx_wake_all_queues(ndev);
netif_tx_unlock_bh(ndev); netif_tx_unlock_bh(ndev);
napi_enable(&fep->napi); napi_enable(&fep->napi);
} }