From: Bhaumik Bhatt <bbhatt@codeaurora.org>
To: manivannan.sadhasivam@linaro.org, hemantk@codeaurora.org
Cc: linux-arm-msm@vger.kernel.org, loic.poulain@linaro.org,
jhugo@codeaurora.org, linux-kernel@vger.kernel.org,
Bhaumik Bhatt <bbhatt@codeaurora.org>
Subject: [PATCH v3 5/7] bus: mhi: core: Check execution environment for channel before issuing reset
Date: Wed, 2 Dec 2020 15:40:36 -0800 [thread overview]
Message-ID: <1606952438-15321-6-git-send-email-bbhatt@codeaurora.org> (raw)
In-Reply-To: <1606952438-15321-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.
Signed-off-by: Bhaumik Bhatt <bbhatt@codeaurora.org>
---
drivers/bus/mhi/core/main.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/drivers/bus/mhi/core/main.c b/drivers/bus/mhi/core/main.c
index 2e4b34a..40d15ef 100644
--- a/drivers/bus/mhi/core/main.c
+++ b/drivers/bus/mhi/core/main.c
@@ -1320,11 +1320,24 @@ static void __mhi_unprepare_channel(struct mhi_controller *mhi_cntrl,
/* no more processing events for this channel */
mutex_lock(&mhi_chan->mutex);
+ if (!(BIT(mhi_cntrl->ee) & mhi_chan->ee_mask)) {
+ dev_err(dev,
+ "Current EE: %s Required EE Mask: 0x%x for chan: %s\n",
+ TO_MHI_EXEC_STR(mhi_cntrl->ee), mhi_chan->ee_mask,
+ mhi_chan->name);
+ goto exit_unprepare_channel;
+ }
+
ret = mhi_update_channel_state(mhi_cntrl, mhi_chan,
MHI_CH_STATE_TYPE_RESET);
if (ret)
dev_err(dev, "Failed to reset channel, still resetting\n");
+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:[~2020-12-02 23:42 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-02 23:40 [PATCH v3 0/7] Updates to MHI channel handling Bhaumik Bhatt
2020-12-02 23:40 ` [PATCH v3 1/7] bus: mhi: core: Allow receiving a STOP channel command response Bhaumik Bhatt
2020-12-03 0:15 ` Hemant Kumar
2020-12-04 1:43 ` Bhaumik Bhatt
2020-12-02 23:40 ` [PATCH v3 2/7] bus: mhi: core: Allow channel to be disabled from stopped state Bhaumik Bhatt
2020-12-03 0:17 ` Hemant Kumar
2020-12-02 23:40 ` [PATCH v3 3/7] bus: mhi: core: Improvements to the channel handling state machine Bhaumik Bhatt
2020-12-03 0:51 ` Hemant Kumar
2020-12-02 23:40 ` [PATCH v3 4/7] bus: mhi: core: Add support to stop or start channel data transfers Bhaumik Bhatt
2020-12-03 0:33 ` Hemant Kumar
2020-12-04 1:44 ` Bhaumik Bhatt
2020-12-02 23:40 ` Bhaumik Bhatt [this message]
2020-12-03 0:54 ` [PATCH v3 5/7] bus: mhi: core: Check execution environment for channel before issuing reset Hemant Kumar
2020-12-02 23:40 ` [PATCH v3 6/7] bus: mhi: core: Remove __ prefix for MHI channel unprepare function Bhaumik Bhatt
2020-12-02 23:48 ` Hemant Kumar
2020-12-02 23:40 ` [PATCH v3 7/7] bus: mhi: Improve documentation on channel transfer setup APIs Bhaumik Bhatt
2020-12-03 0:56 ` Hemant Kumar
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=1606952438-15321-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).