From: Jose Abreu <Jose.Abreu@synopsys.com>
To: linux-kernel@vger.kernel.org, netdev@vger.kernel.org
Cc: Jose Abreu <Jose.Abreu@synopsys.com>,
Joao Pinto <Joao.Pinto@synopsys.com>,
"David S . Miller" <davem@davemloft.net>,
Giuseppe Cavallaro <peppe.cavallaro@st.com>,
Alexandre Torgue <alexandre.torgue@st.com>
Subject: [PATCH net-next 09/10] net: stmmac: Only disable interrupts if NAPI is scheduled
Date: Wed, 26 Jun 2019 15:47:43 +0200 [thread overview]
Message-ID: <372310483e674f14eb811c6e8c8355475496d520.1561556556.git.joabreu@synopsys.com> (raw)
In-Reply-To: <cover.1561556555.git.joabreu@synopsys.com>
In-Reply-To: <cover.1561556555.git.joabreu@synopsys.com>
Only disable the interrupts if RX NAPI gets to be scheduled. Also,
schedule the TX NAPI only when the interrupts are disabled.
Signed-off-by: Jose Abreu <joabreu@synopsys.com>
Cc: Joao Pinto <jpinto@synopsys.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
---
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 0893af8b432d..bc949665c529 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -2049,12 +2049,12 @@ static int stmmac_napi_check(struct stmmac_priv *priv, u32 chan)
&priv->xstats, chan);
struct stmmac_channel *ch = &priv->channel[chan];
- if (status)
- status |= handle_rx | handle_tx;
-
if ((status & handle_rx) && (chan < priv->plat->rx_queues_to_use)) {
- stmmac_disable_dma_irq(priv, priv->ioaddr, chan);
- napi_schedule_irqoff(&ch->rx_napi);
+ if (napi_schedule_prep(&ch->rx_napi)) {
+ stmmac_disable_dma_irq(priv, priv->ioaddr, chan);
+ __napi_schedule_irqoff(&ch->rx_napi);
+ status |= handle_tx;
+ }
}
if ((status & handle_tx) && (chan < priv->plat->tx_queues_to_use))
--
2.7.4
next prev parent reply other threads:[~2019-06-26 13:48 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-26 13:47 [PATCH net-next 00/10] net: stmmac: 10GbE using XGMAC Jose Abreu
2019-06-26 13:47 ` [PATCH net-next 01/10] net: stmmac: dwxgmac: Enable EDMA by default Jose Abreu
2019-06-26 16:33 ` David Miller
2019-06-26 13:47 ` [PATCH net-next 02/10] net: stmmac: Do not try to enable PHY EEE if MAC does not support it Jose Abreu
2019-06-26 13:47 ` [PATCH net-next 03/10] net: stmmac: Decrease default RX Watchdog value Jose Abreu
2019-06-26 13:47 ` [PATCH net-next 04/10] net: stmmac: dwxgmac: Fix the undefined burst setting Jose Abreu
2019-06-26 13:47 ` [PATCH net-next 05/10] net: stmmac: Add the missing speeds that XGMAC supports Jose Abreu
2019-06-26 13:47 ` [PATCH net-next 06/10] net: stmmac: Do not disable interrupts when cleaning TX Jose Abreu
2019-06-26 13:47 ` [PATCH net-next 07/10] net: stmmac: Enable support for > 32 Bits addressing in XGMAC Jose Abreu
2019-06-26 20:19 ` Andrew Lunn
2019-06-27 7:54 ` Jose Abreu
2019-06-26 13:47 ` [PATCH net-next 08/10] net: stmmac: Update RX Tail Pointer to last free entry Jose Abreu
2019-06-26 13:47 ` Jose Abreu [this message]
2019-06-26 13:47 ` [PATCH net-next 10/10] net: stmmac: Try to get C45 PHY if everything else fails Jose Abreu
2019-06-26 20:01 ` Andrew Lunn
2019-06-27 7:54 ` Jose Abreu
2019-06-27 13:23 ` Andrew Lunn
2019-06-27 13:33 ` Jose Abreu
2019-06-27 14:03 ` Andrew Lunn
2019-06-28 7:27 ` Jose Abreu
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=372310483e674f14eb811c6e8c8355475496d520.1561556556.git.joabreu@synopsys.com \
--to=jose.abreu@synopsys.com \
--cc=Joao.Pinto@synopsys.com \
--cc=alexandre.torgue@st.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=peppe.cavallaro@st.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).