Reviewed-by: Jacek Lawrynowicz <jacek.lawrynowicz@xxxxxxxxxxxxxxx>
On 12/13/2024 10:33 PM, Jeffrey Hugo wrote:
> From: Matthew Leung <quic_mattleun@xxxxxxxxxxx>
>
> Currently, mhi host only performs firmware transfer via BHI in PBL and
> BHIe from SBL. To support BHIe transfer directly from PBL, a policy
> needs to be added.
>
> With this policy, BHIe will be used to transfer firmware in PBL if the
> mhi controller has bhie regs, sets seg_len, and does not set
> fbc_download. The intention is to transfer firmware using BHIe in PBL
> without further BHIe transfers in SBL.
>
> Signed-off-by: Matthew Leung <quic_mattleun@xxxxxxxxxxx>
> Reviewed-by: Youssef Samir <quic_yabdulra@xxxxxxxxxxx>
> Reviewed-by: Jeffrey Hugo <quic_jhugo@xxxxxxxxxxx>
> Signed-off-by: Jeffrey Hugo <quic_jhugo@xxxxxxxxxxx>
> ---
> drivers/bus/mhi/host/boot.c | 80 +++++++++++++++++++++++++++------
> drivers/bus/mhi/host/init.c | 2 +-
> drivers/bus/mhi/host/internal.h | 8 ++++
> 3 files changed, 75 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/bus/mhi/host/boot.c b/drivers/bus/mhi/host/boot.c
> index e3f3c07166ad..c9ecb6427209 100644
> --- a/drivers/bus/mhi/host/boot.c
> +++ b/drivers/bus/mhi/host/boot.c
> @@ -452,12 +452,62 @@ static void mhi_firmware_copy_bhie(struct mhi_controller *mhi_cntrl,
> }
> }
>
> +static enum mhi_fw_load_type mhi_fw_load_type_get(const struct mhi_controller *mhi_cntrl)
> +{
> + enum mhi_fw_load_type ret = MHI_FW_LOAD_UNKNOWN;
> +
> + if (mhi_cntrl->fbc_download) {
> + if (mhi_cntrl->bhie && mhi_cntrl->seg_len)
> + ret = MHI_FW_LOAD_FBC;
> + } else {
> + if (mhi_cntrl->bhie && mhi_cntrl->seg_len)
> + ret = MHI_FW_LOAD_BHIE;
> + else
> + ret = MHI_FW_LOAD_BHI;
> + }
> + return ret;
> +}
> +
> +static int mhi_send_image_bhi(struct mhi_controller *mhi_cntrl, const u8 *fw_data, size_t size)
> +{
> + struct image_info *image;
> + int ret;
> +
> + ret = mhi_alloc_bhi_buffer(mhi_cntrl, &image, size);
> + if (ret)
> + return ret;
> +
> + mhi_firmware_copy_bhi(mhi_cntrl, fw_data, size, image);
> +
> + ret = mhi_fw_load_bhi(mhi_cntrl, &image->mhi_buf[image->entries - 1]);
> + mhi_free_bhi_buffer(mhi_cntrl, image);
> +
> + return ret;
> +}
> +
> +static int mhi_send_image_bhie(struct mhi_controller *mhi_cntrl, const u8 *fw_data, size_t size)
> +{
> + struct image_info *image;
> + int ret;
> +
> + ret = mhi_alloc_bhie_table(mhi_cntrl, &image, size);
> + if (ret)
> + return ret;
> +
> + mhi_firmware_copy_bhie(mhi_cntrl, fw_data, size, image);
> +
> + ret = mhi_fw_load_bhie(mhi_cntrl, &image->mhi_buf[image->entries - 1]);
> + mhi_free_bhie_table(mhi_cntrl, image);
> +
> + return ret;
> +}
> +
> 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_fw_load_type fw_load_type;
> enum mhi_pm_state new_state;
> - struct image_info *image;
> const char *fw_name;
> const u8 *fw_data;
> size_t size, fw_sz;
> @@ -481,6 +531,12 @@ void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl)
> fw_name = (mhi_cntrl->ee == MHI_EE_EDL) ?
> mhi_cntrl->edl_image : mhi_cntrl->fw_image;
>
> + fw_load_type = mhi_fw_load_type_get(mhi_cntrl);
> + if (fw_load_type == MHI_FW_LOAD_UNKNOWN) {
> + dev_err(dev, "Cannot load FW as load type is UNKNOWN\n");
> + return;
> + }
> +
> /* check if the driver has already provided the firmware data */
> if (!fw_name && mhi_cntrl->fbc_download &&
> mhi_cntrl->fw_data && mhi_cntrl->fw_sz) {
> @@ -518,20 +574,16 @@ void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl)
> fw_sz = firmware->size;
>
> skip_req_fw:
> - ret = mhi_alloc_bhi_buffer(mhi_cntrl, &image, size);
> - if (ret) {
> - release_firmware(firmware);
> - goto error_fw_load;
> - }
> - mhi_firmware_copy_bhi(mhi_cntrl, fw_data, size, image);
> -
> - /* Download image using BHI */
> - ret = mhi_fw_load_bhi(mhi_cntrl, image->mhi_buf);
> - mhi_free_bhi_buffer(mhi_cntrl, image);
> + if (fw_load_type == MHI_FW_LOAD_BHIE)
> + ret = mhi_send_image_bhie(mhi_cntrl, fw_data, size);
> + else
> + ret = mhi_send_image_bhi(mhi_cntrl, fw_data, size);
>
> /* Error or in EDL mode, we're done */
> 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%s, ret: %d\n",
> + fw_load_type == MHI_FW_LOAD_BHIE ? "e" : "",
> + ret);
> release_firmware(firmware);
> goto error_fw_load;
> }
> @@ -550,7 +602,7 @@ void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl)
> * If we're doing fbc, populate vector tables while
> * device transitioning into MHI READY state
> */
> - if (mhi_cntrl->fbc_download) {
> + if (fw_load_type == MHI_FW_LOAD_FBC) {
> ret = mhi_alloc_bhie_table(mhi_cntrl, &mhi_cntrl->fbc_image, fw_sz);
> if (ret) {
> release_firmware(firmware);
> @@ -575,7 +627,7 @@ void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl)
> return;
>
> error_ready_state:
> - if (mhi_cntrl->fbc_download) {
> + if (fw_load_type == MHI_FW_LOAD_FBC) {
> mhi_free_bhie_table(mhi_cntrl, mhi_cntrl->fbc_image);
> mhi_cntrl->fbc_image = NULL;
> }
> diff --git a/drivers/bus/mhi/host/init.c b/drivers/bus/mhi/host/init.c
> index a9b1f8beee7b..13e7a55f54ff 100644
> --- a/drivers/bus/mhi/host/init.c
> +++ b/drivers/bus/mhi/host/init.c
> @@ -1144,7 +1144,7 @@ int mhi_prepare_for_power_up(struct mhi_controller *mhi_cntrl)
> }
> mhi_cntrl->bhi = mhi_cntrl->regs + bhi_off;
>
> - if (mhi_cntrl->fbc_download || mhi_cntrl->rddm_size) {
> + if (mhi_cntrl->fbc_download || mhi_cntrl->rddm_size || mhi_cntrl->seg_len) {
> ret = mhi_read_reg(mhi_cntrl, mhi_cntrl->regs, BHIEOFF,
> &bhie_off);
> if (ret) {
> diff --git a/drivers/bus/mhi/host/internal.h b/drivers/bus/mhi/host/internal.h
> index 3134f111be35..afcf536083bc 100644
> --- a/drivers/bus/mhi/host/internal.h
> +++ b/drivers/bus/mhi/host/internal.h
> @@ -29,6 +29,14 @@ struct bhi_vec_entry {
> u64 size;
> };
>
> +enum mhi_fw_load_type {
> + MHI_FW_LOAD_UNKNOWN,
> + MHI_FW_LOAD_BHI, /* BHI only in PBL */
> + MHI_FW_LOAD_BHIE, /* BHIe only in PBL */
> + MHI_FW_LOAD_FBC, /* BHI in PBL followed by BHIe in SBL */
> + MHI_FW_LOAD_MAX,
> +};
> +
> enum mhi_ch_state_type {
> MHI_CH_STATE_TYPE_RESET,
> MHI_CH_STATE_TYPE_STOP,
