* [PATCH v3 0/4] Add Glymur OOBMSS support
@ 2026-11-18 15:36 Anvesh Jain P
2026-11-18 15:36 ` [PATCH v3 1/4] dt-bindings: remoteproc: qcom: Add Glymur OOBMSS PAS Anvesh Jain P
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Anvesh Jain P @ 2026-11-18 15:36 UTC (permalink / raw)
To: Bjorn Andersson, Mathieu Poirier, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Jain P
Cc: linux-arm-msm, linux-remoteproc, devicetree, linux-kernel,
Krzysztof Kozlowski, Mukesh Ojha
Out-of-Band Management Subsystem (OOBMSS) is managed by a common remote
processor and consists of two Zephyr subsystems:
+----------------------------------------------------------+
| OOBMSS |
| |
| +------------------------+ +------------------------+ |
| | OOB-TEE | | OOB-Non-Secure | |
| | Primary processor | | Auxiliary processor | |
| | Primary image and DTB | | Secondary image and DTB| |
| +------------------------+ +------------------------+ |
+----------------------------------------------------------+
The primary processor is the Out-of-Band Trusted Execution Environment
(OOB-TEE) processor. The OOB-Non-Secure processor is an auxiliary processor
that depends on the primary processor and cannot function independently.
The PAS remoteproc driver currently supports one primary image and its
optional DTB. OOBMSS additionally requires the secondary image and DTB
to be loaded, authenticated, mapped, shut down, and released through
their own PAS identifiers and carveouts.
The series adds the OOBMSS device-tree binding, generic support for
secondary images, Glymur-specific PAS parameters, and coredump support
for PAS remoteprocs with secondary processors.
The OOB diagnostic path also requires Diag Router support in userspace.
The related open-source work is available at:
https://github.com/linux-msm/diag/pull/26
---
Changes in v3:
- Release auxiliary firmware after loading and on start failure paths.
- Shut down the secondary firmware and DTB before the primary firmware and DTB.
- Allocate DTB and secondary PAS contexts independently.
- Continue primary coredump collection if secondary mapping fails.
- Register dump segments from firmware images instead of whole
carveouts.
- Move secondary dump-segment registration from probe to firmware loading.
- Map PAS regions only during collection and unmap them afterward.
- Place the Glymur OOBMSS PAS entry before the Glymur SOCCP entry.
- Add Reviewed-by tags.
- Rebase on v7.4-rc3
- Link to v2: https://patch.msgid.link/20261015-oob-support-glymur-v2-0-715435f52dd7@oss.qualcomm.com
Changes in v2:
- Drop the redundant “binding” from the subject.
- Rename the binding file to match the compatible.
- Remove the IPCC definitions and invocation from the example.
- Make the coredump commit generic for PAS remoteprocs with secondary
processors.
- Shut down authenticated auxiliary processors before unmapping carveouts
on start failure.
- Release TrustZone metadata on all MDT load failure paths.
- Assign secondary PAS IDs only when the corresponding firmware names are
available.
- Keep PAS carveout mappings active while coredump and debugfs trace
readers access remoteproc memory, avoiding a use-after-unmap race.
- Support coredumps for relocatable PAS firmware.
- Free registered dump segments when removing the remoteproc.
- Move the Glymur OOBMSS PAS parameters patch to the end of the series.
- Link to v1: https://patch.msgid.link/20261009-oob-support-glymur-v1-0-96cc8ffcced3@oss.qualcomm.com
To: Bjorn Andersson <andersson@kernel.org>
To: Mathieu Poirier <mathieu.poirier@linaro.org>
To: Rob Herring <robh@kernel.org>
To: Krzysztof Kozlowski <krzk+dt@kernel.org>
To: Conor Dooley <conor+dt@kernel.org>
To: Jain P <anvesh.p@oss.qualcomm.com>
Cc: linux-arm-msm@vger.kernel.org
Cc: linux-remoteproc@vger.kernel.org
Cc: devicetree@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
---
Anvesh Jain P (4):
dt-bindings: remoteproc: qcom: Add Glymur OOBMSS PAS
remoteproc: qcom: pas: Support secondary images
remoteproc: qcom: pas: Add coredump support for secondary processors
remoteproc: qcom: pas: Add Glymur OOBMSS PAS parameters
.../remoteproc/qcom,glymur-oobmss-pas.yaml | 154 +++++++++
drivers/remoteproc/qcom_q6v5_pas.c | 358 +++++++++++++++++++--
2 files changed, 477 insertions(+), 35 deletions(-)
---
base-commit: aebb7274476403040d582c61478df8f4a7bf9cd3
change-id: 20260923-oob-support-glymur-a9945a5328bc
Best regards,
--
Anvesh Jain P <anvesh.p@oss.qualcomm.com>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3 1/4] dt-bindings: remoteproc: qcom: Add Glymur OOBMSS PAS
2026-11-18 15:36 [PATCH v3 0/4] Add Glymur OOBMSS support Anvesh Jain P
@ 2026-11-18 15:36 ` Anvesh Jain P
2026-11-18 15:36 ` [PATCH v3 2/4] remoteproc: qcom: pas: Support secondary images Anvesh Jain P
` (2 subsequent siblings)
3 siblings, 0 replies; 8+ messages in thread
From: Anvesh Jain P @ 2026-11-18 15:36 UTC (permalink / raw)
To: Bjorn Andersson, Mathieu Poirier, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Jain P
Cc: linux-arm-msm, linux-remoteproc, devicetree, linux-kernel,
Krzysztof Kozlowski
Document the Glymur OOBMSS PAS node with its secure GLink edge,
shared-memory signaling, firmware carveouts, and power resources.
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
Signed-off-by: Anvesh Jain P <anvesh.p@oss.qualcomm.com>
---
.../remoteproc/qcom,glymur-oobmss-pas.yaml | 154 +++++++++++++++++++++
1 file changed, 154 insertions(+)
diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,glymur-oobmss-pas.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,glymur-oobmss-pas.yaml
new file mode 100644
index 000000000000..3aa96d2262f1
--- /dev/null
+++ b/Documentation/devicetree/bindings/remoteproc/qcom,glymur-oobmss-pas.yaml
@@ -0,0 +1,154 @@
+# SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/remoteproc/qcom,glymur-oobmss-pas.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Qualcomm Glymur Out-of-Band Management Subsystem (OOBMSS) PAS
+
+maintainers:
+ - Anvesh Jain P <anvesh.p@oss.qualcomm.com>
+
+description: |
+ Qualcomm Glymur Out-of-Band Management Subsystem (OOBMSS) contains two
+ processors running Zephyr, managed together as one remoteproc instance.
+ The Out-of-Band Trusted Execution Environment (OOB-TEE) is the primary
+ processor. The OOB-Non-Secure processor is an auxiliary processor that
+ depends on the primary processor and cannot function independently.
+
+ The primary processor runs the primary image, while the auxiliary
+ processor runs the secondary image. Each processor has its own DTB.
+ The two images and their DTBs have separate PAS identifiers for
+ authentication and dedicated reserved-memory carveouts.
+
+ OOBMSS is booted by earlier-stage firmware and uses an XO clock and the
+ CX and MX power domains. Shared Memory Point-to-Point (SMP2P) provides
+ boot, shutdown, handover and ping/pong signaling, as well as fatal error
+ notifications. The subsystem exposes a secure GLink edge to the host,
+ with doorbell interrupts provided by the Inter-Processor Communication
+ Controller (IPCC).
+
+properties:
+ compatible:
+ enum:
+ - qcom,glymur-oobmss-pas
+
+ reg:
+ maxItems: 1
+
+ interrupts:
+ items:
+ - description: Watchdog interrupt
+ - description: Fatal interrupt
+ - description: Ready interrupt
+ - description: Handover interrupt
+ - description: Stop acknowledge interrupt
+ - description: Pong interrupt
+
+ interrupt-names:
+ items:
+ - const: wdog
+ - const: fatal
+ - const: ready
+ - const: handover
+ - const: stop-ack
+ - const: pong
+
+ clocks:
+ items:
+ - description: XO clock
+
+ clock-names:
+ items:
+ - const: xo
+
+ power-domains:
+ items:
+ - description: CX power domain
+ - description: MX power domain
+
+ power-domain-names:
+ items:
+ - const: cx
+ - const: mx
+
+ memory-region:
+ items:
+ - description: Secure firmware carveout
+ - description: Secure device tree carveout
+ - description: Non-secure firmware carveout
+ - description: Non-secure device tree carveout
+
+ firmware-name:
+ items:
+ - description: Secure firmware
+ - description: Secure device tree firmware
+ - description: Non-secure firmware
+ - description: Non-secure device tree firmware
+
+ qcom,smem-states:
+ minItems: 2
+ description: States used by the AP to signal OOBMSS
+
+ qcom,smem-state-names:
+ minItems: 2
+ description: The names of the state bits used for SMP2P output
+
+required:
+ - compatible
+ - reg
+ - power-domains
+ - power-domain-names
+ - memory-region
+
+allOf:
+ - $ref: /schemas/remoteproc/qcom,pas-common.yaml#
+
+unevaluatedProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/clock/qcom,rpmh.h>
+ #include <dt-bindings/interrupt-controller/arm-gic.h>
+ #include <dt-bindings/interrupt-controller/irq.h>
+ #include <dt-bindings/mailbox/qcom-ipcc.h>
+ #include <dt-bindings/power/qcom,rpmhpd.h>
+
+ remoteproc@1f000000 {
+ compatible = "qcom,glymur-oobmss-pas";
+ reg = <0x1f000000 0x30000>;
+
+ interrupts-extended = <&intc GIC_SPI 86 IRQ_TYPE_EDGE_RISING>,
+ <&smp2p_oobmss_in 0 IRQ_TYPE_EDGE_RISING>,
+ <&smp2p_oobmss_in 1 IRQ_TYPE_EDGE_RISING>,
+ <&smp2p_oobmss_in 2 IRQ_TYPE_EDGE_RISING>,
+ <&smp2p_oobmss_in 3 IRQ_TYPE_EDGE_RISING>,
+ <&smp2p_oobmss_in 9 IRQ_TYPE_EDGE_RISING>;
+ interrupt-names = "wdog", "fatal", "ready", "handover", "stop-ack", "pong";
+
+ clocks = <&rpmhcc RPMH_CXO_CLK>;
+ clock-names = "xo";
+ power-domains = <&rpmhpd RPMHPD_CX>,
+ <&rpmhpd RPMHPD_MX>;
+ power-domain-names = "cx", "mx";
+
+ memory-region = <&oob_secure_mem>, <&oobdtbqc_mem>,
+ <&oob_nonsecure_mem>, <&oobdtboem_mem>;
+ firmware-name = "qcom/glymur/oobmss_tee.mbn",
+ "qcom/glymur/oobmss_qc_dtb.mbn",
+ "qcom/glymur/oobmss_ns.mbn",
+ "qcom/glymur/oobmss_oem_dtb.mbn";
+ qcom,smem-states = <&smp2p_oobmss_out 1>,
+ <&smp2p_oobmss_out 8>;
+ qcom,smem-state-names = "stop", "ping";
+
+ glink-edge {
+ interrupts-extended = <&ipcc 56
+ IPCC_MPROC_SIGNAL_GLINK_QMP
+ IRQ_TYPE_EDGE_RISING>;
+ mboxes = <&ipcc 56 IPCC_MPROC_SIGNAL_GLINK_QMP>;
+ label = "oobmss";
+ qcom,remote-pid = <20>;
+ };
+
+ };
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v3 2/4] remoteproc: qcom: pas: Support secondary images
2026-11-18 15:36 [PATCH v3 0/4] Add Glymur OOBMSS support Anvesh Jain P
2026-11-18 15:36 ` [PATCH v3 1/4] dt-bindings: remoteproc: qcom: Add Glymur OOBMSS PAS Anvesh Jain P
@ 2026-11-18 15:36 ` Anvesh Jain P
2026-11-18 15:56 ` sashiko-bot
2026-11-18 15:36 ` [PATCH v3 3/4] remoteproc: qcom: pas: Add coredump support for secondary processors Anvesh Jain P
2026-11-18 15:36 ` [PATCH v3 4/4] remoteproc: qcom: pas: Add Glymur OOBMSS PAS parameters Anvesh Jain P
3 siblings, 1 reply; 8+ messages in thread
From: Anvesh Jain P @ 2026-11-18 15:36 UTC (permalink / raw)
To: Bjorn Andersson, Mathieu Poirier, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Jain P
Cc: linux-arm-msm, linux-remoteproc, devicetree, linux-kernel,
Mukesh Ojha
The Out-of-Band Management Subsystem (OOBMSS) is managed by a common
remote processor and consists of two Zephyr subsystems:
+----------------------------------------------------------+
| OOBMSS |
| |
| +------------------------+ +------------------------+ |
| | OOB-TEE | | OOB-Non-Secure | |
| | Primary processor | | Auxiliary processor | |
| | Primary image and DTB | | Secondary image and DTB| |
| +------------------------+ +------------------------+ |
+----------------------------------------------------------+
The primary processor is the Out-of-Band Trusted Execution Environment
(OOB-TEE) processor. The OOB-Non-Secure processor is an auxiliary processor
that depends on the primary processor and cannot function independently.
The PAS remoteproc driver currently supports one primary image and its
optional DTB. OOBMSS additionally requires the secondary image and DTB
to be loaded, authenticated, mapped, shut down, and released through
their own PAS identifiers and carveouts.
Add generic PAS support for loading, authenticating, and mapping a
secondary image and its DTB, then shutting down and releasing both while
keeping the existing primary-image lifecycle unchanged.
Reviewed-by: Mukesh Ojha <mukesh.ojha@oss.qualcomm.com>
Signed-off-by: Anvesh Jain P <anvesh.p@oss.qualcomm.com>
---
drivers/remoteproc/qcom_q6v5_pas.c | 268 ++++++++++++++++++++++++++++++++-----
1 file changed, 237 insertions(+), 31 deletions(-)
diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c
index e7dfad27e526..1c8c0c22c34d 100644
--- a/drivers/remoteproc/qcom_q6v5_pas.c
+++ b/drivers/remoteproc/qcom_q6v5_pas.c
@@ -56,8 +56,12 @@ struct qcom_pas_data {
int crash_reason_smem;
const char *firmware_name;
const char *dtb_firmware_name;
+ const char *secondary_firmware_name;
+ const char *secondary_dtb_firmware_name;
int pas_id;
int dtb_pas_id;
+ int secondary_pas_id;
+ int secondary_dtb_pas_id;
int lite_pas_id;
int lite_dtb_pas_id;
unsigned int minidump_id;
@@ -104,8 +108,12 @@ struct qcom_pas {
int proxy_pd_count;
const char *dtb_firmware_name;
+ const char *secondary_firmware_name;
+ const char *secondary_dtb_firmware_name;
int pas_id;
int dtb_pas_id;
+ int secondary_pas_id;
+ int secondary_dtb_pas_id;
int lite_pas_id;
int lite_dtb_pas_id;
unsigned int minidump_id;
@@ -116,17 +124,25 @@ struct qcom_pas {
const struct firmware *firmware;
const struct firmware *dtb_firmware;
+ const struct firmware *secondary_firmware;
+ const struct firmware *secondary_dtb_firmware;
phys_addr_t mem_phys;
phys_addr_t dtb_mem_phys;
+ phys_addr_t secondary_mem_phys;
+ phys_addr_t secondary_dtb_mem_phys;
phys_addr_t mem_reloc;
phys_addr_t dtb_mem_reloc;
+ phys_addr_t secondary_mem_reloc;
+ phys_addr_t secondary_dtb_mem_reloc;
phys_addr_t region_assign_phys[MAX_ASSIGN_COUNT];
void __iomem *mem_region;
size_t mem_size;
size_t dtb_mem_size;
+ size_t secondary_mem_size;
+ size_t secondary_dtb_mem_size;
size_t region_assign_size[MAX_ASSIGN_COUNT];
int region_assign_idx;
@@ -144,6 +160,8 @@ struct qcom_pas {
struct qcom_pas_context *pas_ctx;
struct qcom_pas_context *dtb_pas_ctx;
+ struct qcom_pas_context *secondary_pas_ctx;
+ struct qcom_pas_context *secondary_dtb_pas_ctx;
struct qmi_tmd_client *tmd_inst;
};
@@ -226,19 +244,37 @@ static void qcom_pas_pds_disable(struct qcom_pas *pas, struct device **pds,
}
}
-static int qcom_pas_shutdown_poll_decrypt(struct qcom_pas *pas)
+static int qcom_pas_shutdown_poll_decrypt(int pas_id)
{
unsigned int retry_num = 50;
int ret;
do {
msleep(QCOM_PAS_DECRYPT_SHUTDOWN_DELAY_MS);
- ret = qcom_pas_shutdown(pas->pas_id);
+ ret = qcom_pas_shutdown(pas_id);
} while (ret == -EINVAL && --retry_num);
return ret;
}
+static void qcom_pas_release_firmware(struct qcom_pas *pas)
+{
+ if (pas->dtb_firmware) {
+ release_firmware(pas->dtb_firmware);
+ pas->dtb_firmware = NULL;
+ }
+
+ if (pas->secondary_firmware) {
+ release_firmware(pas->secondary_firmware);
+ pas->secondary_firmware = NULL;
+ }
+
+ if (pas->secondary_dtb_firmware) {
+ release_firmware(pas->secondary_dtb_firmware);
+ pas->secondary_dtb_firmware = NULL;
+ }
+}
+
static int qcom_pas_unprepare(struct rproc *rproc)
{
struct qcom_pas *pas = rproc->priv;
@@ -252,6 +288,10 @@ static int qcom_pas_unprepare(struct rproc *rproc)
qcom_pas_metadata_release(pas->pas_ctx);
if (pas->dtb_pas_id)
qcom_pas_metadata_release(pas->dtb_pas_ctx);
+ if (pas->secondary_pas_id)
+ qcom_pas_metadata_release(pas->secondary_pas_ctx);
+ if (pas->secondary_dtb_pas_id)
+ qcom_pas_metadata_release(pas->secondary_dtb_pas_ctx);
return 0;
}
@@ -269,19 +309,29 @@ static int qcom_pas_load(struct rproc *rproc, const struct firmware *fw)
if (pas->lite_dtb_pas_id)
qcom_pas_shutdown(pas->lite_dtb_pas_id);
- if (pas->dtb_pas_id) {
- ret = request_firmware(&pas->dtb_firmware, pas->dtb_firmware_name, pas->dev);
+ if (pas->secondary_dtb_pas_id) {
+ ret = request_firmware(&pas->secondary_dtb_firmware,
+ pas->secondary_dtb_firmware_name, pas->dev);
if (ret) {
- dev_err(pas->dev, "request_firmware failed for %s: %d\n",
- pas->dtb_firmware_name, ret);
+ qcom_pas_release_firmware(pas);
return ret;
}
+ }
- ret = qcom_mdt_pas_load(pas->dtb_pas_ctx, pas->dtb_firmware,
- pas->dtb_firmware_name, &pas->dtb_mem_reloc);
+ if (pas->secondary_pas_id) {
+ ret = request_firmware(&pas->secondary_firmware,
+ pas->secondary_firmware_name, pas->dev);
+ if (ret) {
+ qcom_pas_release_firmware(pas);
+ return ret;
+ }
+ }
+
+ if (pas->dtb_pas_id) {
+ ret = request_firmware(&pas->dtb_firmware, pas->dtb_firmware_name,
+ pas->dev);
if (ret) {
- qcom_pas_metadata_release(pas->dtb_pas_ctx);
- release_firmware(pas->dtb_firmware);
+ qcom_pas_release_firmware(pas);
return ret;
}
}
@@ -338,10 +388,51 @@ static int qcom_pas_start(struct rproc *rproc)
goto disable_cx_supply;
}
+ if (pas->secondary_dtb_pas_id) {
+ ret = qcom_mdt_pas_load(pas->secondary_dtb_pas_ctx,
+ pas->secondary_dtb_firmware,
+ pas->secondary_dtb_firmware_name,
+ &pas->secondary_dtb_mem_reloc);
+ if (ret)
+ goto release_secondary_dtb_metadata;
+
+ ret = qcom_pas_map_carveout(rproc, pas->secondary_dtb_mem_phys,
+ pas->secondary_dtb_mem_size);
+ if (ret)
+ goto release_secondary_dtb_metadata;
+
+ ret = qcom_pas_prepare_and_auth_reset(pas->secondary_dtb_pas_ctx);
+ if (ret)
+ goto unmap_secondary_dtb_carveout;
+ }
+
+ if (pas->secondary_pas_id) {
+ ret = qcom_mdt_pas_load(pas->secondary_pas_ctx,
+ pas->secondary_firmware,
+ pas->secondary_firmware_name,
+ &pas->secondary_mem_reloc);
+ if (ret)
+ goto release_secondary_metadata;
+
+ ret = qcom_pas_map_carveout(rproc, pas->secondary_mem_phys,
+ pas->secondary_mem_size);
+ if (ret)
+ goto release_secondary_metadata;
+
+ ret = qcom_pas_prepare_and_auth_reset(pas->secondary_pas_ctx);
+ if (ret)
+ goto unmap_secondary_carveout;
+ }
+
if (pas->dtb_pas_id) {
+ ret = qcom_mdt_pas_load(pas->dtb_pas_ctx, pas->dtb_firmware,
+ pas->dtb_firmware_name, &pas->dtb_mem_reloc);
+ if (ret)
+ goto release_dtb_metadata;
+
ret = qcom_pas_map_carveout(rproc, pas->dtb_mem_phys, pas->dtb_mem_size);
if (ret)
- goto disable_px_supply;
+ goto release_dtb_metadata;
ret = qcom_pas_prepare_and_auth_reset(pas->dtb_pas_ctx);
if (ret) {
@@ -372,13 +463,17 @@ static int qcom_pas_start(struct rproc *rproc)
ret = qcom_q6v5_wait_for_start(&pas->q6v5, msecs_to_jiffies(5000));
if (ret == -ETIMEDOUT) {
dev_err(pas->dev, "start timed out\n");
- qcom_pas_shutdown(pas->pas_id);
goto unmap_carveout;
}
qcom_pas_metadata_release(pas->pas_ctx);
if (pas->dtb_pas_id)
qcom_pas_metadata_release(pas->dtb_pas_ctx);
+ if (pas->secondary_pas_id)
+ qcom_pas_metadata_release(pas->secondary_pas_ctx);
+ if (pas->secondary_dtb_pas_id)
+ qcom_pas_metadata_release(pas->secondary_dtb_pas_ctx);
+ qcom_pas_release_firmware(pas);
/* firmware is used to pass reference from qcom_pas_start(), drop it now */
pas->firmware = NULL;
@@ -386,16 +481,37 @@ static int qcom_pas_start(struct rproc *rproc)
return 0;
unmap_carveout:
+ qcom_pas_shutdown(pas->pas_id);
qcom_pas_unmap_carveout(rproc, pas->mem_phys, pas->mem_size);
release_pas_metadata:
qcom_pas_metadata_release(pas->pas_ctx);
- if (pas->dtb_pas_id)
- qcom_pas_metadata_release(pas->dtb_pas_ctx);
-
unmap_dtb_carveout:
+ if (pas->dtb_pas_id) {
+ qcom_pas_shutdown(pas->dtb_pas_id);
+ qcom_pas_unmap_carveout(rproc, pas->dtb_mem_phys,
+ pas->dtb_mem_size);
+ }
+release_dtb_metadata:
if (pas->dtb_pas_id)
- qcom_pas_unmap_carveout(rproc, pas->dtb_mem_phys, pas->dtb_mem_size);
-disable_px_supply:
+ qcom_pas_metadata_release(pas->dtb_pas_ctx);
+unmap_secondary_carveout:
+ if (pas->secondary_pas_id) {
+ qcom_pas_shutdown(pas->secondary_pas_id);
+ qcom_pas_unmap_carveout(rproc, pas->secondary_mem_phys,
+ pas->secondary_mem_size);
+ }
+release_secondary_metadata:
+ if (pas->secondary_pas_id)
+ qcom_pas_metadata_release(pas->secondary_pas_ctx);
+unmap_secondary_dtb_carveout:
+ if (pas->secondary_dtb_pas_id) {
+ qcom_pas_shutdown(pas->secondary_dtb_pas_id);
+ qcom_pas_unmap_carveout(rproc, pas->secondary_dtb_mem_phys,
+ pas->secondary_dtb_mem_size);
+ }
+release_secondary_dtb_metadata:
+ if (pas->secondary_dtb_pas_id)
+ qcom_pas_metadata_release(pas->secondary_dtb_pas_ctx);
if (pas->px_supply)
regulator_disable(pas->px_supply);
disable_cx_supply:
@@ -409,6 +525,7 @@ static int qcom_pas_start(struct rproc *rproc)
qcom_pas_pds_disable(pas, pas->proxy_pds, pas->proxy_pd_count);
disable_irqs:
qcom_q6v5_unprepare(&pas->q6v5);
+ qcom_pas_release_firmware(pas);
/* firmware is used to pass reference from qcom_pas_start(), drop it now */
pas->firmware = NULL;
@@ -440,9 +557,30 @@ static int qcom_pas_stop(struct rproc *rproc)
if (ret == -ETIMEDOUT)
dev_err(pas->dev, "timed out on wait\n");
+ if (pas->secondary_pas_id) {
+ ret = qcom_pas_shutdown(pas->secondary_pas_id);
+ if (ret && pas->decrypt_shutdown)
+ ret = qcom_pas_shutdown_poll_decrypt(pas->secondary_pas_id);
+ if (ret)
+ dev_err(pas->dev, "failed to shutdown secondary: %d\n", ret);
+
+ qcom_pas_unmap_carveout(rproc, pas->secondary_mem_phys,
+ pas->secondary_mem_size);
+ }
+
+ if (pas->secondary_dtb_pas_id) {
+ ret = qcom_pas_shutdown(pas->secondary_dtb_pas_id);
+ if (ret)
+ dev_err(pas->dev,
+ "failed to shutdown secondary dtb: %d\n", ret);
+
+ qcom_pas_unmap_carveout(rproc, pas->secondary_dtb_mem_phys,
+ pas->secondary_dtb_mem_size);
+ }
+
ret = qcom_pas_shutdown(pas->pas_id);
if (ret && pas->decrypt_shutdown)
- ret = qcom_pas_shutdown_poll_decrypt(pas);
+ ret = qcom_pas_shutdown_poll_decrypt(pas->pas_id);
if (ret)
dev_err(pas->dev, "failed to shutdown: %d\n", ret);
@@ -752,23 +890,59 @@ static int qcom_pas_alloc_memory_region(struct qcom_pas *pas)
if (IS_ERR(pas->pas_ctx))
return PTR_ERR(pas->pas_ctx);
- if (!pas->dtb_pas_id)
- return 0;
+ if (pas->dtb_pas_id) {
+ ret = of_reserved_mem_region_to_resource(pas->dev->of_node, 1, &res);
+ if (ret) {
+ dev_err(pas->dev, "unable to resolve dtb memory-region\n");
+ return ret;
+ }
- ret = of_reserved_mem_region_to_resource(pas->dev->of_node, 1, &res);
- if (ret) {
- dev_err(pas->dev, "unable to resolve dtb memory-region\n");
- return ret;
+ pas->dtb_mem_phys = res.start;
+ pas->dtb_mem_reloc = res.start;
+ pas->dtb_mem_size = resource_size(&res);
+
+ pas->dtb_pas_ctx =
+ devm_qcom_pas_context_alloc(pas->dev, pas->dtb_pas_id,
+ pas->dtb_mem_phys,
+ pas->dtb_mem_size);
+ if (IS_ERR(pas->dtb_pas_ctx))
+ return PTR_ERR(pas->dtb_pas_ctx);
+ }
+
+ if (pas->secondary_pas_id) {
+ ret = of_reserved_mem_region_to_resource(pas->dev->of_node, 2, &res);
+ if (ret)
+ return ret;
+
+ pas->secondary_mem_phys = res.start;
+ pas->secondary_mem_reloc = res.start;
+ pas->secondary_mem_size = resource_size(&res);
+
+ pas->secondary_pas_ctx =
+ devm_qcom_pas_context_alloc(pas->dev, pas->secondary_pas_id,
+ pas->secondary_mem_phys,
+ pas->secondary_mem_size);
+ if (IS_ERR(pas->secondary_pas_ctx))
+ return PTR_ERR(pas->secondary_pas_ctx);
}
- pas->dtb_mem_phys = pas->dtb_mem_reloc = res.start;
- pas->dtb_mem_size = resource_size(&res);
+ if (pas->secondary_dtb_pas_id) {
+ ret = of_reserved_mem_region_to_resource(pas->dev->of_node, 3, &res);
+ if (ret)
+ return ret;
- pas->dtb_pas_ctx = devm_qcom_pas_context_alloc(pas->dev, pas->dtb_pas_id,
- pas->dtb_mem_phys,
- pas->dtb_mem_size);
- if (IS_ERR(pas->dtb_pas_ctx))
- return PTR_ERR(pas->dtb_pas_ctx);
+ pas->secondary_dtb_mem_phys = res.start;
+ pas->secondary_dtb_mem_reloc = res.start;
+ pas->secondary_dtb_mem_size = resource_size(&res);
+
+ pas->secondary_dtb_pas_ctx =
+ devm_qcom_pas_context_alloc(pas->dev,
+ pas->secondary_dtb_pas_id,
+ pas->secondary_dtb_mem_phys,
+ pas->secondary_dtb_mem_size);
+ if (IS_ERR(pas->secondary_dtb_pas_ctx))
+ return PTR_ERR(pas->secondary_dtb_pas_ctx);
+ }
return 0;
}
@@ -910,6 +1084,8 @@ static int qcom_pas_probe(struct platform_device *pdev)
struct rproc *rproc;
struct device_node *node;
const char *fw_name, *dtb_fw_name = NULL;
+ const char *secondary_fw_name = NULL;
+ const char *secondary_dtb_fw_name = NULL;
const struct rproc_ops *ops = &qcom_pas_ops;
int ret;
@@ -934,6 +1110,24 @@ static int qcom_pas_probe(struct platform_device *pdev)
return ret;
}
+ if (desc->secondary_firmware_name) {
+ secondary_fw_name = desc->secondary_firmware_name;
+ ret = of_property_read_string_index(pdev->dev.of_node,
+ "firmware-name", 2,
+ &secondary_fw_name);
+ if (ret < 0 && ret != -EINVAL)
+ return ret;
+ }
+
+ if (desc->secondary_dtb_firmware_name) {
+ secondary_dtb_fw_name = desc->secondary_dtb_firmware_name;
+ ret = of_property_read_string_index(pdev->dev.of_node,
+ "firmware-name", 3,
+ &secondary_dtb_fw_name);
+ if (ret < 0 && ret != -EINVAL)
+ return ret;
+ }
+
if (desc->minidump_id)
ops = &qcom_pas_minidump_ops;
@@ -967,6 +1161,14 @@ static int qcom_pas_probe(struct platform_device *pdev)
pas->dtb_firmware_name = dtb_fw_name;
pas->dtb_pas_id = desc->dtb_pas_id;
}
+ if (secondary_fw_name) {
+ pas->secondary_firmware_name = secondary_fw_name;
+ pas->secondary_pas_id = desc->secondary_pas_id;
+ }
+ if (secondary_dtb_fw_name) {
+ pas->secondary_dtb_firmware_name = secondary_dtb_fw_name;
+ pas->secondary_dtb_pas_id = desc->secondary_dtb_pas_id;
+ }
platform_set_drvdata(pdev, pas);
ret = device_init_wakeup(pas->dev, true);
@@ -1022,6 +1224,10 @@ static int qcom_pas_probe(struct platform_device *pdev)
pas->pas_ctx->use_tzmem = desc->needs_tzmem || rproc->has_iommu;
if (pas->dtb_pas_id)
pas->dtb_pas_ctx->use_tzmem = desc->needs_tzmem || rproc->has_iommu;
+ if (pas->secondary_pas_id)
+ pas->secondary_pas_ctx->use_tzmem = desc->needs_tzmem || rproc->has_iommu;
+ if (pas->secondary_dtb_pas_id)
+ pas->secondary_dtb_pas_ctx->use_tzmem = desc->needs_tzmem || rproc->has_iommu;
if (desc->early_boot)
pas->rproc->state = RPROC_DETACHED;
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v3 3/4] remoteproc: qcom: pas: Add coredump support for secondary processors
2026-11-18 15:36 [PATCH v3 0/4] Add Glymur OOBMSS support Anvesh Jain P
2026-11-18 15:36 ` [PATCH v3 1/4] dt-bindings: remoteproc: qcom: Add Glymur OOBMSS PAS Anvesh Jain P
2026-11-18 15:36 ` [PATCH v3 2/4] remoteproc: qcom: pas: Support secondary images Anvesh Jain P
@ 2026-11-18 15:36 ` Anvesh Jain P
2026-11-18 16:03 ` sashiko-bot
2026-11-18 15:36 ` [PATCH v3 4/4] remoteproc: qcom: pas: Add Glymur OOBMSS PAS parameters Anvesh Jain P
3 siblings, 1 reply; 8+ messages in thread
From: Anvesh Jain P @ 2026-11-18 15:36 UTC (permalink / raw)
To: Bjorn Andersson, Mathieu Poirier, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Jain P
Cc: linux-arm-msm, linux-remoteproc, devicetree, linux-kernel
Add coredump support for PAS remoteproc instances with a secondary
processor by registering dump segments for both PAS firmware images and
temporarily mapping their carveouts during collection. This is for debug
dump collection and does not provide operational device recovery.
Signed-off-by: Anvesh Jain P <anvesh.p@oss.qualcomm.com>
---
drivers/remoteproc/qcom_q6v5_pas.c | 67 +++++++++++++++++++++++++++++++++++---
1 file changed, 62 insertions(+), 5 deletions(-)
diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c
index 1c8c0c22c34d..a167bd6072c9 100644
--- a/drivers/remoteproc/qcom_q6v5_pas.c
+++ b/drivers/remoteproc/qcom_q6v5_pas.c
@@ -138,6 +138,7 @@ struct qcom_pas {
phys_addr_t region_assign_phys[MAX_ASSIGN_COUNT];
void __iomem *mem_region;
+ void __iomem *secondary_mem_region;
size_t mem_size;
size_t dtb_mem_size;
@@ -185,6 +186,11 @@ static void qcom_pas_segment_dump(struct rproc *rproc,
memcpy_fromio(dest, pas->mem_region + total_offset, size);
}
+static bool qcom_pas_has_secondary(const struct qcom_pas *pas)
+{
+ return pas->secondary_pas_id && pas->secondary_dtb_pas_id;
+}
+
static void qcom_pas_minidump(struct rproc *rproc)
{
struct qcom_pas *pas = rproc->priv;
@@ -336,6 +342,17 @@ static int qcom_pas_load(struct rproc *rproc, const struct firmware *fw)
}
}
+ if (pas->secondary_pas_id) {
+ ret = qcom_register_dump_segments(rproc, pas->secondary_firmware);
+ if (ret) {
+ dev_err(pas->dev,
+ "failed to register secondary dump segments: %d\n", ret);
+ rproc_coredump_cleanup(rproc);
+ qcom_pas_release_firmware(pas);
+ return ret;
+ }
+ }
+
return 0;
}
@@ -611,16 +628,38 @@ static int qcom_pas_stop(struct rproc *rproc)
static void *qcom_pas_da_to_va(struct rproc *rproc, u64 da, size_t len, bool *is_iomem)
{
struct qcom_pas *pas = rproc->priv;
- int offset;
+ phys_addr_t base;
+ void __iomem *region;
+
+ if (da >= pas->mem_reloc && len <= pas->mem_size &&
+ da - pas->mem_reloc <= pas->mem_size - len) {
+ base = pas->mem_reloc;
+ region = pas->mem_region;
+ } else if (da >= pas->mem_phys && len <= pas->mem_size &&
+ da - pas->mem_phys <= pas->mem_size - len) {
+ base = pas->mem_phys;
+ region = pas->mem_region;
+ } else if (da >= pas->secondary_mem_reloc &&
+ len <= pas->secondary_mem_size &&
+ da - pas->secondary_mem_reloc <= pas->secondary_mem_size - len) {
+ base = pas->secondary_mem_reloc;
+ region = pas->secondary_mem_region;
+ } else if (da >= pas->secondary_mem_phys &&
+ len <= pas->secondary_mem_size &&
+ da - pas->secondary_mem_phys <= pas->secondary_mem_size - len) {
+ base = pas->secondary_mem_phys;
+ region = pas->secondary_mem_region;
+ } else {
+ return NULL;
+ }
- offset = da - pas->mem_reloc;
- if (offset < 0 || offset + len > pas->mem_size)
+ if (!region)
return NULL;
if (is_iomem)
*is_iomem = true;
- return (__force void *)pas->mem_region + offset;
+ return (__force void *)region + (da - base);
}
static int qcom_pas_parse_firmware(struct rproc *rproc, const struct firmware *fw)
@@ -748,11 +787,28 @@ static void qcom_pas_coredump(struct rproc *rproc)
{
struct qcom_pas *pas = rproc->priv;
- pas->mem_region = qcom_pas_ctx_map(pas->pas_ctx);
+ if (list_empty(&rproc->dump_segments))
+ return;
+
+ if (!pas->mem_region)
+ pas->mem_region = qcom_pas_ctx_map(pas->pas_ctx);
if (!pas->mem_region)
return;
+ if (qcom_pas_has_secondary(pas) && !pas->secondary_mem_region) {
+ pas->secondary_mem_region =
+ qcom_pas_ctx_map(pas->secondary_pas_ctx);
+ if (!pas->secondary_mem_region)
+ dev_err(pas->dev, "unable to map secondary memory for coredump\n");
+ }
+
rproc_coredump(rproc);
+
+ if (pas->secondary_mem_region) {
+ iounmap(pas->secondary_mem_region);
+ pas->secondary_mem_region = NULL;
+ }
+
iounmap(pas->mem_region);
pas->mem_region = NULL;
}
@@ -1276,6 +1332,7 @@ static void qcom_pas_remove(struct platform_device *pdev)
of_platform_device_destroy(&pas->bam_dmux->dev, NULL);
rproc_del(pas->rproc);
+ rproc_coredump_cleanup(pas->rproc);
if (pas->tmd_inst)
qmi_tmd_exit(pas->tmd_inst);
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v3 4/4] remoteproc: qcom: pas: Add Glymur OOBMSS PAS parameters
2026-11-18 15:36 [PATCH v3 0/4] Add Glymur OOBMSS support Anvesh Jain P
` (2 preceding siblings ...)
2026-11-18 15:36 ` [PATCH v3 3/4] remoteproc: qcom: pas: Add coredump support for secondary processors Anvesh Jain P
@ 2026-11-18 15:36 ` Anvesh Jain P
2026-11-18 16:24 ` sashiko-bot
3 siblings, 1 reply; 8+ messages in thread
From: Anvesh Jain P @ 2026-11-18 15:36 UTC (permalink / raw)
To: Bjorn Andersson, Mathieu Poirier, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Jain P
Cc: linux-arm-msm, linux-remoteproc, devicetree, linux-kernel,
Mukesh Ojha
The OOBMSS consists of separate OOB-TEE and OOB-NS Zephyr subsystems,
each with its own firmware, DTB, and dedicated PAS ID. Add support for
the OOBMSS PAS loader on Glymur platforms.
Reviewed-by: Mukesh Ojha <mukesh.ojha@oss.qualcomm.com>
Signed-off-by: Anvesh Jain P <anvesh.p@oss.qualcomm.com>
---
drivers/remoteproc/qcom_q6v5_pas.c | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c
index a167bd6072c9..5cc529e2923c 100644
--- a/drivers/remoteproc/qcom_q6v5_pas.c
+++ b/drivers/remoteproc/qcom_q6v5_pas.c
@@ -2182,6 +2182,30 @@ static const struct qcom_pas_data kaanapali_soccp_resource = {
.early_boot = true,
};
+static const struct qcom_pas_data glymur_oobmss_resource = {
+ .crash_reason_smem = 669,
+ .firmware_name = "oobmss_tee.mbn",
+ .dtb_firmware_name = "oobmss_qc_dtb.mbn",
+ .secondary_firmware_name = "oobmss_ns.mbn",
+ .secondary_dtb_firmware_name = "oobmss_oem_dtb.mbn",
+ .pas_id = 0x42,
+ .dtb_pas_id = 0x43,
+ .secondary_pas_id = 0x44,
+ .secondary_dtb_pas_id = 0x45,
+ .proxy_pd_names = (char *[]){
+ "cx",
+ "mx",
+ NULL
+ },
+ .ssr_name = "oobmss",
+ .sysmon_name = "oobmss",
+ .ssctl_id = 0x21,
+ .auto_boot = true,
+ .early_boot = true,
+ .needs_tzmem = true,
+ .decrypt_shutdown = true,
+};
+
static const struct qcom_pas_data glymur_soccp_resource = {
.crash_reason_smem = 656,
.firmware_name = "soccp.mbn",
@@ -2255,6 +2279,7 @@ static const struct qcom_pas_data eliza_cdsp_resource = {
static const struct of_device_id qcom_pas_of_match[] = {
{ .compatible = "qcom,eliza-adsp-pas", .data = &sm8550_adsp_resource },
{ .compatible = "qcom,eliza-cdsp-pas", .data = &eliza_cdsp_resource },
+ { .compatible = "qcom,glymur-oobmss-pas", .data = &glymur_oobmss_resource },
{ .compatible = "qcom,glymur-soccp-pas", .data = &glymur_soccp_resource },
{ .compatible = "qcom,hawi-cdsp-pas", .data = &hawi_cdsp_resource },
{ .compatible = "qcom,kaanapali-soccp-pas", .data = &kaanapali_soccp_resource },
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v3 2/4] remoteproc: qcom: pas: Support secondary images
2026-11-18 15:36 ` [PATCH v3 2/4] remoteproc: qcom: pas: Support secondary images Anvesh Jain P
@ 2026-11-18 15:56 ` sashiko-bot
0 siblings, 0 replies; 8+ messages in thread
From: sashiko-bot @ 2026-11-18 15:56 UTC (permalink / raw)
To: Anvesh Jain P; +Cc: devicetree, robh, conor+dt
Thank you for your contribution! Sashiko AI review found 3 potential
issues to consider:
- [Medium] remoteproc: qcom: pas: masked secondary shutdown errors in
qcom_pas_stop()
- [Medium] remoteproc: qcom: pas: unauthenticated PAS shutdown in
qcom_pas_start()
- [Medium] remoteproc: qcom: pas: firmware leak on boot failure after
qcom_pas_load()
--
commit f4e5bc32dd6dbd8e248f2fc47b7078b505ef5dfc
Author: Anvesh Jain P <anvesh.p@oss.qualcomm.com>
remoteproc: qcom: pas: Support secondary images
This commit adds PAS remoteproc support for loading, authenticating,
mapping, shutting down, and releasing a secondary image and its DTB.
> diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c
> index e7dfad27e5263..1c8c0c22c34d1 100644
> --- a/drivers/remoteproc/qcom_q6v5_pas.c
> +++ b/drivers/remoteproc/qcom_q6v5_pas.c
[ ... ]
> @@ -252,6 +288,10 @@ static int qcom_pas_unprepare(struct rproc *rproc)
> qcom_pas_metadata_release(pas->pas_ctx);
> if (pas->dtb_pas_id)
> qcom_pas_metadata_release(pas->dtb_pas_ctx);
> + if (pas->secondary_pas_id)
> + qcom_pas_metadata_release(pas->secondary_pas_ctx);
> + if (pas->secondary_dtb_pas_id)
> + qcom_pas_metadata_release(pas->secondary_dtb_pas_ctx);
>
> return 0;
> }
> @@ -269,19 +309,29 @@ static int qcom_pas_load(struct rproc *rproc, const struct firmware *fw)
> if (pas->lite_dtb_pas_id)
> qcom_pas_shutdown(pas->lite_dtb_pas_id);
>
> - if (pas->dtb_pas_id) {
> - ret = request_firmware(&pas->dtb_firmware, pas->dtb_firmware_name, pas->dev);
> + if (pas->secondary_dtb_pas_id) {
> + ret = request_firmware(&pas->secondary_dtb_firmware,
> + pas->secondary_dtb_firmware_name, pas->dev);
> if (ret) {
> - dev_err(pas->dev, "request_firmware failed for %s: %d\n",
> - pas->dtb_firmware_name, ret);
> + qcom_pas_release_firmware(pas);
> return ret;
> }
> + }
>
> - ret = qcom_mdt_pas_load(pas->dtb_pas_ctx, pas->dtb_firmware,
> - pas->dtb_firmware_name, &pas->dtb_mem_reloc);
> + if (pas->secondary_pas_id) {
> + ret = request_firmware(&pas->secondary_firmware,
> + pas->secondary_firmware_name, pas->dev);
> + if (ret) {
> + qcom_pas_release_firmware(pas);
> + return ret;
> + }
> + }
> +
> + if (pas->dtb_pas_id) {
> + ret = request_firmware(&pas->dtb_firmware, pas->dtb_firmware_name,
> + pas->dev);
> if (ret) {
> - qcom_pas_metadata_release(pas->dtb_pas_ctx);
> - release_firmware(pas->dtb_firmware);
> + qcom_pas_release_firmware(pas);
> return ret;
> }
> }
[Severity: Medium]
Can this leak pas->secondary_dtb_firmware, pas->secondary_firmware, and
pas->dtb_firmware if boot fails after qcom_pas_load() succeeds?
qcom_pas_release_firmware() is only called in qcom_pas_start() on success
or under the disable_irqs error label. If rproc_prepare_subdevices()
fails in rproc_start() before rproc->ops->start() is reached, or if
qcom_q6v5_prepare() fails at the top of qcom_pas_start() and returns early,
none of those firmware objects are released and pas->firmware is not
cleared. A later boot or recovery attempt will then overwrite those
pointers in qcom_pas_load().
Calling qcom_pas_release_firmware(pas) and clearing pas->firmware in
qcom_pas_unprepare() (or jumping to the cleanup path when
qcom_q6v5_prepare() fails) would avoid the leak.
> @@ -338,10 +388,51 @@ static int qcom_pas_start(struct rproc *rproc)
> goto disable_cx_supply;
> }
>
> + if (pas->secondary_dtb_pas_id) {
> + ret = qcom_mdt_pas_load(pas->secondary_dtb_pas_ctx,
> + pas->secondary_dtb_firmware,
> + pas->secondary_dtb_firmware_name,
> + &pas->secondary_dtb_mem_reloc);
> + if (ret)
> + goto release_secondary_dtb_metadata;
> +
> + ret = qcom_pas_map_carveout(rproc, pas->secondary_dtb_mem_phys,
> + pas->secondary_dtb_mem_size);
> + if (ret)
> + goto release_secondary_dtb_metadata;
> +
> + ret = qcom_pas_prepare_and_auth_reset(pas->secondary_dtb_pas_ctx);
> + if (ret)
> + goto unmap_secondary_dtb_carveout;
> + }
> +
> + if (pas->secondary_pas_id) {
> + ret = qcom_mdt_pas_load(pas->secondary_pas_ctx,
> + pas->secondary_firmware,
> + pas->secondary_firmware_name,
> + &pas->secondary_mem_reloc);
> + if (ret)
> + goto release_secondary_metadata;
> +
> + ret = qcom_pas_map_carveout(rproc, pas->secondary_mem_phys,
> + pas->secondary_mem_size);
> + if (ret)
> + goto release_secondary_metadata;
> +
> + ret = qcom_pas_prepare_and_auth_reset(pas->secondary_pas_ctx);
> + if (ret)
> + goto unmap_secondary_carveout;
> + }
> +
> if (pas->dtb_pas_id) {
> + ret = qcom_mdt_pas_load(pas->dtb_pas_ctx, pas->dtb_firmware,
> + pas->dtb_firmware_name, &pas->dtb_mem_reloc);
> + if (ret)
> + goto release_dtb_metadata;
> +
> ret = qcom_pas_map_carveout(rproc, pas->dtb_mem_phys, pas->dtb_mem_size);
> if (ret)
> - goto disable_px_supply;
> + goto release_dtb_metadata;
>
> ret = qcom_pas_prepare_and_auth_reset(pas->dtb_pas_ctx);
> if (ret) {
> @@ -372,13 +463,17 @@ static int qcom_pas_start(struct rproc *rproc)
> ret = qcom_q6v5_wait_for_start(&pas->q6v5, msecs_to_jiffies(5000));
> if (ret == -ETIMEDOUT) {
> dev_err(pas->dev, "start timed out\n");
> - qcom_pas_shutdown(pas->pas_id);
> goto unmap_carveout;
> }
>
> qcom_pas_metadata_release(pas->pas_ctx);
> if (pas->dtb_pas_id)
> qcom_pas_metadata_release(pas->dtb_pas_ctx);
> + if (pas->secondary_pas_id)
> + qcom_pas_metadata_release(pas->secondary_pas_ctx);
> + if (pas->secondary_dtb_pas_id)
> + qcom_pas_metadata_release(pas->secondary_dtb_pas_ctx);
> + qcom_pas_release_firmware(pas);
>
> /* firmware is used to pass reference from qcom_pas_start(), drop it now */
> pas->firmware = NULL;
> @@ -386,16 +481,37 @@ static int qcom_pas_start(struct rproc *rproc)
> return 0;
>
> unmap_carveout:
> + qcom_pas_shutdown(pas->pas_id);
> qcom_pas_unmap_carveout(rproc, pas->mem_phys, pas->mem_size);
> release_pas_metadata:
> qcom_pas_metadata_release(pas->pas_ctx);
> - if (pas->dtb_pas_id)
> - qcom_pas_metadata_release(pas->dtb_pas_ctx);
> -
> unmap_dtb_carveout:
> + if (pas->dtb_pas_id) {
> + qcom_pas_shutdown(pas->dtb_pas_id);
> + qcom_pas_unmap_carveout(rproc, pas->dtb_mem_phys,
> + pas->dtb_mem_size);
> + }
> +release_dtb_metadata:
> if (pas->dtb_pas_id)
> - qcom_pas_unmap_carveout(rproc, pas->dtb_mem_phys, pas->dtb_mem_size);
> -disable_px_supply:
> + qcom_pas_metadata_release(pas->dtb_pas_ctx);
> +unmap_secondary_carveout:
> + if (pas->secondary_pas_id) {
> + qcom_pas_shutdown(pas->secondary_pas_id);
> + qcom_pas_unmap_carveout(rproc, pas->secondary_mem_phys,
> + pas->secondary_mem_size);
> + }
> +release_secondary_metadata:
> + if (pas->secondary_pas_id)
> + qcom_pas_metadata_release(pas->secondary_pas_ctx);
> +unmap_secondary_dtb_carveout:
> + if (pas->secondary_dtb_pas_id) {
> + qcom_pas_shutdown(pas->secondary_dtb_pas_id);
> + qcom_pas_unmap_carveout(rproc, pas->secondary_dtb_mem_phys,
> + pas->secondary_dtb_mem_size);
> + }
> +release_secondary_dtb_metadata:
> + if (pas->secondary_dtb_pas_id)
> + qcom_pas_metadata_release(pas->secondary_dtb_pas_ctx);
[Severity: Medium]
Does jumping to the unmap_*_carveout labels when
qcom_pas_prepare_and_auth_reset() fails call qcom_pas_shutdown() on a PAS
context that failed authentication?
Each image maps its carveout before calling
qcom_pas_prepare_and_auth_reset(), and on failure jumps to its own
unmap_*_carveout label, which now executes qcom_pas_shutdown() before
qcom_pas_unmap_carveout(). That issues an unbalanced PAS shutdown call to
TrustZone for an image that was never authenticated or brought out of
reset. Separating the shutdown labels from the unmap_*_carveout labels
would ensure qcom_pas_shutdown() is only called for PAS IDs whose
qcom_pas_prepare_and_auth_reset() succeeded.
> @@ -440,9 +557,30 @@ static int qcom_pas_stop(struct rproc *rproc)
> if (ret == -ETIMEDOUT)
> dev_err(pas->dev, "timed out on wait\n");
>
> + if (pas->secondary_pas_id) {
> + ret = qcom_pas_shutdown(pas->secondary_pas_id);
> + if (ret && pas->decrypt_shutdown)
> + ret = qcom_pas_shutdown_poll_decrypt(pas->secondary_pas_id);
> + if (ret)
> + dev_err(pas->dev, "failed to shutdown secondary: %d\n", ret);
> +
> + qcom_pas_unmap_carveout(rproc, pas->secondary_mem_phys,
> + pas->secondary_mem_size);
> + }
> +
> + if (pas->secondary_dtb_pas_id) {
> + ret = qcom_pas_shutdown(pas->secondary_dtb_pas_id);
> + if (ret)
> + dev_err(pas->dev,
> + "failed to shutdown secondary dtb: %d\n", ret);
> +
> + qcom_pas_unmap_carveout(rproc, pas->secondary_dtb_mem_phys,
> + pas->secondary_dtb_mem_size);
> + }
> +
> ret = qcom_pas_shutdown(pas->pas_id);
> if (ret && pas->decrypt_shutdown)
> - ret = qcom_pas_shutdown_poll_decrypt(pas);
> + ret = qcom_pas_shutdown_poll_decrypt(pas->pas_id);
>
> if (ret)
> dev_err(pas->dev, "failed to shutdown: %d\n", ret);
[Severity: Medium]
Won't `ret = qcom_pas_shutdown(pas->pas_id)` overwrite any error returned
when shutting down pas->secondary_pas_id or pas->secondary_dtb_pas_id?
If secondary PAS shutdown fails in TrustZone while the primary PAS shutdown
succeeds, qcom_pas_stop() returns 0 to rproc_stop(). During crash recovery
in rproc_boot_recovery(), a zero return from rproc_stop() lets execution
proceed to rproc->ops->coredump() while the secondary memory region is
still locked by TrustZone, whereas pas->dtb_pas_id below uses a separate
variable to preserve earlier shutdown errors.
--
Sashiko AI review · https://sashiko.dev/#/patchset/20261118-oob-support-glymur-v3-0-2cbdfe208d56@oss.qualcomm.com?part=2
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v3 3/4] remoteproc: qcom: pas: Add coredump support for secondary processors
2026-11-18 15:36 ` [PATCH v3 3/4] remoteproc: qcom: pas: Add coredump support for secondary processors Anvesh Jain P
@ 2026-11-18 16:03 ` sashiko-bot
0 siblings, 0 replies; 8+ messages in thread
From: sashiko-bot @ 2026-11-18 16:03 UTC (permalink / raw)
To: Anvesh Jain P; +Cc: devicetree, robh, conor+dt
Thank you for your contribution! Sashiko AI review found 2 potential
issues to consider:
- [Medium] remoteproc: qcom: pas: duplicate dump segments in
qcom_pas_load() on recovery
- [Medium] remoteproc: qcom: pas: secondary coredump after masked
shutdown failure
--
commit 18ab6cc078bc90d357be63c7984c43a899ef428d
Author: Anvesh Jain P <anvesh.p@oss.qualcomm.com>
remoteproc: qcom: pas: Add coredump support for secondary processors
This commit adds coredump support for PAS remoteproc instances with a
secondary processor by registering dump segments for the secondary
firmware and mapping the secondary carveout during coredump collection.
> diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c
> index 1c8c0c22c34d1..a167bd6072c94 100644
> --- a/drivers/remoteproc/qcom_q6v5_pas.c
> +++ b/drivers/remoteproc/qcom_q6v5_pas.c
[ ... ]
> @@ -336,6 +342,17 @@ static int qcom_pas_load(struct rproc *rproc, const struct firmware *fw)
> }
> }
>
> + if (pas->secondary_pas_id) {
> + ret = qcom_register_dump_segments(rproc, pas->secondary_firmware);
> + if (ret) {
> + dev_err(pas->dev,
> + "failed to register secondary dump segments: %d\n", ret);
> + rproc_coredump_cleanup(rproc);
> + qcom_pas_release_firmware(pas);
> + return ret;
> + }
> + }
> +
> return 0;
> }
[Severity: Medium]
Does registering secondary dump segments in qcom_pas_load() append
duplicate rproc_dump_segment entries to rproc->dump_segments on every
crash recovery?
Primary dump segments are registered in qcom_pas_parse_firmware(), which
runs only during rproc_fw_boot(). On crash recovery,
rproc_boot_recovery() runs rproc->ops->coredump() and then calls
rproc_start() -> rproc_load_segments() -> qcom_pas_load() without
clearing rproc->dump_segments, so each recovery allocates and appends
another copy of the secondary segments and produces corrupted coredump
ELFs with duplicate PT_LOAD headers. In addition, if
qcom_register_dump_segments() fails here during recovery,
rproc_coredump_cleanup(rproc) wipes the primary segments that were
registered at initial boot and will not be re-registered on later
recoveries.
[ ... ]
> @@ -748,11 +787,28 @@ static void qcom_pas_coredump(struct rproc *rproc)
> {
> struct qcom_pas *pas = rproc->priv;
>
> - pas->mem_region = qcom_pas_ctx_map(pas->pas_ctx);
> + if (list_empty(&rproc->dump_segments))
> + return;
> +
> + if (!pas->mem_region)
> + pas->mem_region = qcom_pas_ctx_map(pas->pas_ctx);
> if (!pas->mem_region)
> return;
>
> + if (qcom_pas_has_secondary(pas) && !pas->secondary_mem_region) {
> + pas->secondary_mem_region =
> + qcom_pas_ctx_map(pas->secondary_pas_ctx);
> + if (!pas->secondary_mem_region)
> + dev_err(pas->dev, "unable to map secondary memory for coredump\n");
> + }
> +
> rproc_coredump(rproc);
[Severity: Medium]
Can rproc_coredump() read pas->secondary_mem_region while the secondary
carveout is still locked by TrustZone or the hypervisor if shutting down
pas->secondary_pas_id failed?
rproc_boot_recovery() only skips coredump when rproc_stop() returns an
error, as fixed for primary and DTB PAS IDs in commit 9db31edf92dd
("remoteproc: qcom_q6v5_pas: Fix error masking in qcom_pas_stop()").
However, qcom_pas_stop() overwrites the return value of
qcom_pas_shutdown(pas->secondary_pas_id) with the subsequent shutdown
calls:
drivers/remoteproc/qcom_q6v5_pas.c:qcom_pas_stop() {
...
if (pas->secondary_pas_id) {
ret = qcom_pas_shutdown(pas->secondary_pas_id);
if (ret && pas->decrypt_shutdown)
ret = qcom_pas_shutdown_poll_decrypt(pas->secondary_pas_id);
if (ret)
dev_err(pas->dev, "failed to shutdown secondary: %d\n", ret);
...
}
...
ret = qcom_pas_shutdown(pas->pas_id);
}
If the secondary shutdown fails while the primary shutdown succeeds,
qcom_pas_stop() returns 0 and rproc_coredump() reads the still-protected
secondary carveout, triggering an XPU or stage-2 access violation.
--
Sashiko AI review · https://sashiko.dev/#/patchset/20261118-oob-support-glymur-v3-0-2cbdfe208d56@oss.qualcomm.com?part=3
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v3 4/4] remoteproc: qcom: pas: Add Glymur OOBMSS PAS parameters
2026-11-18 15:36 ` [PATCH v3 4/4] remoteproc: qcom: pas: Add Glymur OOBMSS PAS parameters Anvesh Jain P
@ 2026-11-18 16:24 ` sashiko-bot
0 siblings, 0 replies; 8+ messages in thread
From: sashiko-bot @ 2026-11-18 16:24 UTC (permalink / raw)
To: Anvesh Jain P; +Cc: devicetree, robh, conor+dt
Thank you for your contribution! Sashiko AI review found 3 potential
issues to consider:
- [Medium] remoteproc: qcom: pas: broken secondary dump segments in
qcom_pas_load()
- [Medium] remoteproc: qcom: pas: secondary shutdown errors lost in
qcom_pas_stop()
- [Medium] remoteproc: qcom: pas: firmware leak after qcom_pas_load() on
start error
--
commit 3641ec429dbae3576cd54c539314ea4edd45ce32
Author: Anvesh Jain P <anvesh.p@oss.qualcomm.com>
remoteproc: qcom: pas: Add Glymur OOBMSS PAS parameters
This commit adds PAS resource parameters and the qcom,glymur-oobmss-pas
compatible entry for the OOBMSS subsystem on Glymur platforms.
> diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c
> index a167bd6072c94..5cc529e2923ca 100644
> --- a/drivers/remoteproc/qcom_q6v5_pas.c
> +++ b/drivers/remoteproc/qcom_q6v5_pas.c
> @@ -2182,6 +2182,30 @@ static const struct qcom_pas_data kaanapali_soccp_resource = {
> .early_boot = true,
> };
>
> +static const struct qcom_pas_data glymur_oobmss_resource = {
> + .crash_reason_smem = 669,
> + .firmware_name = "oobmss_tee.mbn",
> + .dtb_firmware_name = "oobmss_qc_dtb.mbn",
> + .secondary_firmware_name = "oobmss_ns.mbn",
> + .secondary_dtb_firmware_name = "oobmss_oem_dtb.mbn",
> + .pas_id = 0x42,
> + .dtb_pas_id = 0x43,
> + .secondary_pas_id = 0x44,
> + .secondary_dtb_pas_id = 0x45,
[Severity: Medium]
Can this leak pas->secondary_dtb_firmware, pas->secondary_firmware and
pas->dtb_firmware if starting the remoteproc fails after qcom_pas_load()
succeeds?
qcom_pas_load() requests all three firmware blobs, while
qcom_pas_release_firmware() is only called from qcom_pas_start() on
success or under its disable_irqs error label. If
rproc_prepare_subdevices() fails in rproc_start() before calling
qcom_pas_start(), rproc_fw_boot() unwinds through qcom_pas_unprepare(),
which releases metadata contexts without calling
qcom_pas_release_firmware(). In addition, if qcom_q6v5_prepare() fails at
the start of qcom_pas_start(), it returns early before disable_irqs,
leaking the three struct firmware allocations and leaving pas->firmware
dangling:
drivers/remoteproc/qcom_q6v5_pas.c:qcom_pas_start() {
...
ret = qcom_q6v5_prepare(&pas->q6v5);
if (ret)
return ret;
...
disable_irqs:
qcom_q6v5_unprepare(&pas->q6v5);
qcom_pas_release_firmware(pas);
...
}
> + .proxy_pd_names = (char *[]){
> + "cx",
> + "mx",
> + NULL
> + },
> + .ssr_name = "oobmss",
> + .sysmon_name = "oobmss",
> + .ssctl_id = 0x21,
> + .auto_boot = true,
> + .early_boot = true,
[Severity: Medium]
How are coredump segments handled across attach and crash recovery when
both secondary_pas_id and early_boot are enabled?
Primary dump segments are registered in qcom_pas_parse_firmware()
(rproc->ops->parse_fw), whereas secondary dump segments are registered in
qcom_pas_load() (rproc->ops->load):
drivers/remoteproc/qcom_q6v5_pas.c:qcom_pas_load() {
...
if (pas->secondary_pas_id) {
ret = qcom_register_dump_segments(rproc, pas->secondary_firmware);
...
}
With early_boot set, qcom_pas_probe() starts in RPROC_DETACHED and
rproc_boot() attaches via rproc_attach() -> qcom_pas_attach() without
calling parse_fw or load, leaving rproc->dump_segments empty so
qcom_pas_coredump() skips dumping on the first crash. During recovery,
rproc_boot_recovery() runs rproc_start() -> rproc_load_segments() ->
qcom_pas_load() without calling rproc_resource_cleanup() or
rproc_parse_fw(). As a result, primary dump segments are still missing
after recovery from early_boot attach, and each subsequent crash recovery
appends another duplicate set of secondary dump segments to
rproc->dump_segments.
> + .needs_tzmem = true,
> + .decrypt_shutdown = true,
> +};
[Severity: Medium]
Does qcom_pas_stop() discard shutdown errors from pas->secondary_pas_id
and pas->secondary_dtb_pas_id?
Unlike the pas->dtb_pas_id block, which saves its status in dtb_ret and
preserves an earlier error, qcom_pas_stop() reuses ret and unconditionally
overwrites it when shutting down pas->secondary_dtb_pas_id and
pas->pas_id:
drivers/remoteproc/qcom_q6v5_pas.c:qcom_pas_stop() {
...
if (pas->secondary_pas_id) {
ret = qcom_pas_shutdown(pas->secondary_pas_id);
if (ret && pas->decrypt_shutdown)
ret = qcom_pas_shutdown_poll_decrypt(pas->secondary_pas_id);
...
}
if (pas->secondary_dtb_pas_id) {
ret = qcom_pas_shutdown(pas->secondary_dtb_pas_id);
...
}
ret = qcom_pas_shutdown(pas->pas_id);
...
}
If shutting down secondary_pas_id or secondary_dtb_pas_id fails while
pas_id and dtb_pas_id succeed, qcom_pas_stop() returns 0. During
rproc_boot_recovery(), a masked stop failure lets execution continue into
qcom_pas_coredump(), which maps pas->secondary_pas_ctx and reads
pas->secondary_mem_region even though the secondary PAS shutdown failed.
--
Sashiko AI review · https://sashiko.dev/#/patchset/20261118-oob-support-glymur-v3-0-2cbdfe208d56@oss.qualcomm.com?part=4
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2026-11-18 16:24 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-18 15:36 [PATCH v3 0/4] Add Glymur OOBMSS support Anvesh Jain P
2026-11-18 15:36 ` [PATCH v3 1/4] dt-bindings: remoteproc: qcom: Add Glymur OOBMSS PAS Anvesh Jain P
2026-11-18 15:36 ` [PATCH v3 2/4] remoteproc: qcom: pas: Support secondary images Anvesh Jain P
2026-11-18 15:56 ` sashiko-bot
2026-11-18 15:36 ` [PATCH v3 3/4] remoteproc: qcom: pas: Add coredump support for secondary processors Anvesh Jain P
2026-11-18 16:03 ` sashiko-bot
2026-11-18 15:36 ` [PATCH v3 4/4] remoteproc: qcom: pas: Add Glymur OOBMSS PAS parameters Anvesh Jain P
2026-11-18 16:24 ` sashiko-bot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox