hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bus: mhi: core: Move to an error state on any firmware load failure 

Move MHI to a firmware download error state for a failure to find
the firmware files or to load SBL or EBL image using BHI/BHIe. This
helps detect an error state sooner and shortens the wait for a
synchronous power up timeout.

Signed-off-by: Bhaumik Bhatt <bbhatt@codeaurora.org>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
This commit is contained in:
Bhaumik Bhatt 2020-11-09 12:47:25 -08:00 committed by Manivannan Sadhasivam
parent 0c76b3fa58
commit 12e050c77b
No known key found for this signature in database
GPG Key ID: 559F11E6FE91CEF5
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/bus/mhi/core/boot.c
View File

@ -428,13 +428,13 @@ void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl)
!mhi_cntrl->seg_len))) { !mhi_cntrl->seg_len))) {
dev_err(dev, dev_err(dev,
"No firmware image defined or !sbl_size || !seg_len\n"); "No firmware image defined or !sbl_size || !seg_len\n");
return; goto error_fw_load;
} }
ret = request_firmware(&firmware, fw_name, dev); ret = request_firmware(&firmware, fw_name, dev);
if (ret) { if (ret) {
dev_err(dev, "Error loading firmware: %d\n", ret); dev_err(dev, "Error loading firmware: %d\n", ret);
return; goto error_fw_load;
} }
size = (mhi_cntrl->fbc_download) ? mhi_cntrl->sbl_size : firmware->size; size = (mhi_cntrl->fbc_download) ? mhi_cntrl->sbl_size : firmware->size;
@ -446,7 +446,7 @@ void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl)
buf = mhi_alloc_coherent(mhi_cntrl, size, &dma_addr, GFP_KERNEL); buf = mhi_alloc_coherent(mhi_cntrl, size, &dma_addr, GFP_KERNEL);
if (!buf) { if (!buf) {
release_firmware(firmware); release_firmware(firmware);
return; goto error_fw_load;
} }
/* Download image using BHI */ /* Download image using BHI */
@ -454,17 +454,17 @@ void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl)
ret = mhi_fw_load_bhi(mhi_cntrl, dma_addr, size); ret = mhi_fw_load_bhi(mhi_cntrl, dma_addr, size);
mhi_free_coherent(mhi_cntrl, size, buf, dma_addr); mhi_free_coherent(mhi_cntrl, size, buf, dma_addr);
if (!mhi_cntrl->fbc_download || ret || mhi_cntrl->ee == MHI_EE_EDL)
release_firmware(firmware);
/* Error or in EDL mode, we're done */ /* Error or in EDL mode, we're done */
if (ret) { if (ret) {
dev_err(dev, "MHI did not load image over BHI, ret: %d\n", ret); dev_err(dev, "MHI did not load image over BHI, ret: %d\n", ret);
return; release_firmware(firmware);
goto error_fw_load;
} }
if (mhi_cntrl->ee == MHI_EE_EDL) if (mhi_cntrl->ee == MHI_EE_EDL) {
release_firmware(firmware);
return; return;
}
write_lock_irq(&mhi_cntrl->pm_lock); write_lock_irq(&mhi_cntrl->pm_lock);
mhi_cntrl->dev_state = MHI_STATE_RESET; mhi_cntrl->dev_state = MHI_STATE_RESET;
@ -477,13 +477,17 @@ void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl)
if (mhi_cntrl->fbc_download) { if (mhi_cntrl->fbc_download) {
ret = mhi_alloc_bhie_table(mhi_cntrl, &mhi_cntrl->fbc_image, ret = mhi_alloc_bhie_table(mhi_cntrl, &mhi_cntrl->fbc_image,
firmware->size); firmware->size);
if (ret) if (ret) {
goto error_alloc_fw_table; release_firmware(firmware);
goto error_fw_load;
}
/* Load the firmware into BHIE vec table */ /* Load the firmware into BHIE vec table */
mhi_firmware_copy(mhi_cntrl, firmware, mhi_cntrl->fbc_image); mhi_firmware_copy(mhi_cntrl, firmware, mhi_cntrl->fbc_image);
} }
release_firmware(firmware);
fw_load_ee_pthru: fw_load_ee_pthru:
/* Transitioning into MHI RESET->READY state */ /* Transitioning into MHI RESET->READY state */
ret = mhi_ready_state_transition(mhi_cntrl); ret = mhi_ready_state_transition(mhi_cntrl);
@ -512,11 +516,11 @@ fw_load_ee_pthru:
ret = mhi_fw_load_bhie(mhi_cntrl, ret = mhi_fw_load_bhie(mhi_cntrl,
/* Vector table is the last entry */ /* Vector table is the last entry */
&image_info->mhi_buf[image_info->entries - 1]); &image_info->mhi_buf[image_info->entries - 1]);
if (ret) if (ret) {
dev_err(dev, "MHI did not load image over BHIe, ret: %d\n", dev_err(dev, "MHI did not load image over BHIe, ret: %d\n",
ret); ret);
goto error_fw_load;
release_firmware(firmware); }
return; return;
@ -524,6 +528,7 @@ error_read:
mhi_free_bhie_table(mhi_cntrl, mhi_cntrl->fbc_image); mhi_free_bhie_table(mhi_cntrl, mhi_cntrl->fbc_image);
mhi_cntrl->fbc_image = NULL; mhi_cntrl->fbc_image = NULL;
error_alloc_fw_table: error_fw_load:
release_firmware(firmware); mhi_cntrl->pm_state = MHI_PM_FW_DL_ERR;
wake_up_all(&mhi_cntrl->state_event);
} }