From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
To: Bhaumik Bhatt <bbhatt@codeaurora.org>
Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org,
hemantk@codeaurora.org, jhugo@codeaurora.org
Subject: Re: [PATCH v7 6/8] bus: mhi: core: Return appropriate error codes for AMSS load failure
Date: Sat, 9 May 2020 11:20:14 +0530 [thread overview]
Message-ID: <20200509055014.GF5845@Mani-XPS-13-9360> (raw)
In-Reply-To: <1588991208-26928-7-git-send-email-bbhatt@codeaurora.org>
On Fri, May 08, 2020 at 07:26:46PM -0700, Bhaumik Bhatt wrote:
> 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>
Thanks,
Mani
> ---
> 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 17c636b..cf6dc5a 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,
> --
> 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-05-09 5:50 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-09 2:26 [PATCH v7 0/8] Bug fixes and improved logging in MHI Bhaumik Bhatt
2020-05-09 2:26 ` [PATCH v7 1/8] bus: mhi: core: Refactor mhi queue APIs Bhaumik Bhatt
2020-05-09 5:46 ` Manivannan Sadhasivam
2020-05-09 2:26 ` [PATCH v7 2/8] bus: mhi: core: Cache intmod from mhi event to mhi channel Bhaumik Bhatt
2020-05-09 5:47 ` Manivannan Sadhasivam
2020-05-09 2:26 ` [PATCH v7 3/8] bus: mhi: core: Add range check for channel id received in event ring Bhaumik Bhatt
2020-05-09 5:48 ` Manivannan Sadhasivam
2020-05-09 2:26 ` [PATCH v7 4/8] bus: mhi: core: Read transfer length from an event properly Bhaumik Bhatt
2020-05-09 5:49 ` Manivannan Sadhasivam
2020-05-09 2:26 ` [PATCH v7 5/8] bus: mhi: core: Handle firmware load using state worker Bhaumik Bhatt
2020-05-09 5:49 ` Manivannan Sadhasivam
2020-05-09 2:26 ` [PATCH v7 6/8] bus: mhi: core: Return appropriate error codes for AMSS load failure Bhaumik Bhatt
2020-05-09 5:50 ` Manivannan Sadhasivam [this message]
2020-05-09 2:26 ` [PATCH v7 7/8] bus: mhi: core: Improve debug logs for loading firmware Bhaumik Bhatt
2020-05-09 5:50 ` Manivannan Sadhasivam
2020-05-09 2:26 ` [PATCH v7 8/8] bus: mhi: core: Ensure non-zero session or sequence ID values are used Bhaumik Bhatt
2020-05-09 5:51 ` Manivannan Sadhasivam
2020-05-09 8:32 ` [PATCH v7 0/8] Bug fixes and improved logging in MHI 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=20200509055014.GF5845@Mani-XPS-13-9360 \
--to=manivannan.sadhasivam@linaro.org \
--cc=bbhatt@codeaurora.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
all inboxes | Powered by JetHome®