From: Bjorn Andersson <bjorn.andersson@linaro.org>
To: Bjorn Andersson <bjorn.andersson@linaro.org>,
Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Rob Herring <robh+dt@kernel.org>,
linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 06/13] soc: qcom: mdt_loader: Reorder parts of __qcom_mdt_load()
Date: Thu, 27 Jan 2022 18:55:06 -0800 [thread overview]
Message-ID: <20220128025513.97188-7-bjorn.andersson@linaro.org> (raw)
In-Reply-To: <20220128025513.97188-1-bjorn.andersson@linaro.org>
Move the traversal of the program headers to the start of the function,
to make sure that min_ and max_addr are in scope as the call to
qcom_scm_pas_mem_setup() is moved in the next commit.
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
drivers/soc/qcom/mdt_loader.c | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/drivers/soc/qcom/mdt_loader.c b/drivers/soc/qcom/mdt_loader.c
index 37e2e734bc5d..ee991784a738 100644
--- a/drivers/soc/qcom/mdt_loader.c
+++ b/drivers/soc/qcom/mdt_loader.c
@@ -213,6 +213,22 @@ static int __qcom_mdt_load(struct device *dev, const struct firmware *fw,
ehdr = (struct elf32_hdr *)fw->data;
phdrs = (struct elf32_phdr *)(ehdr + 1);
+ for (i = 0; i < ehdr->e_phnum; i++) {
+ phdr = &phdrs[i];
+
+ if (!mdt_phdr_valid(phdr))
+ continue;
+
+ if (phdr->p_flags & QCOM_MDT_RELOCATABLE)
+ relocate = true;
+
+ if (phdr->p_paddr < min_addr)
+ min_addr = phdr->p_paddr;
+
+ if (phdr->p_paddr + phdr->p_memsz > max_addr)
+ max_addr = ALIGN(phdr->p_paddr + phdr->p_memsz, SZ_4K);
+ }
+
if (pas_init) {
metadata = qcom_mdt_read_metadata(fw, &metadata_len, fw_name, dev);
if (IS_ERR(metadata)) {
@@ -233,22 +249,6 @@ static int __qcom_mdt_load(struct device *dev, const struct firmware *fw,
}
}
- for (i = 0; i < ehdr->e_phnum; i++) {
- phdr = &phdrs[i];
-
- if (!mdt_phdr_valid(phdr))
- continue;
-
- if (phdr->p_flags & QCOM_MDT_RELOCATABLE)
- relocate = true;
-
- if (phdr->p_paddr < min_addr)
- min_addr = phdr->p_paddr;
-
- if (phdr->p_paddr + phdr->p_memsz > max_addr)
- max_addr = ALIGN(phdr->p_paddr + phdr->p_memsz, SZ_4K);
- }
-
if (relocate) {
if (pas_init) {
ret = qcom_scm_pas_mem_setup(pas_id, mem_phys,
--
2.33.1
next prev parent reply other threads:[~2022-01-28 2:54 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-28 2:55 [PATCH 00/13] soc: qcom: mdt_loader: Support Qualcomm SM8450 Bjorn Andersson
2022-01-28 2:55 ` [PATCH 01/13] firmware: qcom: scm: Introduce pas_metadata context Bjorn Andersson
2023-05-24 11:17 ` Robert Marko
2022-01-28 2:55 ` [PATCH 02/13] soc: qcom: mdt_loader: Split out split-file-loader Bjorn Andersson
2022-01-28 2:55 ` [PATCH 03/13] soc: qcom: mdt_loader: Allow hash segment to be split out Bjorn Andersson
2022-01-28 2:55 ` [PATCH 04/13] soc: qcom: mdt_loader: Allow hash to reside in any segment Bjorn Andersson
2022-01-28 2:55 ` [PATCH 05/13] soc: qcom: mdt_loader: Extend check for split firmware Bjorn Andersson
2022-01-28 2:55 ` Bjorn Andersson [this message]
2022-01-28 2:55 ` [PATCH 07/13] soc: qcom: mdt_loader: Always invoke PAS mem_setup Bjorn Andersson
2022-01-28 2:55 ` [PATCH 08/13] soc: qcom: mdt_loader: Extract PAS operations Bjorn Andersson
2022-01-28 2:55 ` [PATCH 09/13] remoteproc: qcom: pas: Carry PAS metadata context Bjorn Andersson
2022-01-28 2:55 ` [PATCH 10/13] dt-bindings: remoteproc: qcom: pas: Add SM8450 PAS compatibles Bjorn Andersson
2022-01-28 2:55 ` [PATCH 11/13] remoteproc: qcom: pas: Add SM8450 remoteproc support Bjorn Andersson
2022-01-28 2:55 ` [PATCH 12/13] arm64: dts: qcom: sm8450: Add remoteproc enablers and instances Bjorn Andersson
2022-02-28 8:13 ` Dmitry Baryshkov
2022-01-28 2:55 ` [PATCH 13/13] arm64: dts: qcom: sm8450-qrd: Enable remoteproc instances Bjorn Andersson
2022-02-03 15:11 ` [PATCH 00/13] soc: qcom: mdt_loader: Support Qualcomm SM8450 Dmitry Baryshkov
2022-02-03 18:20 ` Bjorn Andersson
2022-02-04 18:35 ` (subset) " Bjorn Andersson
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=20220128025513.97188-7-bjorn.andersson@linaro.org \
--to=bjorn.andersson@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=mathieu.poirier@linaro.org \
--cc=robh+dt@kernel.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 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).