Merge "mhi: core: Add support to re-try requesting firmware image" (cdc98813) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/bus/mhi/core/mhi_boot.c

+15 −2

Original line number	Diff line number	Diff line
		@@ -565,10 +565,23 @@ void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl)

		ret = request_firmware(&firmware, fw_name, mhi_cntrl->dev);
		if (ret) {
		MHI_CNTRL_ERR("Error loading firmware, ret:%d\n", ret);
		if (!mhi_cntrl->fw_image_fallback) {
		MHI_ERR("Error loading fw, ret:%d\n", ret);
		return;
		}

		/* re-try with fall back fw image */
		ret = request_firmware(&firmware, mhi_cntrl->fw_image_fallback,
		mhi_cntrl->dev);
		if (ret) {
		MHI_ERR("Error loading fw_fb, ret:%d\n", ret);
		return;
		}

		mhi_cntrl->status_cb(mhi_cntrl, mhi_cntrl->priv_data,
		MHI_CB_FW_FALLBACK_IMG);
		}

		size = (mhi_cntrl->fbc_download) ? mhi_cntrl->sbl_size : firmware->size;

		/* the sbl size provided is maximum size, not necessarily image size */

+2 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@ enum MHI_CB {
		MHI_CB_EE_MISSION_MODE,
		MHI_CB_SYS_ERROR,
		MHI_CB_FATAL_ERROR,
		MHI_CB_FW_FALLBACK_IMG,
		};

		/**
		@@ -282,6 +283,7 @@ struct mhi_controller {

		/* fw images */
		const char *fw_image;
		const char *fw_image_fallback;
		const char *edl_image;

		/* mhi host manages downloading entire fbc images */