All of lore.kernel.org
 help / color / mirror / Atom feed
From: John Crispin <john@phrozen.org>
To: "David S. Miller" <davem@davemloft.net>
Cc: Felix Fietkau <nbd@nbd.name>, Sean Wang <keyhaede@gmail.com>,
	netdev@vger.kernel.org, linux-mediatek@lists.infradead.org,
	linux-kernel@vger.kernel.org, John Crispin <john@phrozen.org>
Subject: [PATCH 11/12] net: mediatek: only wake the queue if it is stopped
Date: Sun,  5 Jun 2016 08:33:04 +0200	[thread overview]
Message-ID: <1465108385-38286-12-git-send-email-john@phrozen.org> (raw)
In-Reply-To: <1465108385-38286-1-git-send-email-john@phrozen.org>

The current code unconditionally wakes up the queue at the end of each
tx_poll action. Change the code to only wake up the queues if any of
them have actually been stopped before.

Signed-off-by: John Crispin <john@phrozen.org>
---
 drivers/net/ethernet/mediatek/mtk_eth_soc.c |   17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index 6daf48b..40d3cfd 100644
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -685,6 +685,20 @@ static inline int mtk_cal_txd_req(struct sk_buff *skb)
 	return nfrags;
 }
 
+static int mtk_queue_stopped(struct mtk_eth *eth)
+{
+	int i;
+
+	for (i = 0; i < MTK_MAC_COUNT; i++) {
+		if (!eth->netdev[i])
+			continue;
+		if (netif_queue_stopped(eth->netdev[i]))
+			return 1;
+	}
+
+	return 0;
+}
+
 static void mtk_wake_queue(struct mtk_eth *eth)
 {
 	int i;
@@ -929,7 +943,8 @@ static int mtk_poll_tx(struct mtk_eth *eth, int budget, bool *tx_again)
 	if (!total)
 		return 0;
 
-	if (atomic_read(&ring->free_count) > ring->thresh)
+	if (mtk_queue_stopped(eth) &&
+	    (atomic_read(&ring->free_count) > ring->thresh))
 		mtk_wake_queue(eth);
 
 	return total;
-- 
1.7.10.4

  parent reply	other threads:[~2016-06-05  7:00 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-05  6:32 [PATCH 00/12] net: mediatek: various small fixes John Crispin
2016-06-05  6:32 ` [PATCH 01/12] net: mediatek: fix DQL support John Crispin
2016-06-05  6:32   ` John Crispin
2016-06-05  7:32   ` David Miller
2016-06-06  6:43     ` John Crispin
2016-06-07 23:01       ` David Miller
2016-06-07 23:20         ` Tom Herbert
2016-06-05  6:32 ` [PATCH 02/12] net: mediatek: add missing return code check John Crispin
2016-06-05  6:32   ` John Crispin
2016-06-05  6:32 ` [PATCH 03/12] net: mediatek: fix missing free of scratch memory John Crispin
2016-06-05  6:32 ` [PATCH 04/12] net: mediatek: invalid buffer lookup in mtk_tx_map() John Crispin
2016-06-05  6:32   ` John Crispin
2016-06-05  6:32 ` [PATCH 05/12] net: mediatek: dropped rx packets are not being counted properly John Crispin
2016-06-05  6:32   ` John Crispin
2016-06-05  6:32 ` [PATCH 06/12] net: mediatek: add next data pointer coherency protection John Crispin
2016-06-05  6:32   ` John Crispin
2016-06-05  6:33 ` [PATCH 07/12] net: mediatek: disable all interrupts during probe John Crispin
2016-06-05  6:33   ` John Crispin
2016-06-05  6:33 ` [PATCH 08/12] net: mediatek: fix threshold value John Crispin
2016-06-05  6:33   ` John Crispin
2016-06-05  6:33 ` [PATCH 09/12] net: mediatek: increase watchdog_timeo John Crispin
2016-06-05  6:33   ` John Crispin
2016-06-05 14:56   ` Andrew Lunn
2016-06-06  6:24     ` John Crispin
2016-06-06 12:21       ` Andrew Lunn
2016-06-06 12:38         ` John Crispin
2016-06-05  6:33 ` [PATCH 10/12] net: mediatek: fix off by one in the TX ring allocation John Crispin
2016-06-05  6:33 ` John Crispin [this message]
2016-06-05  6:33 ` [PATCH 12/12] net: mediatek: remove superfluous queue wake up call John Crispin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1465108385-38286-12-git-send-email-john@phrozen.org \
    --to=john@phrozen.org \
    --cc=davem@davemloft.net \
    --cc=keyhaede@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mediatek@lists.infradead.org \
    --cc=nbd@nbd.name \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.