0091-net-next-mediatek-only-wake-the-queue-if-it-is-stopp.patch 1.3 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748
  1. From 1473b4cce85760c0202a08e6a48ec51867dc1bf7 Mon Sep 17 00:00:00 2001
  2. From: John Crispin <john@phrozen.org>
  3. Date: Tue, 3 May 2016 04:01:38 +0200
  4. Subject: [PATCH 091/102] net-next: mediatek: only wake the queue if it is
  5. stopped
  6. The current code unconditionally wakes up the queue at the end of each
  7. tx_poll action. Change the code to only wake up the queues if any of
  8. them have actually been stopped before.
  9. Signed-off-by: John Crispin <john@phrozen.org>
  10. ---
  11. drivers/net/ethernet/mediatek/mtk_eth_soc.c | 17 ++++++++++++++++-
  12. 1 file changed, 16 insertions(+), 1 deletion(-)
  13. --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
  14. +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
  15. @@ -716,6 +716,20 @@ static inline int mtk_cal_txd_req(struct
  16. return nfrags;
  17. }
  18. +static int mtk_queue_stopped(struct mtk_eth *eth)
  19. +{
  20. + int i;
  21. +
  22. + for (i = 0; i < MTK_MAC_COUNT; i++) {
  23. + if (!eth->netdev[i])
  24. + continue;
  25. + if (netif_queue_stopped(eth->netdev[i]))
  26. + return 1;
  27. + }
  28. +
  29. + return 0;
  30. +}
  31. +
  32. static void mtk_wake_queue(struct mtk_eth *eth)
  33. {
  34. int i;
  35. @@ -960,7 +974,8 @@ static int mtk_poll_tx(struct mtk_eth *e
  36. if (!total)
  37. return 0;
  38. - if (atomic_read(&ring->free_count) > ring->thresh)
  39. + if (mtk_queue_stopped(eth) &&
  40. + (atomic_read(&ring->free_count) > ring->thresh))
  41. mtk_wake_queue(eth);
  42. return total;