From: Melody Olvera <quic_molvera@quicinc.com>
To: Andy Gross <agross@kernel.org>,
Bjorn Andersson <andersson@kernel.org>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Jassi Brar <jassisinghbrar@gmail.com>,
Mathieu Poirier <mathieu.poirier@linaro.org>,
Robert Marko <robimarko@gmail.com>,
Guru Das Srinagesh <quic_gurus@quicinc.com>
Cc: Konrad Dybcio <konrad.dybcio@linaro.org>,
Manivannan Sadhasivam <mani@kernel.org>,
Melody Olvera <quic_molvera@quicinc.com>,
<linux-arm-msm@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-kernel@vger.kernel.org>,
<linux-remoteproc@vger.kernel.org>,
"Gokul Krishna Krishnakumar" <quic_gokukris@quicinc.com>
Subject: [PATCH 6/9] soc: qcom: mdt_loader: Enhance split binary detection
Date: Mon, 13 Feb 2023 10:52:15 -0800 [thread overview]
Message-ID: <20230213185218.166520-7-quic_molvera@quicinc.com> (raw)
In-Reply-To: <20230213185218.166520-1-quic_molvera@quicinc.com>
From: Gokul Krishna Krishnakumar <quic_gokukris@quicinc.com>
When booting with split binaries, it is possible that the
mdt loader misdetects if a binary is split and only loads
one of the segments, so enhance the detection of the split
binaries to ensure the entirety of the firmware is loaded.
Signed-off-by: Gokul Krishna Krishnakumar <quic_gokukris@quicinc.com>
Signed-off-by: Melody Olvera <quic_molvera@quicinc.com>
---
drivers/soc/qcom/mdt_loader.c | 64 +++++++++++++++++++----------------
1 file changed, 35 insertions(+), 29 deletions(-)
diff --git a/drivers/soc/qcom/mdt_loader.c b/drivers/soc/qcom/mdt_loader.c
index 33dd8c315eb7..3aadce299c02 100644
--- a/drivers/soc/qcom/mdt_loader.c
+++ b/drivers/soc/qcom/mdt_loader.c
@@ -31,6 +31,26 @@ static bool mdt_phdr_valid(const struct elf32_phdr *phdr)
return true;
}
+static bool qcom_mdt_bins_are_split(const struct firmware *fw)
+{
+ const struct elf32_phdr *phdrs;
+ const struct elf32_hdr *ehdr;
+ uint64_t seg_start, seg_end;
+ int i;
+
+ ehdr = (struct elf32_hdr *)fw->data;
+ phdrs = (struct elf32_phdr *)(ehdr + 1);
+
+ for (i = 0; i < ehdr->e_phnum; i++) {
+ seg_start = phdrs[i].p_offset;
+ seg_end = phdrs[i].p_offset + phdrs[i].p_filesz;
+ if (seg_start > fw->size || seg_end > fw->size)
+ return true;
+ }
+
+ return false;
+}
+
static ssize_t mdt_load_split_segment(void *ptr, const struct elf32_phdr *phdrs,
unsigned int segment, const char *fw_name,
struct device *dev)
@@ -167,23 +187,13 @@ void *qcom_mdt_read_metadata(const struct firmware *fw, size_t *data_len,
/* Copy ELF header */
memcpy(data, fw->data, ehdr_size);
- if (ehdr_size + hash_size == fw->size) {
- /* Firmware is split and hash is packed following the ELF header */
- hash_offset = phdrs[0].p_filesz;
- memcpy(data + ehdr_size, fw->data + hash_offset, hash_size);
- } else if (phdrs[hash_segment].p_offset + hash_size <= fw->size) {
- /* Hash is in its own segment, but within the loaded file */
+
+ if (qcom_mdt_bins_are_split(fw)) {
+ ret = mdt_load_split_segment(data + ehdr_size, phdrs, hash_segment, fw_name, dev);
+ } else {
hash_offset = phdrs[hash_segment].p_offset;
memcpy(data + ehdr_size, fw->data + hash_offset, hash_size);
- } else {
- /* Hash is in its own segment, beyond the loaded file */
- ret = mdt_load_split_segment(data + ehdr_size, phdrs, hash_segment, fw_name, dev);
- if (ret) {
- kfree(data);
- return ERR_PTR(ret);
- }
}
-
*data_len = ehdr_size + hash_size;
return data;
@@ -270,6 +280,7 @@ static int __qcom_mdt_load(struct device *dev, const struct firmware *fw,
phys_addr_t min_addr = PHYS_ADDR_MAX;
ssize_t offset;
bool relocate = false;
+ bool is_split;
void *ptr;
int ret = 0;
int i;
@@ -277,6 +288,7 @@ static int __qcom_mdt_load(struct device *dev, const struct firmware *fw,
if (!fw || !mem_region || !mem_phys || !mem_size)
return -EINVAL;
+ is_split = qcom_mdt_bins_are_split(fw);
ehdr = (struct elf32_hdr *)fw->data;
phdrs = (struct elf32_phdr *)(ehdr + 1);
@@ -330,22 +342,16 @@ static int __qcom_mdt_load(struct device *dev, const struct firmware *fw,
ptr = mem_region + offset;
- if (phdr->p_filesz && phdr->p_offset < fw->size &&
- phdr->p_offset + phdr->p_filesz <= fw->size) {
- /* Firmware is large enough to be non-split */
- if (phdr->p_offset + phdr->p_filesz > fw->size) {
- dev_err(dev, "file %s segment %d would be truncated\n",
- fw_name, i);
- ret = -EINVAL;
- break;
+ if (phdr->p_filesz) {
+ if (!is_split) {
+ /* Firmware is large enough to be non-split */
+ memcpy(ptr, fw->data + phdr->p_offset, phdr->p_filesz);
+ } else {
+ /* Firmware not large enough, load split-out segments */
+ ret = mdt_load_split_segment(ptr, phdrs, i, fw_name, dev);
+ if (ret)
+ break;
}
-
- memcpy(ptr, fw->data + phdr->p_offset, phdr->p_filesz);
- } else if (phdr->p_filesz) {
- /* Firmware not large enough, load split-out segments */
- ret = mdt_load_split_segment(ptr, phdrs, i, fw_name, dev);
- if (ret)
- break;
}
if (phdr->p_memsz > phdr->p_filesz)
--
2.25.1
next prev parent reply other threads:[~2023-02-13 18:53 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-13 18:52 [PATCH 0/9] remoteproc: qcom_q6v5_pas: Add support for QDU1000/QRU1000 mpss Melody Olvera
2023-02-13 18:52 ` [PATCH 1/9] dt-bindings: firmware: qcom,scm: Update QDU1000/QRU1000 compatible Melody Olvera
2023-02-14 8:22 ` Krzysztof Kozlowski
2023-02-13 18:52 ` [PATCH 2/9] dt-bindings: mailbox: qcom-ipcc: Add compatible for QDU1000/QRU1000 Melody Olvera
2023-02-14 8:22 ` Krzysztof Kozlowski
2023-02-13 18:52 ` [PATCH 3/9] dt-bindings: soc: qcom: aoss: Document power-domain-cells for aoss Melody Olvera
2023-02-14 8:25 ` Krzysztof Kozlowski
2023-02-14 21:21 ` Melody Olvera
2023-02-14 17:52 ` Bjorn Andersson
2023-02-14 21:20 ` Melody Olvera
2023-02-13 18:52 ` [PATCH 5/9] dt-bindings: remoteproc: mpss: Document QDU1000/QRU1000 mpss devices Melody Olvera
2023-02-14 8:28 ` Krzysztof Kozlowski
2023-02-14 21:23 ` Melody Olvera
2023-02-15 20:20 ` Krzysztof Kozlowski
2023-02-14 16:12 ` Rob Herring
2023-02-13 18:52 ` Melody Olvera [this message]
2023-02-14 17:37 ` [PATCH 6/9] soc: qcom: mdt_loader: Enhance split binary detection Bjorn Andersson
2023-02-13 18:52 ` [PATCH 7/9] remoteproc: qcom: q6v5: Add support for q6 rmb registers Melody Olvera
2023-02-13 18:52 ` [PATCH 8/9] remoteproc: qcom_q6v5_pas: Add support to attach a DSP Melody Olvera
2023-02-13 18:52 ` [PATCH 9/9] remoteproc: qcom_q6v5_pas: Add QDU1000/QRU1000 mpss compatible & data Melody Olvera
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=20230213185218.166520-7-quic_molvera@quicinc.com \
--to=quic_molvera@quicinc.com \
--cc=agross@kernel.org \
--cc=andersson@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=jassisinghbrar@gmail.com \
--cc=konrad.dybcio@linaro.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=mani@kernel.org \
--cc=mathieu.poirier@linaro.org \
--cc=quic_gokukris@quicinc.com \
--cc=quic_gurus@quicinc.com \
--cc=robh+dt@kernel.org \
--cc=robimarko@gmail.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).