linux-arm-msm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
To: gregkh@linuxfoundation.org
Cc: hemantk@codeaurora.org, jhugo@codeaurora.org,
	linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org,
	Bhaumik Bhatt <bbhatt@codeaurora.org>,
	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Subject: [RESEND PATCH 06/14] bus: mhi: core: Return appropriate error codes for AMSS load failure
Date: Thu, 21 May 2020 22:32:41 +0530	[thread overview]
Message-ID: <20200521170249.21795-7-manivannan.sadhasivam@linaro.org> (raw)
In-Reply-To: <20200521170249.21795-1-manivannan.sadhasivam@linaro.org>

From: Bhaumik Bhatt <bbhatt@codeaurora.org>

When loading AMSS firmware using BHIe protocol, return -ETIMEDOUT if no
response is received within the timeout or return -EIO in case of a
protocol returned failure or an MHI error state.

Signed-off-by: Bhaumik Bhatt <bbhatt@codeaurora.org>
Reviewed-by: Jeffrey Hugo <jhugo@codeaurora.org>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
---
 drivers/bus/mhi/core/boot.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/drivers/bus/mhi/core/boot.c b/drivers/bus/mhi/core/boot.c
index 17c636b4bc6e..cf6dc5a2361c 100644
--- a/drivers/bus/mhi/core/boot.c
+++ b/drivers/bus/mhi/core/boot.c
@@ -176,6 +176,7 @@ static int mhi_fw_load_amss(struct mhi_controller *mhi_cntrl,
 	void __iomem *base = mhi_cntrl->bhie;
 	rwlock_t *pm_lock = &mhi_cntrl->pm_lock;
 	u32 tx_status, sequence_id;
+	int ret;
 
 	read_lock_bh(pm_lock);
 	if (!MHI_REG_ACCESS_VALID(mhi_cntrl->pm_state)) {
@@ -198,19 +199,19 @@ static int mhi_fw_load_amss(struct mhi_controller *mhi_cntrl,
 	read_unlock_bh(pm_lock);
 
 	/* Wait for the image download to complete */
-	wait_event_timeout(mhi_cntrl->state_event,
-			   MHI_PM_IN_ERROR_STATE(mhi_cntrl->pm_state) ||
-			   mhi_read_reg_field(mhi_cntrl, base,
-					      BHIE_TXVECSTATUS_OFFS,
-					      BHIE_TXVECSTATUS_STATUS_BMSK,
-					      BHIE_TXVECSTATUS_STATUS_SHFT,
-					      &tx_status) || tx_status,
-			   msecs_to_jiffies(mhi_cntrl->timeout_ms));
-
-	if (MHI_PM_IN_ERROR_STATE(mhi_cntrl->pm_state))
+	ret = wait_event_timeout(mhi_cntrl->state_event,
+				 MHI_PM_IN_ERROR_STATE(mhi_cntrl->pm_state) ||
+				 mhi_read_reg_field(mhi_cntrl, base,
+						   BHIE_TXVECSTATUS_OFFS,
+						   BHIE_TXVECSTATUS_STATUS_BMSK,
+						   BHIE_TXVECSTATUS_STATUS_SHFT,
+						   &tx_status) || tx_status,
+				 msecs_to_jiffies(mhi_cntrl->timeout_ms));
+	if (MHI_PM_IN_ERROR_STATE(mhi_cntrl->pm_state) ||
+	    tx_status != BHIE_TXVECSTATUS_STATUS_XFER_COMPL)
 		return -EIO;
 
-	return (tx_status == BHIE_TXVECSTATUS_STATUS_XFER_COMPL) ? 0 : -EIO;
+	return (!ret) ? -ETIMEDOUT : 0;
 }
 
 static int mhi_fw_load_sbl(struct mhi_controller *mhi_cntrl,
-- 
2.17.1


  parent reply	other threads:[~2020-05-21 17:03 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-21 17:02 [RESEND PATCH 00/14] MHI patches for v5.8 Manivannan Sadhasivam
2020-05-21 17:02 ` [RESEND PATCH 01/14] bus: mhi: core: Refactor mhi queue APIs Manivannan Sadhasivam
2020-05-21 17:02 ` [RESEND PATCH 02/14] bus: mhi: core: Cache intmod from mhi event to mhi channel Manivannan Sadhasivam
2020-05-21 17:02 ` [RESEND PATCH 03/14] bus: mhi: core: Add range check for channel id received in event ring Manivannan Sadhasivam
2020-05-21 17:02 ` [RESEND PATCH 04/14] bus: mhi: core: Read transfer length from an event properly Manivannan Sadhasivam
2020-05-21 17:02 ` [RESEND PATCH 05/14] bus: mhi: core: Handle firmware load using state worker Manivannan Sadhasivam
2020-05-21 17:02 ` Manivannan Sadhasivam [this message]
2020-05-21 17:02 ` [RESEND PATCH 07/14] bus: mhi: core: Improve debug logs for loading firmware Manivannan Sadhasivam
2020-05-21 17:02 ` [RESEND PATCH 08/14] bus: mhi: core: Ensure non-zero session or sequence ID values are used Manivannan Sadhasivam
2020-05-21 17:02 ` [RESEND PATCH 09/14] bus: mhi: core: Remove the system error worker thread Manivannan Sadhasivam
2020-05-21 17:02 ` [RESEND PATCH 10/14] bus: mhi: core: Handle disable transitions in state worker Manivannan Sadhasivam
2020-05-21 17:02 ` [RESEND PATCH 11/14] bus: mhi: core: Skip handling BHI irq if MHI reg access is not allowed Manivannan Sadhasivam
2020-05-21 17:02 ` [RESEND PATCH 12/14] bus: mhi: core: Do not process SYS_ERROR if RDDM is supported Manivannan Sadhasivam
2020-05-21 17:02 ` [RESEND PATCH 13/14] bus: mhi: core: Handle write lock properly in mhi_pm_m0_transition Manivannan Sadhasivam
2020-05-21 17:02 ` [RESEND PATCH 14/14] bus: mhi: core: Handle syserr during power_up Manivannan Sadhasivam

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=20200521170249.21795-7-manivannan.sadhasivam@linaro.org \
    --to=manivannan.sadhasivam@linaro.org \
    --cc=bbhatt@codeaurora.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=hemantk@codeaurora.org \
    --cc=jhugo@codeaurora.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.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).