bus: mhi: core: Use appropriate names for firmware load functions

mhi_fw_load_sbl() function is currently used to transfer SBL or EDL
images over BHI (Boot Host Interface). Same goes with mhi_fw_load_amss()
which uses BHIe. However, the contents of these functions do not
indicate support for a specific set of images. Since these can be used
for any image download over BHI or BHIe, rename them based on the
protocol used.

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>

diff --git a/drivers/bus/mhi/core/boot.c b/drivers/bus/mhi/core/boot.c
index 6f0cfb9922b45ad75dcce3ebc5083979f624c31c..2d7752cd9cccc173641961a2cfb77577e1bad9a8 100644 (file)
--- a/drivers/bus/mhi/core/boot.c
+++ b/drivers/bus/mhi/core/boot.c
@@ -176,7 +176,7 @@ int mhi_download_rddm_image(struct mhi_controller *mhi_cntrl, bool in_panic)
 }
 EXPORT_SYMBOL_GPL(mhi_download_rddm_image);
 
-static int mhi_fw_load_amss(struct mhi_controller *mhi_cntrl,
+static int mhi_fw_load_bhie(struct mhi_controller *mhi_cntrl,
                            const struct mhi_buf *mhi_buf)
 {
        void __iomem *base = mhi_cntrl->bhie;
@@ -192,7 +192,7 @@ static int mhi_fw_load_amss(struct mhi_controller *mhi_cntrl,
        }
 
        sequence_id = MHI_RANDOM_U32_NONZERO(BHIE_TXVECSTATUS_SEQNUM_BMSK);
-       dev_dbg(dev, "Starting AMSS download via BHIe. Sequence ID:%u\n",
+       dev_dbg(dev, "Starting image download via BHIe. Sequence ID: %u\n",
                sequence_id);
        mhi_write_reg(mhi_cntrl, base, BHIE_TXVECADDR_HIGH_OFFS,
                      upper_32_bits(mhi_buf->dma_addr));
@@ -223,7 +223,7 @@ static int mhi_fw_load_amss(struct mhi_controller *mhi_cntrl,
        return (!ret) ? -ETIMEDOUT : 0;
 }
 
-static int mhi_fw_load_sbl(struct mhi_controller *mhi_cntrl,
+static int mhi_fw_load_bhi(struct mhi_controller *mhi_cntrl,
                           dma_addr_t dma_addr,
                           size_t size)
 {
@@ -250,7 +250,7 @@ static int mhi_fw_load_sbl(struct mhi_controller *mhi_cntrl,
        }
 
        session_id = MHI_RANDOM_U32_NONZERO(BHI_TXDB_SEQNUM_BMSK);
-       dev_dbg(dev, "Starting SBL download via BHI. Session ID:%u\n",
+       dev_dbg(dev, "Starting image download via BHI. Session ID: %u\n",
                session_id);
        mhi_write_reg(mhi_cntrl, base, BHI_STATUS, 0);
        mhi_write_reg(mhi_cntrl, base, BHI_IMGADDR_HIGH,
@@ -449,9 +449,9 @@ void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl)
                return;
        }
 
-       /* Download SBL image */
+       /* Download image using BHI */
        memcpy(buf, firmware->data, size);
-       ret = mhi_fw_load_sbl(mhi_cntrl, dma_addr, size);
+       ret = mhi_fw_load_bhi(mhi_cntrl, dma_addr, size);
        mhi_free_coherent(mhi_cntrl, size, buf, dma_addr);
 
        if (!mhi_cntrl->fbc_download || ret || mhi_cntrl->ee == MHI_EE_EDL)
@@ -459,7 +459,7 @@ void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl)
 
        /* Error or in EDL mode, we're done */
        if (ret) {
-               dev_err(dev, "MHI did not load SBL, ret:%d\n", ret);
+               dev_err(dev, "MHI did not load image over BHI, ret: %d\n", ret);
                return;
        }
 
@@ -509,11 +509,12 @@ fw_load_ee_pthru:
 
        /* Start full firmware image download */
        image_info = mhi_cntrl->fbc_image;
-       ret = mhi_fw_load_amss(mhi_cntrl,
+       ret = mhi_fw_load_bhie(mhi_cntrl,
                               /* Vector table is the last entry */
                               &image_info->mhi_buf[image_info->entries - 1]);
        if (ret)
-               dev_err(dev, "MHI did not load AMSS, ret:%d\n", ret);
+               dev_err(dev, "MHI did not load image over BHIe, ret: %d\n",
+                       ret);
 
        release_firmware(firmware);