From 548db5b975d4bdde71542a58e9e70fb20b362377 Mon Sep 17 00:00:00 2001 From: Komal Bajaj Date: Fri, 18 Sep 2026 18:04:17 +0530 Subject: [PATCH 1/2] FROMLIST: arm64: dts: qcom: shikra: Add EL2 overlay for remoteproc SMMU mappings Shikra boards currently boot Linux under a hypervisor, where the remote processor firmware IOMMU streams are managed by the hypervisor. When booting Linux directly at EL2 without the hypervisor, the IOMMU is instead managed by the consumer of this DeviceTree, so the firmware streams for each remote processor need to be described explicitly. Add an EL2-specific DT overlay and apply it to all Shikra EVK variants devices to produce an -el2.dtb alongside the "normal" dtb. Link: https://lore.kernel.org/r/20260918-shikra-el2-v1-1-07bb072baa31@oss.qualcomm.com Co-developed-by: Bibek Kumar Patro Signed-off-by: Bibek Kumar Patro Signed-off-by: Komal Bajaj --- arch/arm64/boot/dts/qcom/Makefile | 11 +++++++++++ arch/arm64/boot/dts/qcom/shikra-el2.dtso | 23 +++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 arch/arm64/boot/dts/qcom/shikra-el2.dtso diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile index 7c3daa5703471..fb78ad0623e89 100644 --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile @@ -369,9 +369,20 @@ dtb-$(CONFIG_ARCH_QCOM) += sdm850-lenovo-yoga-c630.dtb dtb-$(CONFIG_ARCH_QCOM) += sdm850-samsung-w737.dtb dtb-$(CONFIG_ARCH_QCOM) += sdx75-idp.dtb dtb-$(CONFIG_ARCH_QCOM) += shikra-cqm-evk.dtb + +shikra-cqm-evk-el2-dtbs := shikra-cqm-evk.dtb shikra-el2.dtbo +dtb-$(CONFIG_ARCH_QCOM) += shikra-cqm-evk-el2.dtb + dtb-$(CONFIG_ARCH_QCOM) += shikra-cqs-evk.dtb + +shikra-cqs-evk-el2-dtbs := shikra-cqs-evk.dtb shikra-el2.dtbo +dtb-$(CONFIG_ARCH_QCOM) += shikra-cqs-evk-el2.dtb + dtb-$(CONFIG_ARCH_QCOM) += shikra-iqs-evk.dtb +shikra-iqs-evk-el2-dtbs := shikra-iqs-evk.dtb shikra-el2.dtbo +dtb-$(CONFIG_ARCH_QCOM) += shikra-iqs-evk-el2.dtb + shikra-cqm-evk-imx577-camera-dtbs := shikra-cqm-evk.dtb shikra-cqm-evk-imx577-camera.dtbo shikra-cqs-evk-imx577-camera-dtbs := shikra-cqs-evk.dtb shikra-cqm-evk-imx577-camera.dtbo shikra-iqs-evk-imx577-camera-dtbs := shikra-iqs-evk.dtb shikra-iqs-evk-imx577-camera.dtbo diff --git a/arch/arm64/boot/dts/qcom/shikra-el2.dtso b/arch/arm64/boot/dts/qcom/shikra-el2.dtso new file mode 100644 index 0000000000000..d2f3186bd47db --- /dev/null +++ b/arch/arm64/boot/dts/qcom/shikra-el2.dtso @@ -0,0 +1,23 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. + * + * Shikra specific modifications required to boot in EL2. + */ + +/dts-v1/; +/plugin/; + +&gpu_zap_shader { + status = "disabled"; +}; + +&remoteproc_cdsp { + iommus = <&apps_smmu 0x0200 0x0>; +}; + +&remoteproc_lpaicp { + iommus = <&apps_smmu 0x0360 0x0005>, + <&apps_smmu 0x0366 0x0000>, + <&apps_smmu 0x00e7 0x0000>; +}; From eb3528c318bb404a3ed792e1f1b8fa8e7d74f185 Mon Sep 17 00:00:00 2001 From: Komal Bajaj Date: Wed, 30 Sep 2026 13:55:21 +0530 Subject: [PATCH 2/2] FROMLIST: dt-bindings: remoteproc: qcom: Relax PAS iommus item limit Some PAS users require more than one IOMMU mapping. Update qcom,pas-common.yaml to allow up to three iommus entries so PAS bindings can represent multi-stream mappings used by platform device trees and avoid dt-schema array length failures. Link: https://lore.kernel.org/all/20260930-shikra-el2-v2-1-f0822be5aaee@oss.qualcomm.com/ Signed-off-by: Komal Bajaj --- .../devicetree/bindings/remoteproc/qcom,pas-common.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,pas-common.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,pas-common.yaml index 6a736161d5aed..f4086787425ce 100644 --- a/Documentation/devicetree/bindings/remoteproc/qcom,pas-common.yaml +++ b/Documentation/devicetree/bindings/remoteproc/qcom,pas-common.yaml @@ -45,7 +45,8 @@ properties: - const: shutdown-ack iommus: - maxItems: 1 + minItems: 1 + maxItems: 3 power-domains: minItems: 1