From: Jeffrey Hugo <jhugo@codeaurora.org>
To: manivannan.sadhasivam@linaro.org, hemantk@codeaurora.org
Cc: bbhatt@codeaurora.org, linux-arm-msm@vger.kernel.org,
linux-kernel@vger.kernel.org, Jeffrey Hugo <jhugo@codeaurora.org>
Subject: [PATCH v3 5/6] bus: mhi: core: Handle syserr during power_up
Date: Mon, 27 Apr 2020 09:59:12 -0600 [thread overview]
Message-ID: <1588003153-13139-6-git-send-email-jhugo@codeaurora.org> (raw)
In-Reply-To: <1588003153-13139-1-git-send-email-jhugo@codeaurora.org>
The MHI device may be in the syserr state when we attempt to init it in
power_up(). Since we have no local state, the handling is simple -
reset the device and wait for it to transition out of the reset state.
Signed-off-by: Jeffrey Hugo <jhugo@codeaurora.org>
---
drivers/bus/mhi/core/pm.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/drivers/bus/mhi/core/pm.c b/drivers/bus/mhi/core/pm.c
index dc83d65..239619b 100644
--- a/drivers/bus/mhi/core/pm.c
+++ b/drivers/bus/mhi/core/pm.c
@@ -9,6 +9,7 @@
#include <linux/dma-direction.h>
#include <linux/dma-mapping.h>
#include <linux/interrupt.h>
+#include <linux/iopoll.h>
#include <linux/list.h>
#include <linux/mhi.h>
#include <linux/module.h>
@@ -760,6 +761,7 @@ static void mhi_deassert_dev_wake(struct mhi_controller *mhi_cntrl,
int mhi_async_power_up(struct mhi_controller *mhi_cntrl)
{
+ enum mhi_state state;
enum mhi_ee_type current_ee;
enum dev_st_transition next_state;
struct device *dev = &mhi_cntrl->mhi_dev->dev;
@@ -829,6 +831,24 @@ int mhi_async_power_up(struct mhi_controller *mhi_cntrl)
goto error_bhi_offset;
}
+ state = mhi_get_mhi_state(mhi_cntrl);
+ if (state == MHI_STATE_SYS_ERR) {
+ mhi_set_mhi_state(mhi_cntrl, MHI_STATE_RESET);
+ ret = readl_poll_timeout(mhi_cntrl->regs + MHICTRL, val,
+ !(val & MHICTRL_RESET_MASK), 1000,
+ mhi_cntrl->timeout_ms * 1000);
+ if (ret) {
+ dev_info(dev, "Failed to reset MHI due to syserr state\n");
+ goto error_bhi_offset;
+ }
+
+ /*
+ * device cleares INTVEC as part of RESET processing,
+ * re-program it
+ */
+ mhi_write_reg(mhi_cntrl, mhi_cntrl->bhi, BHI_INTVEC, 0);
+ }
+
/* Transition to next state */
next_state = MHI_IN_PBL(current_ee) ?
DEV_ST_TRANSITION_PBL : DEV_ST_TRANSITION_READY;
--
Qualcomm Technologies, Inc. is a member of the
Code Aurora Forum, a Linux Foundation Collaborative Project.
next prev parent reply other threads:[~2020-04-27 16:00 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-27 15:59 [PATCH v3 0/6] Misc MHI fixes Jeffrey Hugo
2020-04-27 15:59 ` [PATCH v3 1/6] bus: mhi: core: Make sure to powerdown if mhi_sync_power_up fails Jeffrey Hugo
2020-04-28 18:52 ` Hemant Kumar
2020-04-30 16:55 ` Manivannan Sadhasivam
2020-04-27 15:59 ` [PATCH v3 2/6] bus: mhi: core: Remove link_status() callback Jeffrey Hugo
2020-04-28 18:54 ` Hemant Kumar
2020-04-27 15:59 ` [PATCH v3 3/6] bus: mhi: core: Offload register accesses to the controller Jeffrey Hugo
2020-04-28 18:56 ` Hemant Kumar
2020-04-30 16:57 ` Manivannan Sadhasivam
2020-04-27 15:59 ` [PATCH v3 4/6] bus: mhi: core: Fix typo in comment Jeffrey Hugo
2020-04-28 18:56 ` Hemant Kumar
2020-04-30 16:59 ` Manivannan Sadhasivam
2020-04-27 15:59 ` Jeffrey Hugo [this message]
2020-04-27 15:59 ` [PATCH v3 6/6] bus: mhi: core: Fix channel device name conflict Jeffrey Hugo
2020-04-28 18:57 ` Hemant Kumar
2020-04-30 17:01 ` Manivannan Sadhasivam
2020-04-30 17:20 ` [PATCH v3 0/6] Misc MHI fixes Manivannan Sadhasivam
2020-04-30 17:54 ` Jeffrey Hugo
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=1588003153-13139-6-git-send-email-jhugo@codeaurora.org \
--to=jhugo@codeaurora.org \
--cc=bbhatt@codeaurora.org \
--cc=hemantk@codeaurora.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.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).