From: Alex Elder <elder@linaro.org>
To: davem@davemloft.net, kuba@kernel.org
Cc: willemdebruijn.kernel@gmail.com, 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 1/7] net: ipa: don't thaw channel if error starting
Date: Mon, 1 Feb 2021 11:28:44 -0600 [thread overview]
Message-ID: <20210201172850.2221624-2-elder@linaro.org> (raw)
In-Reply-To: <20210201172850.2221624-1-elder@linaro.org>
If an error occurs starting a channel, don't "thaw" it.
We should assume the channel remains in a non-started state.
Update the comment in gsi_channel_stop(); calls to this function
are no longer retried.
Signed-off-by: Alex Elder <elder@linaro.org>
---
drivers/net/ipa/gsi.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ipa/gsi.c b/drivers/net/ipa/gsi.c
index f79cf3c327c1c..4a3e125e898f6 100644
--- a/drivers/net/ipa/gsi.c
+++ b/drivers/net/ipa/gsi.c
@@ -885,7 +885,9 @@ int gsi_channel_start(struct gsi *gsi, u32 channel_id)
mutex_unlock(&gsi->mutex);
- gsi_channel_thaw(channel);
+ /* Thaw the channel if successful */
+ if (!ret)
+ gsi_channel_thaw(channel);
return ret;
}
@@ -910,7 +912,7 @@ int gsi_channel_stop(struct gsi *gsi, u32 channel_id)
mutex_unlock(&gsi->mutex);
- /* Thaw the channel if we need to retry (or on error) */
+ /* Re-thaw the channel if an error occurred while stopping */
if (ret)
gsi_channel_thaw(channel);
--
2.27.0
next prev parent reply other threads:[~2021-02-01 17:30 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-01 17:28 [PATCH net-next v2 0/7] net: ipa: don't disable NAPI in suspend Alex Elder
2021-02-01 17:28 ` Alex Elder [this message]
2021-02-01 17:28 ` [PATCH net-next v2 2/7] net: ipa: introduce gsi_channel_stop_retry() Alex Elder
2021-02-01 17:28 ` [PATCH net-next v2 3/7] net: ipa: introduce __gsi_channel_start() Alex Elder
2021-02-01 17:28 ` [PATCH net-next v2 4/7] net: ipa: kill gsi_channel_freeze() and gsi_channel_thaw() Alex Elder
2021-02-01 17:28 ` [PATCH net-next v2 5/7] net: ipa: disable interrupt and NAPI after channel stop Alex Elder
2021-02-01 17:28 ` [PATCH net-next v2 6/7] net: ipa: don't disable interrupt on suspend Alex Elder
2021-02-01 17:28 ` [PATCH net-next v2 7/7] net: ipa: expand last transaction check Alex Elder
2021-02-01 18:44 ` [PATCH net-next v2 0/7] net: ipa: don't disable NAPI in suspend Willem de Bruijn
2021-02-03 4:08 ` Jakub Kicinski
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=20210201172850.2221624-2-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 \
--cc=willemdebruijn.kernel@gmail.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
all inboxes | Powered by JetHome®