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 6/9] net: ipa: move completion interrupt enable/disable
Date: Fri, 29 Jan 2021 14:20:16 -0600 [thread overview]
Message-ID: <20210129202019.2099259-7-elder@linaro.org> (raw)
In-Reply-To: <20210129202019.2099259-1-elder@linaro.org>
Move the calls to enable or disable IEOB interrupts out of
__gsi_channel_start() and __gsi_channel_stop() and into their
callers. This is a small step to make the next patch easier
to understand.
Signed-off-by: Alex Elder <elder@linaro.org>
---
drivers/net/ipa/gsi.c | 45 +++++++++++++++++++++++++++++++------------
1 file changed, 33 insertions(+), 12 deletions(-)
diff --git a/drivers/net/ipa/gsi.c b/drivers/net/ipa/gsi.c
index 1a02936b4db06..70647e8450845 100644
--- a/drivers/net/ipa/gsi.c
+++ b/drivers/net/ipa/gsi.c
@@ -860,17 +860,13 @@ static int __gsi_channel_start(struct gsi_channel *channel, bool start)
struct gsi *gsi = channel->gsi;
int ret;
- gsi_irq_ieob_enable_one(gsi, channel->evt_ring_id);
-
mutex_lock(&gsi->mutex);
ret = start ? gsi_channel_start_command(channel) : 0;
mutex_unlock(&gsi->mutex);
- if (ret)
- gsi_irq_ieob_disable_one(gsi, channel->evt_ring_id);
- else
+ if (!ret)
napi_enable(&channel->napi);
return ret;
@@ -880,8 +876,16 @@ static int __gsi_channel_start(struct gsi_channel *channel, bool start)
int gsi_channel_start(struct gsi *gsi, u32 channel_id)
{
struct gsi_channel *channel = &gsi->channel[channel_id];
+ int ret;
- return __gsi_channel_start(channel, true);
+ /* Enable the completion interrupt */
+ gsi_irq_ieob_enable_one(gsi, channel->evt_ring_id);
+
+ ret = __gsi_channel_start(channel, true);
+ if (ret)
+ gsi_irq_ieob_disable_one(gsi, channel->evt_ring_id);
+
+ return ret;
}
static int gsi_channel_stop_retry(struct gsi_channel *channel)
@@ -906,7 +910,6 @@ static int gsi_channel_stop_retry(struct gsi_channel *channel)
static int __gsi_channel_stop(struct gsi_channel *channel, bool stop)
{
- struct gsi *gsi = channel->gsi;
int ret;
gsi_channel_trans_quiesce(channel);
@@ -916,8 +919,6 @@ static int __gsi_channel_stop(struct gsi_channel *channel, bool stop)
if (ret)
napi_enable(&channel->napi);
- else
- gsi_irq_ieob_disable_one(gsi, channel->evt_ring_id);
return ret;
}
@@ -926,8 +927,14 @@ static int __gsi_channel_stop(struct gsi_channel *channel, bool stop)
int gsi_channel_stop(struct gsi *gsi, u32 channel_id)
{
struct gsi_channel *channel = &gsi->channel[channel_id];
+ int ret;
- return __gsi_channel_stop(channel, true);
+ /* Only disable the completion interrupt if stop is successful */
+ ret = __gsi_channel_stop(channel, true);
+ if (!ret)
+ gsi_irq_ieob_disable_one(gsi, channel->evt_ring_id);
+
+ return ret;
}
/* Reset and reconfigure a channel, (possibly) enabling the doorbell engine */
@@ -952,16 +959,30 @@ 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);
+ /* No completions when suspended; disable interrupt if successful */
+ ret = __gsi_channel_stop(channel, stop);
+ if (!ret)
+ gsi_irq_ieob_disable_one(gsi, channel->evt_ring_id);
+
+ return ret;
}
/* Resume a suspended channel (starting will be requested if STOPPED) */
int gsi_channel_resume(struct gsi *gsi, u32 channel_id, bool start)
{
struct gsi_channel *channel = &gsi->channel[channel_id];
+ int ret;
- return __gsi_channel_start(channel, start);
+ /* Re-enable the completion interrupt */
+ gsi_irq_ieob_enable_one(gsi, channel->evt_ring_id);
+
+ ret = __gsi_channel_start(channel, start);
+ if (ret)
+ gsi_irq_ieob_disable_one(gsi, channel->evt_ring_id);
+
+ return ret;
}
/**
--
2.27.0
next prev parent reply other threads:[~2021-01-29 20:24 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-29 20:20 [PATCH net-next 0/9] net: ipa: don't disable NAPI in suspend Alex Elder
2021-01-29 20:20 ` [PATCH net-next 1/9] net: ipa: don't thaw channel if error starting Alex Elder
2021-01-29 20:20 ` [PATCH net-next 2/9] net: ipa: introduce gsi_channel_stop_retry() Alex Elder
2021-01-29 20:20 ` [PATCH net-next 3/9] net: ipa: introduce __gsi_channel_start() Alex Elder
2021-01-29 20:20 ` [PATCH net-next 4/9] net: ipa: kill gsi_channel_freeze() and gsi_channel_thaw() Alex Elder
2021-01-29 20:20 ` [PATCH net-next 5/9] net: ipa: disable IEOB interrupt after channel stop Alex Elder
2021-01-29 20:20 ` Alex Elder [this message]
2021-01-29 20:20 ` [PATCH net-next 7/9] net: ipa: don't disable IEOB interrupt during suspend Alex Elder
2021-01-29 20:20 ` [PATCH net-next 8/9] net: ipa: expand last transaction check Alex Elder
2021-01-29 20:20 ` [PATCH net-next 9/9] net: ipa: don't disable NAPI in suspend Alex Elder
2021-01-30 15:25 ` Willem de Bruijn
2021-01-30 19:22 ` Jakub Kicinski
2021-01-31 4:30 ` Alex Elder
2021-01-31 4:29 ` Alex Elder
2021-01-31 14:52 ` Willem de Bruijn
2021-01-31 15:32 ` Alex Elder
2021-02-01 1:36 ` Willem de Bruijn
2021-02-01 14:35 ` Alex Elder
2021-02-01 14:47 ` Willem de Bruijn
2021-02-01 15:48 ` Alex Elder
2021-02-01 18:38 ` 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=20210129202019.2099259-7-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).