From: Alex Elder <elder@linaro.org>
To: davem@davemloft.net, kuba@kernel.org
Cc: elder@kernel.org, evgreen@chromium.org,
bjorn.andersson@linaro.org, cpratapa@codeaurora.org,
subashab@codeaurora.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH net-next v2 2/7] net: ipa: synchronize NAPI only for suspend
Date: Fri, 5 Feb 2021 16:10:55 -0600 [thread overview]
Message-ID: <20210205221100.1738-3-elder@linaro.org> (raw)
In-Reply-To: <20210205221100.1738-1-elder@linaro.org>
When stopping a channel, gsi_channel_stop() will ensure NAPI
polling is complete when it calls napi_disable(). So there is no
need to call napi_synchronize() in that case.
Move the call to napi_synchronize() out of __gsi_channel_stop()
and into gsi_channel_suspend(), so it's only used where needed.
Signed-off-by: Alex Elder <elder@linaro.org>
---
v2: - Return early to avoid blocks of indented code
drivers/net/ipa/gsi.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/drivers/net/ipa/gsi.c b/drivers/net/ipa/gsi.c
index f0432c965168c..60eb765c53647 100644
--- a/drivers/net/ipa/gsi.c
+++ b/drivers/net/ipa/gsi.c
@@ -939,13 +939,7 @@ static int __gsi_channel_stop(struct gsi_channel *channel, bool stop)
mutex_unlock(&gsi->mutex);
- if (ret)
- return ret;
-
- /* Ensure NAPI polling has finished. */
- napi_synchronize(&channel->napi);
-
- return 0;
+ return ret;
}
/* Stop a started channel */
@@ -987,8 +981,16 @@ void gsi_channel_reset(struct gsi *gsi, u32 channel_id, bool doorbell)
int gsi_channel_suspend(struct gsi *gsi, u32 channel_id, bool stop)
{
struct gsi_channel *channel = &gsi->channel[channel_id];
+ int ret;
- return __gsi_channel_stop(channel, stop);
+ ret = __gsi_channel_stop(channel, stop);
+ if (ret)
+ return ret;
+
+ /* Ensure NAPI polling has finished. */
+ napi_synchronize(&channel->napi);
+
+ return 0;
}
/* Resume a suspended channel (starting will be requested if STOPPED) */
--
2.20.1
next prev parent reply other threads:[~2021-02-06 2:51 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-05 22:10 [PATCH net-next v2 0/7] net: ipa: a mix of small improvements Alex Elder
2021-02-05 22:10 ` [PATCH net-next v2 1/7] net: ipa: move mutex calls into __gsi_channel_stop() Alex Elder
2021-02-05 22:10 ` Alex Elder [this message]
2021-02-05 22:10 ` [PATCH net-next v2 3/7] net: ipa: do not cache event ring state Alex Elder
2021-02-05 22:10 ` [PATCH net-next v2 4/7] net: ipa: remove two unused register definitions Alex Elder
2021-02-05 22:10 ` [PATCH net-next v2 5/7] net: ipa: use a Boolean rather than count when replenishing Alex Elder
2021-02-05 22:10 ` [PATCH net-next v2 6/7] net: ipa: get rid of status size constraint Alex Elder
2021-02-05 22:11 ` [PATCH net-next v2 7/7] net: ipa: avoid field overflow Alex Elder
2021-02-06 22:58 ` [PATCH net-next v2 0/7] net: ipa: a mix of small improvements Jakub Kicinski
-- strict thread matches above, loose matches on Subject: below --
2021-02-05 14:38 Alex Elder
2021-02-05 14:38 ` [PATCH net-next v2 2/7] net: ipa: synchronize NAPI only for suspend Alex Elder
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=20210205221100.1738-3-elder@linaro.org \
--to=elder@linaro.org \
--cc=bjorn.andersson@linaro.org \
--cc=cpratapa@codeaurora.org \
--cc=davem@davemloft.net \
--cc=elder@kernel.org \
--cc=evgreen@chromium.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=subashab@codeaurora.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 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).