Commit 657ade07 authored by Rickard x Andersson's avatar Rickard x Andersson Committed by David S. Miller
Browse files

net: fec: fix rare tx timeout 



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: default avatarRickard x Andersson <rickaran@axis.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ad5f97fa

drivers/net/ethernet/freescale/fec_main.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -1158,7 +1158,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);

	}

	}
@@ -1273,7 +1273,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);
@@ -1746,7 +1746,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);

		}

		}
@@ -2247,7 +2247,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);

	}

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE