From: Bhaumik Bhatt <bbhatt@codeaurora.org>
To: manivannan.sadhasivam@linaro.org
Cc: linux-arm-msm@vger.kernel.org, hemantk@codeaurora.org,
jhugo@codeaurora.org, linux-kernel@vger.kernel.org,
loic.poulain@linaro.org, Bhaumik Bhatt <bbhatt@codeaurora.org>
Subject: [PATCH v6 5/8] bus: mhi: core: Check channel execution environment before issuing reset
Date: Thu, 4 Feb 2021 12:28:03 -0800 [thread overview]
Message-ID: <1612470486-10440-6-git-send-email-bbhatt@codeaurora.org> (raw)
In-Reply-To: <1612470486-10440-1-git-send-email-bbhatt@codeaurora.org>
A client can attempt to unprepare certain channels for transfer even
after the execution environment they are supposed to run in has changed.
In the event that happens, the device need not be notified of the reset
and the host can proceed with clean up for the channel context and
memory allocated for it on the host as the device will no longer be able
to respond to such a request.
Signed-off-by: Bhaumik Bhatt <bbhatt@codeaurora.org>
Reviewed-by: Hemant Kumar <hemantk@codeaurora.org>
---
drivers/bus/mhi/core/main.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/drivers/bus/mhi/core/main.c b/drivers/bus/mhi/core/main.c
index 2f6fdb2..f511e3a 100644
--- a/drivers/bus/mhi/core/main.c
+++ b/drivers/bus/mhi/core/main.c
@@ -1283,6 +1283,12 @@ static void __mhi_unprepare_channel(struct mhi_controller *mhi_cntrl,
mutex_lock(&mhi_chan->mutex);
+ if (!(BIT(mhi_cntrl->ee) & mhi_chan->ee_mask)) {
+ dev_dbg(dev, "Current EE: %s Required EE Mask: 0x%x\n",
+ TO_MHI_EXEC_STR(mhi_cntrl->ee), mhi_chan->ee_mask);
+ goto exit_unprepare_channel;
+ }
+
/* no more processing events for this channel */
ret = mhi_update_channel_state(mhi_cntrl, mhi_chan,
MHI_CH_STATE_TYPE_RESET);
@@ -1290,6 +1296,11 @@ static void __mhi_unprepare_channel(struct mhi_controller *mhi_cntrl,
dev_err(dev, "%d: Failed to reset channel, still resetting\n",
mhi_chan->chan);
+exit_unprepare_channel:
+ write_lock_irq(&mhi_chan->lock);
+ mhi_chan->ch_state = MHI_CH_STATE_DISABLED;
+ write_unlock_irq(&mhi_chan->lock);
+
if (!mhi_chan->offload_ch) {
mhi_reset_chan(mhi_cntrl, mhi_chan);
mhi_deinit_chan_ctxt(mhi_cntrl, mhi_chan);
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
next prev parent reply other threads:[~2021-02-04 20:34 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-04 20:27 [PATCH v6 0/8] Updates to MHI channel handling Bhaumik Bhatt
2021-02-04 20:27 ` [PATCH v6 1/8] bus: mhi: core: Allow sending the STOP channel command Bhaumik Bhatt
2021-02-04 20:28 ` [PATCH v6 2/8] bus: mhi: core: Clear context for stopped channels from remove() Bhaumik Bhatt
2021-02-04 20:28 ` [PATCH v6 3/8] bus: mhi: core: Improvements to the channel handling state machine Bhaumik Bhatt
2021-02-24 10:03 ` Manivannan Sadhasivam
2021-02-25 1:39 ` Bhaumik Bhatt
2021-02-04 20:28 ` [PATCH v6 4/8] bus: mhi: core: Clear configuration from channel context during reset Bhaumik Bhatt
2021-02-04 20:28 ` Bhaumik Bhatt [this message]
2021-02-24 10:07 ` [PATCH v6 5/8] bus: mhi: core: Check channel execution environment before issuing reset Manivannan Sadhasivam
2021-02-04 20:28 ` [PATCH v6 6/8] bus: mhi: core: Remove __ prefix for MHI channel unprepare function Bhaumik Bhatt
2021-02-04 20:28 ` [PATCH v6 7/8] bus: mhi: Improve documentation on channel transfer setup APIs Bhaumik Bhatt
2021-02-24 10:08 ` Manivannan Sadhasivam
2021-02-04 20:28 ` [PATCH v6 8/8] bus: mhi: core: Do not clear channel context more than once Bhaumik Bhatt
2021-02-05 22:46 ` Hemant Kumar
2021-02-24 10:10 ` Manivannan Sadhasivam
2021-02-24 18:55 ` Bhaumik Bhatt
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=1612470486-10440-6-git-send-email-bbhatt@codeaurora.org \
--to=bbhatt@codeaurora.org \
--cc=hemantk@codeaurora.org \
--cc=jhugo@codeaurora.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=loic.poulain@linaro.org \
--cc=manivannan.sadhasivam@linaro.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).