From: Manivannan Sadhasivam <mani@kernel.org>
To: Jeffrey Hugo <quic_jhugo@quicinc.com>
Cc: mhi@lists.linux.dev, linux-arm-msm@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/2] bus: mhi: host: Use mhi_tryset_pm_state() for setting fw error state
Date: Mon, 3 Apr 2023 11:12:55 +0530 [thread overview]
Message-ID: <20230403054255.GJ4627@thinkpad> (raw)
In-Reply-To: <1674597444-24543-3-git-send-email-quic_jhugo@quicinc.com>
On Tue, Jan 24, 2023 at 02:57:24PM -0700, Jeffrey Hugo wrote:
> If firmware loading fails, the controller's pm_state is updated to
> MHI_PM_FW_DL_ERR unconditionally. This can corrupt the pm_state as the
> update is not done under the proper lock, and also does not validate
> the state transition. The firmware loading can fail due to a detected
> syserr, but if MHI_PM_FW_DL_ERR is unconditionally set as the pm_state,
> the handling of the syserr can break when it attempts to transition from
> syserr detect, to syserr process.
>
> By grabbing the lock, we ensure we don't race with some other pm_state
> update. By using mhi_try_set_pm_state(), we check that the transition
> to MHI_PM_FW_DL_ERR is valid via the state machine logic. If it is not
> valid, then some other transition is occurring like syserr processing, and
> we assume that will resolve the firmware loading error.
>
> Signed-off-by: Jeffrey Hugo <quic_jhugo@quicinc.com>
This looks like a legitimate fix. So please add the fixes tag and CC stable
for backporting (please add a hint on how far this patch has to be backported).
With that,
Reviewed-by: Manivannan Sadhasivam <mani@kernel.org>
- Mani
> Reviewed-by: Carl Vanderlip <quic_carlv@quicinc.com>
> ---
> drivers/bus/mhi/host/boot.c | 16 ++++++++++++----
> 1 file changed, 12 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/bus/mhi/host/boot.c b/drivers/bus/mhi/host/boot.c
> index 1c69fee..d2a19b07 100644
> --- a/drivers/bus/mhi/host/boot.c
> +++ b/drivers/bus/mhi/host/boot.c
> @@ -391,6 +391,7 @@ void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl)
> {
> const struct firmware *firmware = NULL;
> struct device *dev = &mhi_cntrl->mhi_dev->dev;
> + enum mhi_pm_state new_state;
> const char *fw_name;
> void *buf;
> dma_addr_t dma_addr;
> @@ -508,14 +509,18 @@ void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl)
> }
>
> error_fw_load:
> - mhi_cntrl->pm_state = MHI_PM_FW_DL_ERR;
> - wake_up_all(&mhi_cntrl->state_event);
> + write_lock_irq(&mhi_cntrl->pm_lock);
> + new_state = mhi_tryset_pm_state(mhi_cntrl, MHI_PM_FW_DL_ERR);
> + write_unlock_irq(&mhi_cntrl->pm_lock);
> + if (new_state == MHI_PM_FW_DL_ERR)
> + wake_up_all(&mhi_cntrl->state_event);
> }
>
> int mhi_download_amss_image(struct mhi_controller *mhi_cntrl)
> {
> struct image_info *image_info = mhi_cntrl->fbc_image;
> struct device *dev = &mhi_cntrl->mhi_dev->dev;
> + enum mhi_pm_state new_state;
> int ret;
>
> if (!image_info)
> @@ -526,8 +531,11 @@ int mhi_download_amss_image(struct mhi_controller *mhi_cntrl)
> &image_info->mhi_buf[image_info->entries - 1]);
> if (ret) {
> dev_err(dev, "MHI did not load AMSS, ret:%d\n", ret);
> - mhi_cntrl->pm_state = MHI_PM_FW_DL_ERR;
> - wake_up_all(&mhi_cntrl->state_event);
> + write_lock_irq(&mhi_cntrl->pm_lock);
> + new_state = mhi_tryset_pm_state(mhi_cntrl, MHI_PM_FW_DL_ERR);
> + write_unlock_irq(&mhi_cntrl->pm_lock);
> + if (new_state == MHI_PM_FW_DL_ERR)
> + wake_up_all(&mhi_cntrl->state_event);
> }
>
> return ret;
> --
> 2.7.4
>
--
மணிவண்ணன் சதாசிவம்
prev parent reply other threads:[~2023-04-03 5:43 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-24 21:57 [PATCH 0/2] MHI host syserr fixes Jeffrey Hugo
2023-01-24 21:57 ` [PATCH 1/2] bus: mhi: host: Remove duplicate ee check for syserr Jeffrey Hugo
2023-04-03 5:37 ` Manivannan Sadhasivam
2023-04-03 5:45 ` Manivannan Sadhasivam
2023-01-24 21:57 ` [PATCH 2/2] bus: mhi: host: Use mhi_tryset_pm_state() for setting fw error state Jeffrey Hugo
2023-04-03 5:42 ` Manivannan Sadhasivam [this message]
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=20230403054255.GJ4627@thinkpad \
--to=mani@kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mhi@lists.linux.dev \
--cc=quic_jhugo@quicinc.com \
/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).