[07/13] soc: qcom: mdt_loader: Always invoke PAS mem_setup

Message ID	20220128025513.97188-8-bjorn.andersson@linaro.org
State	Accepted
Commit	ebeb20a9cd3f045a3371ccf3782b6cbcce62a7c9
Headers	show Return-Path: <devicetree-owner@kernel.org> 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 07/13] soc: qcom: mdt_loader: Always invoke PAS mem_setup Date: Thu, 27 Jan 2022 18:55:07 -0800 Message-Id: <20220128025513.97188-8-bjorn.andersson@linaro.org> In-Reply-To: <20220128025513.97188-1-bjorn.andersson@linaro.org> References: <20220128025513.97188-1-bjorn.andersson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	soc: qcom: mdt_loader: Support Qualcomm SM8450 \| expand [00/13] soc: qcom: mdt_loader: Support Qualcomm SM8450 [01/13] firmware: qcom: scm: Introduce pas_metadata context [02/13] soc: qcom: mdt_loader: Split out split-file-loader [03/13] soc: qcom: mdt_loader: Allow hash segment to be split out [04/13] soc: qcom: mdt_loader: Allow hash to reside in any segment [05/13] soc: qcom: mdt_loader: Extend check for split firmware [06/13] soc: qcom: mdt_loader: Reorder parts of __qcom_mdt_load() [07/13] soc: qcom: mdt_loader: Always invoke PAS mem_setup [08/13] soc: qcom: mdt_loader: Extract PAS operations [09/13] remoteproc: qcom: pas: Carry PAS metadata context [10/13] dt-bindings: remoteproc: qcom: pas: Add SM8450 PAS compatibles [11/13] remoteproc: qcom: pas: Add SM8450 remoteproc support [12/13] arm64: dts: qcom: sm8450: Add remoteproc enablers and instances [13/13] arm64: dts: qcom: sm8450-qrd: Enable remoteproc instances

Message ID

20220128025513.97188-8-bjorn.andersson@linaro.org

State

Accepted

Commit

ebeb20a9cd3f045a3371ccf3782b6cbcce62a7c9

Headers

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 07/13] soc: qcom: mdt_loader: Always invoke PAS mem_setup
Date: Thu, 27 Jan 2022 18:55:07 -0800
Message-Id: <20220128025513.97188-8-bjorn.andersson@linaro.org>
In-Reply-To: <20220128025513.97188-1-bjorn.andersson@linaro.org>
References: <20220128025513.97188-1-bjorn.andersson@linaro.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

soc: qcom: mdt_loader: Support Qualcomm SM8450 | expand

Commit Message

Bjorn Andersson Jan. 28, 2022, 2:55 a.m. UTC

After spelunking various old kernel trees no finds has been found
indicating that the PAS mem_setup call should actually be made
conditional on the image being relocatable.

Group the two PAS operations together, to facilitate splitting them out
in a following patch.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
 drivers/soc/qcom/mdt_loader.c | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/drivers/soc/qcom/mdt_loader.c b/drivers/soc/qcom/mdt_loader.c
index ee991784a738..c8d43dc50cff 100644
--- a/drivers/soc/qcom/mdt_loader.c
+++ b/drivers/soc/qcom/mdt_loader.c
@@ -247,20 +247,17 @@  static int __qcom_mdt_load(struct device *dev, const struct firmware *fw,
 				ret, fw_name);
 			goto out;
 		}
-	}
 
-	if (relocate) {
-		if (pas_init) {
-			ret = qcom_scm_pas_mem_setup(pas_id, mem_phys,
-						     max_addr - min_addr);
-			if (ret) {
-				/* Unable to set up relocation */
-				dev_err(dev, "error %d setting up firmware %s\n",
-					ret, fw_name);
-				goto out;
-			}
+		ret = qcom_scm_pas_mem_setup(pas_id, mem_phys, max_addr - min_addr);
+		if (ret) {
+			/* Unable to set up relocation */
+			dev_err(dev, "error %d setting up firmware %s\n",
+				ret, fw_name);
+			goto out;
 		}
+	}
 
+	if (relocate) {
 		/*
 		 * The image is relocatable, so offset each segment based on
 		 * the lowest segment address.

[07/13] soc: qcom: mdt_loader: Always invoke PAS mem_setup

Commit Message

Patch