Add new driver for WCSS secure PIL loading
Subsystems (4)
v13 cover Add new driver for WCSS secure PIL loading
As discussed in [4] posting this series after dropping IPQ5424 support to remove dependency on Sricharan's tmel-qmp mailbox driver series v4 [1].
Imported from [email protected].
Imported from [email protected] I've resumed Gokul's work as the last submission dates back April 2025.
- Secure PIL is signed, firmware images which only TrustZone (TZ) can authenticate and load. Linux kernel will send a request to TZ to authenticate and load the PIL images.
- When secure PIL support was added to the existing wcss PIL driver earlier in [2], Bjorn suggested not to overload the existing WCSS rproc driver, instead post a new driver for PAS based IPQ WCSS driver. This series adds a new secure PIL driver for the same.
- Also adds changes to scm to pass metadata size as required for IPQ5332, reposted from [3].
[1]
https://patchwork.kernel.org/project/linux-arm-msm/cover/[email protected]/
[2]
https://patchwork.kernel.org/project/linux-arm-msm/patch/[email protected]/
[3]
https://patchwork.kernel.org/project/linux-arm-msm/patch/[email protected]/
[4]
https://lore.kernel.org/linux-arm-msm/aUN7Aer%[email protected]/
Changes in v13:
- Rebase to ToT (First patch alone had conflicts)
- Add 'Tested-by: Vignesh'
- Link to v12: https://lore.kernel.org/linux-arm-msm/[email protected]/
Changes in v12:
- No code change
- Rebase to ToT
- Change quicinc mail ids to oss.qualcomm.com mail ids
- Link to v11: https://lore.kernel.org/linux-arm-msm/[email protected]/
Changes in v11:
- Add R-b tags
- Rebase the first patch ("firmware: qcom_scm: ipq5332: add support to pass metadata size") to top of tree
- No change in other patches
- Link to v10: https://lore.kernel.org/linux-arm-msm/[email protected]/
Changes in v10:
- Add R-b tags
- Remove unused fields from 'struct wcss_sec'
- Remove glink and ssr subdev if wcss_sec_probe() fails
- Link to v9: https://lore.kernel.org/linux-arm-msm/[email protected]/
Changes in v9:
- Add R-b from Konrad for dts patches
- Renamed qcom,wcss-sec-pil.yaml -> qcom,ipq5018-wcss-sec-pil.yaml
- Restore clocks & clock-names in above yaml
- Fix DCO on two patches
- Link to v8: https://lore.kernel.org/linux-arm-msm/[email protected]/
Changes in v8:
- Dropped Krzysztof's 'Reviewed-by' as the bindings file has changed significantly
* IPQ5018 support added in v6
* IPQ5424 support dropped in v8
* Updated to use IPQ9574 as example
- dt-bindings-check and dtbs-check passed
- Dropped IPQ5424 support from drivers/remoteproc/qcom_q6v5_wcss_sec.c
- Updated copyrights of drivers/remoteproc/qcom_q6v5_wcss_sec.c
- Change 'qcom,smem-state-names' order to resolve dt-bindings-check error in ipq5018.dtsi
- Dropped changes to ipq5424.dtsi
- Link to v7: https://lore.kernel.org/linux-arm-msm/[email protected]/
Changes in v7:
- correctly sorted QCOM_SCM_PIL_PAS_INIT_IMAGE_V2 by command ID
- correctly sorted smp2p-wcss nodes in dtsi files
- Link to v6: https://lore.kernel.org/r/[email protected]
Changes in v6:
- added patch to fix IPC register offset for ipq5424
- changed phandle description for mboxes property in dt-bindings
- updated bindings to define the right clocks per SoC based on
compatible. Ran make dt_binding_check for validation of all
SoCs
- use of more descriptive match data property (use_tmelcom) and
added a condition in wcss_start to not error out if tmelcom
isn't used
- mitigated potential off-by-one
- adopted use of of_reserved_mem_region_to_resource to acquire
memory-region resource
- added driver support for ipq5018 SoC
- corrected size of reg properties as per Konrad's comments
- added patch to bring up Q6 in ipq5018 dtsi
- Link to v5: https://lore.kernel.org/r/[email protected]
Changes in v5:
- retained all the patches as in v3 and addressed comments in v3.
- reverted changes to dt-bindings done in v4 and retained as in v3 and fixed firmware format from .mdt to .mbn and retained reviewed-by.
- dropped 2 patches in v4 that adds support for q6 dtb loading. Will post them as a new series.
Following tests were done:
- checkpatch
- dt_binding_check and dtbs_check
- Link to v4: https://lore.kernel.org/r/[email protected]
Changes in v4:
- changed q6 firmware image format from .mdt to .mbn
- corrected arrangement of variable assignemnts as per comments
in qcom_scm.c
- added scm call to get board machid
- added support for q6 dtb loading with support for additional
reserved memory for q6 dtb in .mbn format
- updated dt-bindings to include new dts entry qcom,q6-dtb-info
and additional item in memory-region for q6 dtb region.
- removed unnecessary dependency for QCOM_Q6V5_WCSS_SEC in
Kconfig
- removed unwanted header files in qcom_q6v5_wcss_sec.c
- removed repeated dtb parsing during runtime in qcom_q6v5_wcss_sec.c
- added required check for using tmelcom, if available. Enabled
fallback to scm based authentication, if tmelcom is unavailable.
- added necessary padding for 8digt hex address in dts
- Link to v3: https://lore.kernel.org/r/[email protected]
Following tests were done:
- checkpatch
- kernel-doc
- dt_binding_check and dtbs_check
Changes in v3:
- fixed copyright years and markings based on Jeff's comments.
- replaced devm_ioremap_wc() with ioremap_wc() in
wcss_sec_copy_segment().
- replaced rproc_alloc() and rproc_add() with their devres
counterparts.
- added mailbox call to tmelcom for secure image authentication
as required for IPQ5424. Added ipq5424 APCS comatible required.
- added changes to scm call to pass metadata size as required for
IPQ5332.
- Link to v2: https://lore.kernel.org/r/[email protected]
Changes in v2:
- Removed dependency of this series to q6 clock removal series
as recommended by Krzysztof
- Link to v1: https://lore.kernel.org/r/[email protected]
George Moussalem (1):
arm64: dts: qcom: ipq5018: add nodes to bring up q6
Manikanta Mylavarapu (4):
firmware: qcom_scm: ipq5332: add support to pass metadata size
dt-bindings: remoteproc: qcom: document hexagon based WCSS secure PIL
arm64: dts: qcom: ipq5332: add nodes to bring up q6
arm64: dts: qcom: ipq9574: add nodes to bring up q6
Vignesh Viswanathan (1):
remoteproc: qcom: add hexagon based WCSS secure PIL driver
.../remoteproc/qcom,ipq5018-wcss-sec-pil.yaml | 178 ++++++++++ arch/arm64/boot/dts/qcom/ipq5018.dtsi | 64 ++++ arch/arm64/boot/dts/qcom/ipq5332.dtsi | 64 +++- arch/arm64/boot/dts/qcom/ipq9574.dtsi | 60 +++- drivers/firmware/qcom/qcom_scm.c | 14 +- drivers/firmware/qcom/qcom_scm.h | 1 + drivers/remoteproc/Kconfig | 19 + drivers/remoteproc/Makefile | 1 + drivers/remoteproc/qcom_q6v5_wcss_sec.c | 325 ++++++++++++++++++ include/linux/remoteproc.h | 2 + 10 files changed, 723 insertions(+), 5 deletions(-) create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,ipq5018-wcss-sec-pil.yaml create mode 100644 drivers/remoteproc/qcom_q6v5_wcss_sec.c
To: Bjorn Andersson <[email protected]>
To: Konrad Dybcio <[email protected]>
To: Mathieu Poirier <[email protected]>
To: Rob Herring <[email protected]>
To: Krzysztof Kozlowski <[email protected]>
To: Conor Dooley <[email protected]>
To: Manikanta Mylavarapu <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
base-commit: next-20260710
Signature · 34 lines
2.34.1 Signed-off-by: Varadarajan Narayanan <[email protected]> --- George Moussalem (1): arm64: dts: qcom: ipq5018: add nodes to bring up q6 Manikanta Mylavarapu (4): firmware: qcom_scm: ipq5332: add support to pass metadata size dt-bindings: remoteproc: qcom: document hexagon based WCSS secure PIL arm64: dts: qcom: ipq5332: add nodes to bring up q6 arm64: dts: qcom: ipq9574: add nodes to bring up q6 Vignesh Viswanathan (1): remoteproc: qcom: add hexagon based WCSS secure PIL driver .../remoteproc/qcom,ipq5018-wcss-sec-pil.yaml | 178 +++++++++++ arch/arm64/boot/dts/qcom/ipq5018.dtsi | 64 ++++ arch/arm64/boot/dts/qcom/ipq5332.dtsi | 62 ++++ arch/arm64/boot/dts/qcom/ipq9574.dtsi | 60 +++- drivers/firmware/qcom/qcom_scm.c | 14 +- drivers/firmware/qcom/qcom_scm.h | 1 + drivers/remoteproc/Kconfig | 19 ++ drivers/remoteproc/Makefile | 1 + drivers/remoteproc/qcom_q6v5_wcss_sec.c | 325 +++++++++++++++++++++ include/linux/remoteproc.h | 2 + 10 files changed, 722 insertions(+), 4 deletions(-) --- base-commit: 44d18d44c5999ca30c3328a146b308c385eeee5c change-id: 20260710-rproc-c4f4d0c1f45c Best regards, -- Varadarajan Narayanan <[email protected]>
PATCH v13 1/6 firmware: qcom_scm: ipq5332: add support to pass metadata size
From: Manikanta Mylavarapu <[email protected]>
IPQ5332 security software running under trustzone requires metadata size. With new command support added in TrustZone that includes a size parameter, pass metadata size as well.
--- drivers/firmware/qcom/qcom_scm.c | 14 +++++++++++--- drivers/firmware/qcom/qcom_scm.h | 1 + 2 files changed, 12 insertions(+), 3 deletions(-)
drivers/firmware/qcom/qcom_scm.c +11 -3
@@ -575,7 +575,7 @@ EXPORT_SYMBOL_GPL(devm_qcom_scm_pas_context_alloc);static int __qcom_scm_pas_init_image (struct device *dev,u32 pas_id,dma_addr_t mdata_phys, -struct qcom_scm_res *res) +struct qcom_scm_res *res,size_t size) {struct qcom_scm_desc desc = { .svc =QCOM_SCM_SVC_PIL ,
@@ -596,6 +596,14 @@ static int __qcom_scm_pas_init_image(struct device *dev, u32 pas_id, desc.args[1 ] = mdata_phys; +if (__qcom_scm_is_call_available (__scm->dev,QCOM_SCM_SVC_PIL , +QCOM_SCM_PIL_PAS_INIT_IMAGE_V2 )) { + desc.cmd =QCOM_SCM_PIL_PAS_INIT_IMAGE_V2 ; + desc.arginfo =QCOM_SCM_ARGS (3 ,QCOM_SCM_VAL ,QCOM_SCM_RW , +QCOM_SCM_VAL ); + desc.args[2 ] = size; + } + ret =qcom_scm_call (dev, &desc, res);qcom_scm_bw_disable ();
@@ -621,7 +629,7 @@ static int qcom_scm_pas_prep_and_init_image(struct device *dev,memcpy (mdata_buf, metadata, size); mdata_phys =qcom_tzmem_to_phys (mdata_buf); - ret =__qcom_scm_pas_init_image (dev, ctx->pas_id, mdata_phys, &res); + ret =__qcom_scm_pas_init_image (dev, ctx->pas_id, mdata_phys, &res, size);if (ret <0 )qcom_tzmem_free (mdata_buf);else
@@ -660,7 +668,7 @@ static int __qcom_scm_pas_init_image2(struct device *dev, u32 pas_id,memcpy (mdata_buf, metadata, size); - ret =__qcom_scm_pas_init_image (dev, pas_id, mdata_phys, &res); + ret =__qcom_scm_pas_init_image (dev, pas_id, mdata_phys, &res, size);if (ret <0 || !ctx) {dma_free_coherent (dev, size, mdata_buf, mdata_phys); }else if (ctx) {
drivers/firmware/qcom/qcom_scm.h +1 -0
@@ -105,6 +105,7 @@ int qcom_scm_shm_bridge_enable(struct device *scm_dev);#define QCOM_SCM_PIL_PAS_SHUTDOWN 0x06#define QCOM_SCM_PIL_PAS_IS_SUPPORTED 0x07#define QCOM_SCM_PIL_PAS_MSS_RESET 0x0a +#define QCOM_SCM_PIL_PAS_INIT_IMAGE_V2 0x1a#define QCOM_SCM_PIL_PAS_GET_RSCTABLE 0x21#define QCOM_SCM_SVC_IO 0x05
Signature · 1 line
2.34.1
PATCH v13 2/6 dt-bindings: remoteproc: qcom: document hexagon based WCSS secure PIL
In reply to Varadarajan NarayananFrom: Manikanta Mylavarapu <[email protected]>
Add new binding document for hexagon based WCSS secure PIL remoteproc. IPQ5018, IPQ5332 and IPQ9574 follow secure PIL remoteproc.
--- .../remoteproc/qcom,ipq5018-wcss-sec-pil.yaml | 178 +++++++++++++++++++++ 1 file changed, 178 insertions(+)
Documentation/devicetree/bindings/remoteproc/qcom,ipq5018-wcss-sec-pil.yaml new file +178 -0
@@ -0,0 +1,178 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/remoteproc/qcom,ipq5018-wcss-sec-pil.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm WCSS Secure Peripheral Image Loader + +maintainers: + - Manikanta Mylavarapu <[email protected]> + +description: + Wireless Connectivity Subsystem (WCSS) Secure Peripheral Image Loader loads + firmware and power up QDSP6 remoteproc on the Qualcomm IPQ series SoC. + +properties: + compatible: + enum: + - qcom,ipq5018-wcss-sec-pil + - qcom,ipq5332-wcss-sec-pil + - qcom,ipq9574-wcss-sec-pil + + reg: + maxItems: 1 + + firmware-name: + maxItems: 1 + description: Firmware name for the Hexagon core + + interrupts: + items: + - description: Watchdog interrupt + - description: Fatal interrupt + - description: Ready interrupt + - description: Handover interrupt + - description: Stop acknowledge interrupt + + interrupt-names: + items: + - const: wdog + - const: fatal + - const: ready + - const: handover + - const: stop-ack + + clocks: + minItems: 1 + items: + - description: sleep clock + - description: AHB interconnect clock + + clock-names: + minItems: 1 + items: + - const: sleep + - const: interconnect + + mboxes: + items: + - description: TMECom mailbox driver + + qcom,smem-states: + $ref: /schemas/types.yaml#/definitions/phandle-array + description: States used by the AP to signal the remote processor + items: + - description: Stop Q6 + - description: Shutdown Q6 + + qcom,smem-state-names: + description: + Names of the states used by the AP to signal the remote processor + items: + - const: stop + - const: shutdown + + memory-region: + items: + - description: Q6 reserved region + + glink-edge: + $ref: /schemas/remoteproc/qcom,glink-edge.yaml# + description: + Qualcomm G-Link subnode which represents communication edge, channels + and devices related to the Modem. + unevaluatedProperties: false + +required: + - compatible + - reg + - firmware-name + - interrupts + - interrupt-names + - qcom,smem-states + - qcom,smem-state-names + - memory-region + +allOf: + - if: + properties: + compatible: + contains: + const: qcom,ipq5018-wcss-sec-pil + then: + properties: + clocks: + items: + - description: sleep clock + - description: AHB interconnect clock + clock-names: + items: + - const: sleep + - const: interconnect + required: + - clocks + - clock-names + + - if: + properties: + compatible: + contains: + const: qcom,ipq5332-wcss-sec-pil + then: + properties: + clocks: + items: + - description: sleep clock + clock-names: + items: + - const: sleep + required: + - clocks + - clock-names + + - if: + properties: + compatible: + contains: + enum: + - qcom,ipq9574-wcss-sec-pil + then: + properties: + clocks: false + clock-names: false + +additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/arm-gic.h> + + q6v5_wcss: remoteproc@cd00000 { + compatible = "qcom,ipq9574-wcss-sec-pil"; + reg = <0x0cd00000 0x10000>; + firmware-name = "ath11k/IPQ9574/hw1.0/q6_fw.mbn"; + interrupts-extended = <&intc GIC_SPI 325 IRQ_TYPE_EDGE_RISING>, + <&smp2p_wcss_in 0 IRQ_TYPE_NONE>, + <&smp2p_wcss_in 1 IRQ_TYPE_NONE>, + <&smp2p_wcss_in 2 IRQ_TYPE_NONE>, + <&smp2p_wcss_in 3 IRQ_TYPE_NONE>; + interrupt-names = "wdog", + "fatal", + "ready", + "handover", + "stop-ack"; + + qcom,smem-states = <&smp2p_wcss_out 1>, + <&smp2p_wcss_out 0>; + qcom,smem-state-names = "stop", + "shutdown"; + memory-region = <&q6_region>; + + glink-edge { + interrupts = <GIC_SPI 321 IRQ_TYPE_EDGE_RISING>; + label = "rtr"; + qcom,remote-pid = <1>; + mboxes = <&apcs_glb 8>; + }; + };
Signature · 1 line
2.34.1
Rob Herring (Arm)
maintainerRe: [PATCH v13 2/6] dt-bindings: remoteproc: qcom: document hexagon based WCSS secure PIL
Quoted 12 lines · Varadarajan Narayanan
From: Manikanta Mylavarapu <[email protected]>
Add new binding document for hexagon based WCSS secure PIL remoteproc. IPQ5018, IPQ5332 and IPQ9574 follow secure PIL remoteproc.
Signed-off-by Manikanta Mylavarapu <[email protected]>Signed-off-by Gokul Sriram Palanisamy <[email protected]>Signed-off-by George Moussalem <[email protected]>[ Dropped ipq5424 support ]Reviewed-by Krzysztof Kozlowski <[email protected]>Tested-by Vignesh Viswanathan <[email protected]>Signed-off-by Varadarajan Narayanan <[email protected]>
Quoted 4 lines
--- .../remoteproc/qcom,ipq5018-wcss-sec-pil.yaml | 178 +++++++++++++++++++++ 1 file changed, 178 insertions(+)
My bot found errors running 'make dt_binding_check' on your patch:
yamllint warnings/errors:
dtschema/dtc warnings/errors:
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/remoteproc/qcom,ipq5018-wcss-sec-pil.yaml: properties:qcom,smem-states:items:0: 'anyOf' conditional failed, one must be fixed:
'items' is a required property
'minItems' is a required property
'maxItems' is a required property
from schema $id: http://devicetree.org/meta-schemas/items.yaml
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/remoteproc/qcom,ipq5018-wcss-sec-pil.yaml: properties:qcom,smem-states:items:1: 'anyOf' conditional failed, one must be fixed:
'items' is a required property
'minItems' is a required property
'maxItems' is a required property
from schema $id: http://devicetree.org/meta-schemas/items.yaml
doc reference errors (make refcheckdocs):
See https://patchwork.kernel.org/project/devicetree/patch/[email protected]
The base for the series is generally the latest rc1. A different dependency should be noted in *this* patch.
If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date:
pip3 install dtschema --upgrade
Please check and re-submit after running the above command yourself. Note that DT_SCHEMA_FILES can be set to your schema file to speed up checking your schema. However, it must be unset to test all examples with your schema.
Re: [PATCH v13 2/6] dt-bindings: remoteproc: qcom: document hexagon based WCSS secure PIL
In reply to Varadarajan NarayananQuoted 11 lines · Varadarajan Narayanan
From: Manikanta Mylavarapu <[email protected]>
Add new binding document for hexagon based WCSS secure PIL remoteproc. IPQ5018, IPQ5332 and IPQ9574 follow secure PIL remoteproc.
Signed-off-by Manikanta Mylavarapu <[email protected]>Signed-off-by Gokul Sriram Palanisamy <[email protected]>Signed-off-by George Moussalem <[email protected]>[ Dropped ipq5424 support ]Reviewed-by Krzysztof Kozlowski <[email protected]>Tested-by Vignesh Viswanathan <[email protected]>
How did this appear here at v13? That's a v13 so all your tags are expected to be given in public.
There is no such tag:
https://lore.kernel.org/linux-arm-msm/[email protected]/
Not mentioning that YOU CANNOT test bindings in a meaning of tested-by.
Best regards,
Krzysztof
Re: [PATCH v13 2/6] dt-bindings: remoteproc: qcom: document hexagon based WCSS secure PIL
In reply to Varadarajan NarayananDocumentation/devicetree/bindings/remoteproc/qcom,ipq5018-wcss-sec-pil.yaml line 60
Quoted 4 lines · Varadarajan Narayanan
Documentation/devicetree/bindings/remoteproc/qcom,ipq5018-wcss-sec-pil.yaml new file +4
-0+ + mboxes: + items: + - description: TMECom mailbox driver
Drop "driver", this is not a phandle to a driver.
Documentation/devicetree/bindings/remoteproc/qcom,ipq5018-wcss-sec-pil.yaml line 67
Quoted 7 lines
Documentation/devicetree/bindings/remoteproc/qcom,ipq5018-wcss-sec-pil.yaml new file +7
-0+ + qcom,smem-states: + $ref: /schemas/types.yaml#/definitions/phandle-array + description: States used by the AP to signal the remote processor + items: + - description: Stop Q6 + - description: Shutdown Q6
Code already changed, you need to adapt this.
Best regards,
Krzysztof
PATCH v13 3/6 remoteproc: qcom: add hexagon based WCSS secure PIL driver
In reply to Varadarajan NarayananFrom: Vignesh Viswanathan <[email protected]>
Add support to bring up hexagon based WCSS using secure PIL. All IPQxxxx SoCs support secure Peripheral Image Loading (PIL).
Secure PIL image is signed firmware image which only trusted software such as TrustZone (TZ) can authenticate and load. Linux kernel will send a Peripheral Authentication Service (PAS) request to TZ to authenticate and load the PIL images.
In order to avoid overloading the existing WCSS driver or PAS driver, we came up with this new PAS based IPQ WCSS driver.
--- drivers/remoteproc/Kconfig | 19 ++ drivers/remoteproc/Makefile | 1 + drivers/remoteproc/qcom_q6v5_wcss_sec.c | 325 ++++++++++++++++++++++++++++++++ include/linux/remoteproc.h | 2 + 4 files changed, 347 insertions(+)
drivers/remoteproc/Kconfig +19 -0
@@ -258,6 +258,25 @@ config QCOM_Q6V5_WCSS Hexagon V5 based WCSS remote processors on e.g. IPQ8074. This is a non-TrustZone wireless subsystem. +config QCOM_Q6V5_WCSS_SEC + tristate "Qualcomm Hexagon based WCSS Secure Peripheral Image Loader" + depends on OF && ARCH_QCOM + depends on QCOM_SMEM + depends on RPMSG_QCOM_GLINK_SMEM || RPMSG_QCOM_GLINK_SMEM=n + depends on RPMSG_QCOM_GLINK || RPMSG_QCOM_GLINK=n + select QCOM_MDT_LOADER + select QCOM_PIL_INFO + select QCOM_Q6V5_COMMON + select QCOM_RPROC_COMMON + select QCOM_SCM + help + Say y here to support the Qualcomm Secure Peripheral Image Loader + for the Hexagon based remote processors on e.g. IPQ5332. + + This is TrustZone wireless subsystem. The firmware is + verified and booted with the help of the Peripheral Authentication + System (PAS) in TrustZone. + config QCOM_SYSMON tristate "Qualcomm sysmon driver" depends on RPMSG
drivers/remoteproc/Makefile +1 -0
@@ -28,6 +28,7 @@ obj-$(CONFIG_QCOM_Q6V5_ADSP) += qcom_q6v5_adsp.o obj-$(CONFIG_QCOM_Q6V5_MSS) += qcom_q6v5_mss.o obj-$(CONFIG_QCOM_Q6V5_PAS) += qcom_q6v5_pas.o obj-$(CONFIG_QCOM_Q6V5_WCSS) += qcom_q6v5_wcss.o +obj-$(CONFIG_QCOM_Q6V5_WCSS_SEC) += qcom_q6v5_wcss_sec.o obj-$(CONFIG_QCOM_SYSMON) += qcom_sysmon.o obj-$(CONFIG_QCOM_WCNSS_PIL) += qcom_wcnss_pil.o qcom_wcnss_pil-y += qcom_wcnss.o
drivers/remoteproc/qcom_q6v5_wcss_sec.c new file +325 -0
325 lines not on this page · raw message
include/linux/remoteproc.h +2 -0
@@ -205,6 +205,7 @@ enum rproc_dump_mechanism {* @node: list node related to the rproc segment list * @da: device address of the segment * @size: size of the segment +* @io_ptr: ptr to store the ioremapped dump segment * @priv: private data associated with the dump_segment * @dump: custom dump function to fill device memory segment associated * with coredump
@@ -216,6 +217,7 @@ struct rproc_dump_segment {dma_addr_t da;size_t size; +void *io_ptr;void *priv;void (*dump)(struct rproc *rproc,struct rproc_dump_segment *segment,void *dest,size_t offset,size_t size);
Signature · 1 line
2.34.1
[email protected]
AI reviewRe: [PATCH v13 3/6] remoteproc: qcom: add hexagon based WCSS secure PIL driver
Thank you for your contribution! Sashiko AI review found 7 potential issue(s) to consider: - [High] The coredump segment copy logic unmaps the I/O region without copying the final chunk of data, and…
Thank you for your contribution! Sashiko AI review found 7 potential issue(s) to consider:
- [High] The coredump segment copy logic unmaps the I/O region without copying the final chunk of data, and leaks the mapping on partial reads.
- [High] Incorrect teardown sequence using devm_rproc_add() causes Use-After-Free and missed subdevice cleanup during removal.
- [High] Incorrect error checking for devm_ioremap_resource_wc() leads to unhandled error pointers and kernel panic.
- [High] wcss_sec_start() unconditionally falls through to the error cleanup path on success, unpreparing the successfully started processor.
- [Medium] Missing qcom_q6v5_deinit() call in the probe error path leaks the QMP device handle.
- [Medium] Failure to set is_iomem flag in wcss_sec_da_to_va implementation causes improper I/O access.
- [Low] Integer truncation in wcss_sec_da_to_va() allows bounds check bypass for out-of-bounds device addresses.
--
--- Patch [3]: [PATCH v13 3/6] remoteproc: qcom: add hexagon based WCSS secure PIL driver --- commit bd0a3df0198fbc98aeb1c2a316d62a018ed12f78
Author: Vignesh Viswanathan <[email protected]>
Subject: remoteproc: qcom: add hexagon based WCSS secure PIL driver
Add support to bring up hexagon based WCSS using secure PIL. All IPQxxxx SoCs support secure Peripheral Image Loading (PIL).
[ ... ]
Quoted 6 lines
drivers/remoteproc/qcom_q6v5_wcss_sec.c new file +0
-0@@ -0,0 +1,325 @@
[ ... ]
Quoted 15 lines
drivers/remoteproc/qcom_q6v5_wcss_sec.c new file +15
-0+static int wcss_sec_start (struct rproc *rproc) +{ +struct wcss_sec *wcss = rproc->priv; +struct device *dev = wcss->dev; +int ret; + + ret =qcom_q6v5_prepare (&wcss->q6); +if (ret) +return ret; + + ret =qcom_scm_pas_auth_and_reset (wcss->desc->pasid); +if (ret) { +dev_err (dev,"wcss_reset failed\n" ); + goto unprepare; + }
drivers/remoteproc/qcom_q6v5_wcss_sec.c line 66
Quoted 10 lines
drivers/remoteproc/qcom_q6v5_wcss_sec.c new file +10
-0+ + ret =qcom_q6v5_wait_for_start (&wcss->q6,Q6_WAIT_TIMEOUT ); +if (ret == -ETIMEDOUT ) +dev_err (dev,"start timed out\n" ); + +unprepare: +qcom_q6v5_unprepare (&wcss->q6); + +return ret; +}
[Severity: High]
Does wcss_sec_start() unintentionally disable the processor on success?
If qcom_q6v5_wait_for_start() succeeds and returns 0, the execution falls through directly to the unprepare label, which drops the interconnect bandwidth vote and load state.
Also, if wait_for_start() times out, the code falls through without calling qcom_scm_pas_shutdown(), leaving TrustZone's peripheral authentication system in an inconsistent state. Should there be a return before the unprepare label and a pas shutdown on timeout?
[ ... ]
drivers/remoteproc/qcom_q6v5_wcss_sec.c line 87
Quoted 3 lines
drivers/remoteproc/qcom_q6v5_wcss_sec.c new file +3
-0+static void *wcss_sec_da_to_va (struct rproc *rproc,u64 da,size_t len, +bool *is_iomem) +{
[Severity: Medium]
Should this function set *is_iomem to true?
Since wcss->mem_region is mapped using devm_ioremap_resource_wc(), the returned address is I/O memory. If *is_iomem is not set, the remoteproc core might use standard memory accessors instead of I/O specific accessors, which could lead to unaligned access faults on some architectures.
drivers/remoteproc/qcom_q6v5_wcss_sec.c line 91
Quoted 4 lines
drivers/remoteproc/qcom_q6v5_wcss_sec.c new file +4
-0+struct wcss_sec *wcss = rproc->priv; +int offset; + + offset = da - wcss->mem_reloc;
[Severity: Low]
Can this integer truncation bypass the subsequent bounds check?
The variable offset is declared as a 32-bit signed int, but da is a 64-bit u64 and mem_reloc is phys_addr_t. If an out-of-bounds device address is evaluated, the large 64-bit difference could be truncated into a small positive 32-bit integer, bypassing the offset + len > wcss->mem_size check later in the function.
Quoted 5 lines
drivers/remoteproc/qcom_q6v5_wcss_sec.c new file +5
-0+if (offset <0 || offset + len > wcss->mem_size) +return NULL ; + +return wcss->mem_region + offset; +}
[ ... ]
Quoted 13 lines
drivers/remoteproc/qcom_q6v5_wcss_sec.c new file +13
-0+static void wcss_sec_copy_segment (struct rproc *rproc, +struct rproc_dump_segment *segment, +void *dest,size_t offset,size_t size) +{ +struct wcss_sec *wcss = rproc->priv; +struct device *dev = wcss->dev; + +if (!segment->io_ptr) + segment->io_ptr =ioremap_wc (segment->da, segment->size); + +if (!segment->io_ptr) { +dev_err (dev,"Failed to ioremap segment %pad size 0x%zx\n" , + &segment->da, segment->size);
drivers/remoteproc/qcom_q6v5_wcss_sec.c line 143
Quoted 10 lines
drivers/remoteproc/qcom_q6v5_wcss_sec.c new file +10
-0+return ; + } + +if (offset + size < segment->size) { +memcpy (dest, segment->io_ptr + offset, size); + }else { +iounmap (segment->io_ptr); + segment->io_ptr =NULL ; + } +}
[Severity: High]
Does this else block skip copying the final chunk of data?
When reading the final chunk of a segment where offset + size >= segment->size, the code falls into the else block and unmaps the I/O memory but completely misses the memcpy() call. This leaves the last chunk of the coredump uninitialized in the destination buffer.
Additionally, if userspace performs a partial read or aborts the dump, the else block is never executed. Since rproc_coredump_cleanup() does not unmap private pointers like io_ptr, does this permanently leak the I/O mapping?
[ ... ]
Quoted 7 lines
drivers/remoteproc/qcom_q6v5_wcss_sec.c new file +7
-0+static int wcss_sec_alloc_memory_region (struct wcss_sec *wcss) +{ +struct device *dev = wcss->dev; +struct resource res; +int ret; + + ret =of_reserved_mem_region_to_resource (dev->of_node,0 , &res);
drivers/remoteproc/qcom_q6v5_wcss_sec.c line 214
Quoted 10 lines
drivers/remoteproc/qcom_q6v5_wcss_sec.c new file +10
-0+if (ret) { +dev_err (dev,"unable to acquire memory-region resource\n" ); +return ret; + } + + wcss->mem_phys = res.start; + wcss->mem_reloc = res.start; + wcss->mem_size =resource_size (&res); + wcss->mem_region =devm_ioremap_resource_wc (dev, &res); +if (!wcss->mem_region) {
[Severity: High]
Is this error check sufficient for devm_ioremap_resource_wc()?
The function devm_ioremap_resource_wc() returns an ERR_PTR on failure, not NULL. Evaluating !wcss->mem_region will pass if an error pointer is returned, which could later lead to a kernel panic when wcss->mem_region is dereferenced in wcss_sec_load().
Quoted 6 lines
drivers/remoteproc/qcom_q6v5_wcss_sec.c new file +6
-0+dev_err (dev,"unable to map memory region: %pR\n" , &res); +return -ENOMEM ; + } + +return 0 ; +}
[ ... ]
Quoted 2 lines
drivers/remoteproc/qcom_q6v5_wcss_sec.c new file +2
-0+static int wcss_sec_probe (struct platform_device *pdev) +{
[ ... ]
drivers/remoteproc/qcom_q6v5_wcss_sec.c line 279
Quoted 10 lines
drivers/remoteproc/qcom_q6v5_wcss_sec.c new file +10
-0+ rproc->auto_boot = false; + rproc->dump_conf =RPROC_COREDUMP_INLINE ; +rproc_coredump_set_elf_info (rproc,ELFCLASS32 ,EM_NONE ); + + ret =devm_rproc_add (&pdev->dev, rproc); +if (ret) { +qcom_remove_glink_subdev (rproc, &wcss->glink_subdev); +qcom_remove_ssr_subdev (rproc, &wcss->ssr_subdev); +return ret; + }
[Severity: Medium]
Is a call to qcom_q6v5_deinit() missing in this error path?
Earlier in probe, qcom_q6v5_init() acquires a reference to the QMP device handle via qmp_get(). If devm_rproc_add() fails, returning here without calling qcom_q6v5_deinit() will permanently leak the QMP device handle.
Quoted 5 lines
drivers/remoteproc/qcom_q6v5_wcss_sec.c new file +5
-0+ +platform_set_drvdata (pdev, rproc); + +return 0 ; +}
drivers/remoteproc/qcom_q6v5_wcss_sec.c line 294
Quoted 10 lines
drivers/remoteproc/qcom_q6v5_wcss_sec.c new file +10
-0+ +static void wcss_sec_remove (struct platform_device *pdev) +{ +struct rproc *rproc =platform_get_drvdata (pdev); +struct wcss_sec *wcss = rproc->priv; + +qcom_remove_glink_subdev (rproc, &wcss->glink_subdev); +qcom_remove_ssr_subdev (rproc, &wcss->ssr_subdev); +qcom_q6v5_deinit (&wcss->q6); +}
[Severity: High]
Does this sequence create a Use-After-Free during device teardown?
Because the remoteproc was registered using devm_rproc_add() in probe, the rproc_del() function is scheduled to execute automatically during the devres teardown phase, which runs after wcss_sec_remove() returns.
If qcom_q6v5_deinit() drops the q6v5->qmp handle via qmp_put() here, when rproc_del() later tries to stop the running remoteproc, it will call wcss_sec_stop() -> qcom_q6v5_unprepare(). This will attempt to toggle the load state using the already-freed q6v5->qmp pointer, causing a kernel panic.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=3
PATCH v13 4/6 arm64: dts: qcom: ipq5018: add nodes to bring up q6
In reply to Varadarajan NarayananFrom: George Moussalem <[email protected]>
Enable nodes required for q6 remoteproc bring up.
--- arch/arm64/boot/dts/qcom/ipq5018.dtsi | 64 +++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+)
arch/arm64/boot/dts/qcom/ipq5018.dtsi +64 -0
@@ -158,6 +158,35 @@ tz_region: tz@4ac00000 { reg = <0x0 0x4ac00000 0x0 0x200000>; no-map; }; + + q6_region: wcss@4b000000 { + no-map; + reg = <0x0 0x4b000000 0x0 0x1b00000>; + }; + }; + + wcss: smp2p-wcss { + compatible = "qcom,smp2p"; + qcom,smem = <435>, <428>; + + interrupt-parent = <&intc>; + interrupts = <GIC_SPI 177 IRQ_TYPE_EDGE_RISING>; + + mboxes = <&apcs_glb 9>; + + qcom,local-pid = <0>; + qcom,remote-pid = <1>; + + wcss_smp2p_out: master-kernel { + qcom,entry-name = "master-kernel"; + #qcom,smem-state-cells = <1>; + }; + + wcss_smp2p_in: slave-kernel { + qcom,entry-name = "slave-kernel"; + interrupt-controller; + #interrupt-cells = <2>; + }; }; soc: soc@0 {
@@ -731,6 +760,41 @@ frame@b128000 { }; }; + q6v5_wcss: remoteproc@cd00000 { + compatible = "qcom,ipq5018-wcss-sec-pil"; + reg = <0x0cd00000 0x10000>; + firmware-name = "ath11k/IPQ5018/hw1.0/q6_fw.mbn"; + interrupts-extended = <&intc GIC_SPI 291 IRQ_TYPE_EDGE_RISING>, + <&wcss_smp2p_in 0 IRQ_TYPE_NONE>, + <&wcss_smp2p_in 1 IRQ_TYPE_NONE>, + <&wcss_smp2p_in 2 IRQ_TYPE_NONE>, + <&wcss_smp2p_in 3 IRQ_TYPE_NONE>; + interrupt-names = "wdog", + "fatal", + "ready", + "handover", + "stop-ack"; + + clocks = <&gcc GCC_SLEEP_CLK_SRC>, + <&gcc GCC_SYS_NOC_WCSS_AHB_CLK>; + clock-names = "sleep", + "interconnect"; + + qcom,smem-states = <&wcss_smp2p_out 1>, + <&wcss_smp2p_out 0>; + qcom,smem-state-names = "stop", + "shutdown"; + + memory-region = <&q6_region>; + + glink-edge { + interrupts = <GIC_SPI 179 IRQ_TYPE_EDGE_RISING>; + label = "rtr"; + qcom,remote-pid = <1>; + mboxes = <&apcs_glb 8>; + }; + }; + pcie1: pcie@80000000 { compatible = "qcom,pcie-ipq5018"; reg = <0x80000000 0xf1d>,
Signature · 1 line
2.34.1
PATCH v13 5/6 arm64: dts: qcom: ipq5332: add nodes to bring up q6
In reply to Varadarajan NarayananFrom: Manikanta Mylavarapu <[email protected]>
Enable nodes required for q6 remoteproc bring up.
--- arch/arm64/boot/dts/qcom/ipq5332.dtsi | 62 +++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+)
arch/arm64/boot/dts/qcom/ipq5332.dtsi +62 -0
@@ -159,6 +159,35 @@ smem@4a800000 { hwlocks = <&tcsr_mutex 3>; }; + + q6_region: wcss@4a900000 { + reg = <0x0 0x4a900000 0x0 0x2b00000>; + no-map; + }; + }; + + wcss: smp2p-wcss { + compatible = "qcom,smp2p"; + qcom,smem = <435>, <428>; + + interrupt-parent = <&intc>; + interrupts = <GIC_SPI 418 IRQ_TYPE_EDGE_RISING>; + + mboxes = <&apcs_glb 9>; + + qcom,local-pid = <0>; + qcom,remote-pid = <1>; + + smp2p_wcss_out: master-kernel { + qcom,entry-name = "master-kernel"; + #qcom,smem-state-cells = <1>; + }; + + smp2p_wcss_in: slave-kernel { + qcom,entry-name = "slave-kernel"; + interrupt-controller; + #interrupt-cells = <2>; + }; }; soc@0 {
@@ -656,6 +685,39 @@ frame@b128000 { }; }; + q6v5_wcss: remoteproc@d100000 { + compatible = "qcom,ipq5332-wcss-sec-pil"; + reg = <0x0d100000 0x10000>; + firmware-name = "ath12k/IPQ5332/hw1.0/q6_fw0.mbn"; + interrupts-extended = <&intc GIC_SPI 421 IRQ_TYPE_EDGE_RISING>, + <&smp2p_wcss_in 0 IRQ_TYPE_NONE>, + <&smp2p_wcss_in 1 IRQ_TYPE_NONE>, + <&smp2p_wcss_in 2 IRQ_TYPE_NONE>, + <&smp2p_wcss_in 3 IRQ_TYPE_NONE>; + interrupt-names = "wdog", + "fatal", + "ready", + "handover", + "stop-ack"; + + clocks = <&gcc GCC_IM_SLEEP_CLK>; + clock-names = "sleep"; + + qcom,smem-states = <&smp2p_wcss_out 1>, + <&smp2p_wcss_out 0>; + qcom,smem-state-names = "stop", + "shutdown"; + + memory-region = <&q6_region>; + + glink-edge { + interrupts = <GIC_SPI 417 IRQ_TYPE_EDGE_RISING>; + label = "rtr"; + qcom,remote-pid = <1>; + mboxes = <&apcs_glb 8>; + }; + }; + pcie1: pcie@18000000 { compatible = "qcom,pcie-ipq5332", "qcom,pcie-ipq9574"; reg = <0x18000000 0xf1c>,
Signature · 1 line
2.34.1
PATCH v13 6/6 arm64: dts: qcom: ipq9574: add nodes to bring up q6
In reply to Varadarajan NarayananFrom: Manikanta Mylavarapu <[email protected]>
Enable nodes required for q6 remoteproc bring up.
--- arch/arm64/boot/dts/qcom/ipq9574.dtsi | 60 ++++++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/ipq9574.dtsi +59 -1
@@ -3,7 +3,7 @@ * IPQ9574 SoC device tree source * * Copyright (c) 2020-2021 The Linux Foundation. All rights reserved. - * Copyright (c) 2023-2024, Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023-2025, Qualcomm Innovation Center, Inc. All rights reserved. */ #include <dt-bindings/clock/qcom,apss-ipq.h>
@@ -222,6 +222,35 @@ smem@4aa00000 { hwlocks = <&tcsr_mutex 3>; no-map; }; + + q6_region: wcss@4ab00000 { + reg = <0x0 0x4ab00000 0x0 0x2b00000>; + no-map; + }; + }; + + wcss: smp2p-wcss { + compatible = "qcom,smp2p"; + qcom,smem = <435>, <428>; + + interrupt-parent = <&intc>; + interrupts = <GIC_SPI 322 IRQ_TYPE_EDGE_RISING>; + + mboxes = <&apcs_glb 9>; + + qcom,local-pid = <0>; + qcom,remote-pid = <1>; + + smp2p_wcss_out: master-kernel { + qcom,entry-name = "master-kernel"; + #qcom,smem-state-cells = <1>; + }; + + smp2p_wcss_in: slave-kernel { + qcom,entry-name = "slave-kernel"; + interrupt-controller; + #interrupt-cells = <2>; + }; }; soc: soc@0 {
@@ -924,6 +953,35 @@ frame@b128000 { }; }; + q6v5_wcss: remoteproc@cd00000 { + compatible = "qcom,ipq9574-wcss-sec-pil"; + reg = <0x0cd00000 0x10000>; + firmware-name = "ath11k/IPQ9574/hw1.0/q6_fw.mbn"; + interrupts-extended = <&intc GIC_SPI 325 IRQ_TYPE_EDGE_RISING>, + <&smp2p_wcss_in 0 IRQ_TYPE_NONE>, + <&smp2p_wcss_in 1 IRQ_TYPE_NONE>, + <&smp2p_wcss_in 2 IRQ_TYPE_NONE>, + <&smp2p_wcss_in 3 IRQ_TYPE_NONE>; + interrupt-names = "wdog", + "fatal", + "ready", + "handover", + "stop-ack"; + + qcom,smem-states = <&smp2p_wcss_out 1>, + <&smp2p_wcss_out 0>; + qcom,smem-state-names = "stop", + "shutdown"; + memory-region = <&q6_region>; + + glink-edge { + interrupts = <GIC_SPI 321 IRQ_TYPE_EDGE_RISING>; + label = "rtr"; + qcom,remote-pid = <1>; + mboxes = <&apcs_glb 8>; + }; + }; + pcie1: pcie@10000000 { compatible = "qcom,pcie-ipq9574"; reg = <0x10000000 0xf1d>,
Signature · 1 line
2.34.1