From: Bhaumik Bhatt <bbhatt@codeaurora.org>
To: manivannan.sadhasivam@linaro.org
Cc: linux-arm-msm@vger.kernel.org, hemantk@codeaurora.org,
jhugo@codeaurora.org, linux-kernel@vger.kernel.org,
Bhaumik Bhatt <bbhatt@codeaurora.org>
Subject: [PATCH v1 01/10] bus: mhi: core: Use appropriate names for firmware load functions
Date: Fri, 18 Sep 2020 19:02:26 -0700 [thread overview]
Message-ID: <1600480955-16827-2-git-send-email-bbhatt@codeaurora.org> (raw)
In-Reply-To: <1600480955-16827-1-git-send-email-bbhatt@codeaurora.org>
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>
---
drivers/bus/mhi/core/boot.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/bus/mhi/core/boot.c b/drivers/bus/mhi/core/boot.c
index 24422f5..92b8dd3 100644
--- a/drivers/bus/mhi/core/boot.c
+++ b/drivers/bus/mhi/core/boot.c
@@ -171,7 +171,7 @@ int mhi_download_rddm_img(struct mhi_controller *mhi_cntrl, bool in_panic)
}
EXPORT_SYMBOL_GPL(mhi_download_rddm_img);
-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;
@@ -187,7 +187,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));
@@ -218,7 +218,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)
{
@@ -245,7 +245,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,
@@ -446,9 +446,9 @@ void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl)
return;
}
- /* Download SBL image */
+ /* Download SBL or EDL 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)
@@ -456,7 +456,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 SBL/EDL image, ret:%d\n", ret);
return;
}
@@ -506,7 +506,7 @@ void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl)
/* 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)
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
next prev parent reply other threads:[~2020-09-19 2:03 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-19 2:02 [PATCH v1 00/10] Bug fixes and improvements for MHI power operations Bhaumik Bhatt
2020-09-19 2:02 ` Bhaumik Bhatt [this message]
2020-10-09 15:23 ` [PATCH v1 01/10] bus: mhi: core: Use appropriate names for firmware load functions Manivannan Sadhasivam
2020-09-19 2:02 ` [PATCH v1 02/10] bus: mhi: core: Move to using high priority workqueue Bhaumik Bhatt
2020-10-09 15:49 ` Manivannan Sadhasivam
2020-09-19 2:02 ` [PATCH v1 03/10] bus: mhi: core: Skip device wake in error or shutdown states Bhaumik Bhatt
2020-10-09 15:54 ` Manivannan Sadhasivam
2020-09-19 2:02 ` [PATCH v1 04/10] bus: mhi: core: Use the IRQF_ONESHOT flag for the BHI interrupt line Bhaumik Bhatt
2020-10-09 15:57 ` Manivannan Sadhasivam
2020-10-09 16:04 ` Jeffrey Hugo
2020-10-12 23:52 ` Bhaumik Bhatt
2020-09-19 2:02 ` [PATCH v1 05/10] bus: mhi: core: Disable IRQs when powering down Bhaumik Bhatt
2020-10-09 16:02 ` Manivannan Sadhasivam
2020-10-13 0:03 ` Bhaumik Bhatt
2020-10-10 23:45 ` Manu Gautam
2020-09-19 2:02 ` [PATCH v1 06/10] bus: mhi: core: Improve shutdown handling after link down detection Bhaumik Bhatt
2020-10-09 16:19 ` Manivannan Sadhasivam
2020-10-13 18:40 ` Bhaumik Bhatt
2020-10-11 0:06 ` Manu Gautam
2020-09-19 2:02 ` [PATCH v1 07/10] bus: mhi: core: Move to SYS_ERROR regardless of RDDM capability Bhaumik Bhatt
2020-10-09 16:32 ` Manivannan Sadhasivam
2020-10-14 1:06 ` Bhaumik Bhatt
2020-09-19 2:02 ` [PATCH v1 08/10] bus: mhi: core: Move to an error state on any firmware load failure Bhaumik Bhatt
2020-10-09 16:42 ` Manivannan Sadhasivam
2020-10-14 1:37 ` Bhaumik Bhatt
2020-09-19 2:02 ` [PATCH v1 09/10] bus: mhi: core: Move to an error state on mission mode failure Bhaumik Bhatt
2020-10-09 16:44 ` Manivannan Sadhasivam
2020-09-19 2:02 ` [PATCH v1 10/10] bus: mhi: core: Mark device inactive soon after host issues a shutdown Bhaumik Bhatt
2020-10-09 17:18 ` Manivannan Sadhasivam
2020-10-11 0:17 ` Manu Gautam
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=1600480955-16827-2-git-send-email-bbhatt@codeaurora.org \
--to=bbhatt@codeaurora.org \
--cc=hemantk@codeaurora.org \
--cc=jhugo@codeaurora.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=manivannan.sadhasivam@linaro.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.