* [PATCH v6 0/5] arm64: dts: qcom: Add EL2 overlays for Shikra and SM8750
@ 2026-11-19 11:43 Komal Bajaj
2026-11-19 11:43 ` [PATCH v6 1/5] dt-bindings: remoteproc: Move iommus constraint to SoC-specific bindings Komal Bajaj
` (4 more replies)
0 siblings, 5 replies; 8+ messages in thread
From: Komal Bajaj @ 2026-11-19 11:43 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio, Abel Vesa, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Mathieu Poirier,
Manivannan Sadhasivam, Bartosz Golaszewski, Kumar Patro,
Jingyi Wang, Luca Weiss, Shawn Guo
Cc: linux-arm-msm, devicetree, linux-kernel, linux-remoteproc,
Komal Bajaj, Abel Vesa, Dmitry Baryshkov
Shikra EVK variants boot Linux under the Gunyah hypervisor (EL2) by
default, with Linux running at EL1. Booting Linux directly at EL2
requires the remote processor firmware IOMMU streams to be described
in the DeviceTree used by Linux.
Add a Shikra EL2-specific DT overlay and wire it up in the Makefile to
generate -el2.dtb artifacts for the Shikra EVK variants alongside the
regular DTBs.
Add a similar EL2 overlay for SM8750 MTP, which also boots Linux under
Gunyah by default.
The series also moves the Qualcomm PAS remoteproc iommus constraint to
the SoC-specific bindings and relaxes the item limit to accommodate the
remoteproc SMMU mappings required for Shikra and SM8750 EL2 boot.
Komal Bajaj (5):
dt-bindings: remoteproc: Move iommus constraint to SoC-specific bindings
dt-bindings: remoteproc: qcom,shikra-pas: Add iommus constraints
dt-bindings: remoteproc: qcom,sm8550-pas: Allow 6 iommus for SM8750 ADSP
arm64: dts: qcom: shikra: Add EL2 overlay for remoteproc SMMU mappings
arm64: dts: qcom: sm8750: Add EL2 overlay for remoteproc SMMU mappings
.../bindings/remoteproc/qcom,adsp.yaml | 6 ++++
.../remoteproc/qcom,kaanapali-soccp-pas.yaml | 6 ++++
.../bindings/remoteproc/qcom,milos-pas.yaml | 6 ++++
.../bindings/remoteproc/qcom,nord-pas.yaml | 6 ++++
.../bindings/remoteproc/qcom,pas-common.yaml | 3 --
.../bindings/remoteproc/qcom,qcs404-pas.yaml | 6 ++++
.../bindings/remoteproc/qcom,sa8775p-pas.yaml | 6 ++++
.../bindings/remoteproc/qcom,sc7180-pas.yaml | 6 ++++
.../remoteproc/qcom,sc8280xp-pas.yaml | 6 ++++
.../bindings/remoteproc/qcom,sdx55-pas.yaml | 6 ++++
.../bindings/remoteproc/qcom,shikra-pas.yaml | 28 ++++++++++++++++
.../bindings/remoteproc/qcom,sm6115-pas.yaml | 6 ++++
.../bindings/remoteproc/qcom,sm6350-pas.yaml | 6 ++++
.../bindings/remoteproc/qcom,sm6375-pas.yaml | 6 ++++
.../bindings/remoteproc/qcom,sm8150-pas.yaml | 6 ++++
.../bindings/remoteproc/qcom,sm8350-pas.yaml | 6 ++++
.../bindings/remoteproc/qcom,sm8550-pas.yaml | 30 +++++++++++++++++
arch/arm64/boot/dts/qcom/Makefile | 15 +++++++++
arch/arm64/boot/dts/qcom/shikra-el2.dtso | 33 +++++++++++++++++++
arch/arm64/boot/dts/qcom/sm8750-el2.dtso | 30 +++++++++++++++++
20 files changed, 220 insertions(+), 3 deletions(-)
Signed-off-by: Komal Bajaj <komal.bajaj@oss.qualcomm.com>
---
Changes in v6:
- Define iommus with a description in the top-level properties of every
binding referencing qcom,pas-common.yaml instead of in conditional
blocks, making patch 1 a no functional change move (Krzysztof, Mukesh)
- Reword the commit messages
- Shikra: allow up to three iommus entries at the top level, require
three for LPAICP, allow one for CDSP and disallow iommus for MPSS
- Shikra: drop the per-item iommus descriptions
- Add SM8750 EL2 overlay and the corresponding binding change
- Link to v5: https://lore.kernel.org/r/20261113-shikra-el2-v5-0-8aca743de97f@oss.qualcomm.com
Changes in v5:
- Declare iommus property once in top-level properties of qcom,sa8775p-pas.yaml instead of repeating it in every allOf branch (Krzysztof, sashiko)
- Add Glymur ADSP/CDSP compatibles to iommus conditional in qcom,sm8550-pas.yaml
- Add sc7280 ADSP/CDSP compatibles to iommus conditional in qcom,sc7180-pas.yaml
- Add a description for each iommus entry
- Shikra: list three entries for LPAICP and drop the iommus property for qcom,shikra-mpss-pas (Krzysztof)
- Link to v4: https://lore.kernel.org/r/20261104-shikra-el2-v4-0-97e7019debff@oss.qualcomm.com
Changes in v4:
- Add a patch to move the iommus constraint from qcom,pas-common.yaml to SoC-specific PAS bindings (Mukesh)
- Add iommus constraints for all Shikra PAS compatibles instead of only relaxing the limit for LPAICP
- Add WiFi firmware iommus to Shikra EL2 overlay
- Link to v3: https://lore.kernel.org/r/20261005-shikra-el2-v3-0-618f7343695c@oss.qualcomm.com
Changes in v3:
- Drop qcom,pas-common reference and add per-compatible iommus limits for Shikra (Krzysztof)
- Link to v2: https://lore.kernel.org/r/20260930-shikra-el2-v2-0-f0822be5aaee@oss.qualcomm.com
Changes in v2:
- Relax the Qualcomm PAS remoteproc `iommus` item limit, needed for Shikra EL2 remoteproc SMMU mappings.
- Link to v1: https://lore.kernel.org/r/20260918-shikra-el2-v1-1-07bb072baa31@oss.qualcomm.com
---
Komal Bajaj (5):
dt-bindings: remoteproc: Move iommus constraint to SoC-specific bindings
dt-bindings: remoteproc: qcom,shikra-pas: Add iommus constraints
dt-bindings: remoteproc: qcom,sm8550-pas: Allow 6 iommus for SM8750 ADSP
arm64: dts: qcom: shikra: Add EL2 overlay for remoteproc SMMU mappings
arm64: dts: qcom: sm8750: Add EL2 overlay for remoteproc SMMU mappings
.../devicetree/bindings/remoteproc/qcom,adsp.yaml | 6 ++++
.../remoteproc/qcom,kaanapali-soccp-pas.yaml | 6 ++++
.../bindings/remoteproc/qcom,milos-pas.yaml | 6 ++++
.../bindings/remoteproc/qcom,nord-pas.yaml | 6 ++++
.../bindings/remoteproc/qcom,pas-common.yaml | 3 --
.../bindings/remoteproc/qcom,qcs404-pas.yaml | 6 ++++
.../bindings/remoteproc/qcom,sa8775p-pas.yaml | 6 ++++
.../bindings/remoteproc/qcom,sc7180-pas.yaml | 6 ++++
.../bindings/remoteproc/qcom,sc8280xp-pas.yaml | 6 ++++
.../bindings/remoteproc/qcom,sdx55-pas.yaml | 6 ++++
.../bindings/remoteproc/qcom,shikra-pas.yaml | 28 ++++++++++++++++
.../bindings/remoteproc/qcom,sm6115-pas.yaml | 6 ++++
.../bindings/remoteproc/qcom,sm6350-pas.yaml | 6 ++++
.../bindings/remoteproc/qcom,sm6375-pas.yaml | 6 ++++
.../bindings/remoteproc/qcom,sm8150-pas.yaml | 6 ++++
.../bindings/remoteproc/qcom,sm8350-pas.yaml | 6 ++++
.../bindings/remoteproc/qcom,sm8550-pas.yaml | 30 +++++++++++++++++
arch/arm64/boot/dts/qcom/Makefile | 15 +++++++++
arch/arm64/boot/dts/qcom/shikra-el2.dtso | 38 ++++++++++++++++++++++
arch/arm64/boot/dts/qcom/sm8750-el2.dtso | 30 +++++++++++++++++
20 files changed, 225 insertions(+), 3 deletions(-)
---
base-commit: e8017d29067fd1310a65c3494ce1a1b492adbac6
change-id: 20260918-shikra-el2-ea8969385c3c
Best regards,
--
Komal Bajaj <komal.bajaj@oss.qualcomm.com>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v6 1/5] dt-bindings: remoteproc: Move iommus constraint to SoC-specific bindings
2026-11-19 11:43 [PATCH v6 0/5] arm64: dts: qcom: Add EL2 overlays for Shikra and SM8750 Komal Bajaj
@ 2026-11-19 11:43 ` Komal Bajaj
2026-11-19 11:43 ` [PATCH v6 2/5] dt-bindings: remoteproc: qcom,shikra-pas: Add iommus constraints Komal Bajaj
` (3 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Komal Bajaj @ 2026-11-19 11:43 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio, Abel Vesa, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Mathieu Poirier,
Manivannan Sadhasivam, Bartosz Golaszewski, Kumar Patro,
Jingyi Wang, Luca Weiss, Shawn Guo
Cc: linux-arm-msm, devicetree, linux-kernel, linux-remoteproc,
Komal Bajaj
qcom,pas-common.yaml limits iommus to a single entry for every PAS
remoteproc binding referencing it. This is too restrictive for SoCs
whose firmware uses multiple IOMMU streams, and a schema referencing
the common one cannot relax the inherited limit.
Drop iommus from qcom,pas-common.yaml. As this removes the property
from every binding referencing it, define it in the top-level
properties of each of them, with a description and the same
maxItems: 1 limit, so that SoCs needing a different limit can override
it in their own binding.
No functional change intended.
Signed-off-by: Komal Bajaj <komal.bajaj@oss.qualcomm.com>
---
Documentation/devicetree/bindings/remoteproc/qcom,adsp.yaml | 6 ++++++
.../devicetree/bindings/remoteproc/qcom,kaanapali-soccp-pas.yaml | 6 ++++++
Documentation/devicetree/bindings/remoteproc/qcom,milos-pas.yaml | 6 ++++++
Documentation/devicetree/bindings/remoteproc/qcom,nord-pas.yaml | 6 ++++++
Documentation/devicetree/bindings/remoteproc/qcom,pas-common.yaml | 3 ---
Documentation/devicetree/bindings/remoteproc/qcom,qcs404-pas.yaml | 6 ++++++
Documentation/devicetree/bindings/remoteproc/qcom,sa8775p-pas.yaml | 6 ++++++
Documentation/devicetree/bindings/remoteproc/qcom,sc7180-pas.yaml | 6 ++++++
Documentation/devicetree/bindings/remoteproc/qcom,sc8280xp-pas.yaml | 6 ++++++
Documentation/devicetree/bindings/remoteproc/qcom,sdx55-pas.yaml | 6 ++++++
Documentation/devicetree/bindings/remoteproc/qcom,shikra-pas.yaml | 6 ++++++
Documentation/devicetree/bindings/remoteproc/qcom,sm6115-pas.yaml | 6 ++++++
Documentation/devicetree/bindings/remoteproc/qcom,sm6350-pas.yaml | 6 ++++++
Documentation/devicetree/bindings/remoteproc/qcom,sm6375-pas.yaml | 6 ++++++
Documentation/devicetree/bindings/remoteproc/qcom,sm8150-pas.yaml | 6 ++++++
Documentation/devicetree/bindings/remoteproc/qcom,sm8350-pas.yaml | 6 ++++++
Documentation/devicetree/bindings/remoteproc/qcom,sm8550-pas.yaml | 6 ++++++
17 files changed, 96 insertions(+), 3 deletions(-)
diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,adsp.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,adsp.yaml
index 6cac1f77993b..99c567da3e98 100644
--- a/Documentation/devicetree/bindings/remoteproc/qcom,adsp.yaml
+++ b/Documentation/devicetree/bindings/remoteproc/qcom,adsp.yaml
@@ -82,6 +82,12 @@ properties:
maxItems: 1
description: The names of the state bits used for SMP2P output
+ iommus:
+ description:
+ IOMMU specifiers of the streams used by the remote processor
+ firmware for its memory accesses.
+ maxItems: 1
+
required:
- compatible
- memory-region
diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,kaanapali-soccp-pas.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,kaanapali-soccp-pas.yaml
index e6c78d621d17..06aeb45fb2d7 100644
--- a/Documentation/devicetree/bindings/remoteproc/qcom,kaanapali-soccp-pas.yaml
+++ b/Documentation/devicetree/bindings/remoteproc/qcom,kaanapali-soccp-pas.yaml
@@ -84,6 +84,12 @@ properties:
minItems: 2
description: The names of the state bits used for SMP2P output
+ iommus:
+ description:
+ IOMMU specifiers of the streams used by the remote processor
+ firmware for its memory accesses.
+ maxItems: 1
+
required:
- compatible
- reg
diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,milos-pas.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,milos-pas.yaml
index b24e6f6eaf37..4a033ccdecbb 100644
--- a/Documentation/devicetree/bindings/remoteproc/qcom,milos-pas.yaml
+++ b/Documentation/devicetree/bindings/remoteproc/qcom,milos-pas.yaml
@@ -76,6 +76,12 @@ properties:
maxItems: 1
description: The names of the state bits used for SMP2P output
+ iommus:
+ description:
+ IOMMU specifiers of the streams used by the remote processor
+ firmware for its memory accesses.
+ maxItems: 1
+
required:
- compatible
- reg
diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,nord-pas.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,nord-pas.yaml
index e90d2953ba69..b1d84d8be4c6 100644
--- a/Documentation/devicetree/bindings/remoteproc/qcom,nord-pas.yaml
+++ b/Documentation/devicetree/bindings/remoteproc/qcom,nord-pas.yaml
@@ -89,6 +89,12 @@ properties:
maxItems: 1
description: The names of the state bits used for SMP2P output
+ iommus:
+ description:
+ IOMMU specifiers of the streams used by the remote processor
+ firmware for its memory accesses.
+ maxItems: 1
+
required:
- compatible
- reg
diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,pas-common.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,pas-common.yaml
index f75cab6b4ed9..4662fe4cff62 100644
--- a/Documentation/devicetree/bindings/remoteproc/qcom,pas-common.yaml
+++ b/Documentation/devicetree/bindings/remoteproc/qcom,pas-common.yaml
@@ -32,9 +32,6 @@ properties:
minItems: 5
maxItems: 6
- iommus:
- maxItems: 1
-
power-domains:
minItems: 1
maxItems: 3
diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,qcs404-pas.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,qcs404-pas.yaml
index bf9bf1af9ff1..c8898a041fb3 100644
--- a/Documentation/devicetree/bindings/remoteproc/qcom,qcs404-pas.yaml
+++ b/Documentation/devicetree/bindings/remoteproc/qcom,qcs404-pas.yaml
@@ -67,6 +67,12 @@ properties:
maxItems: 1
description: The names of the state bits used for SMP2P output
+ iommus:
+ description:
+ IOMMU specifiers of the streams used by the remote processor
+ firmware for its memory accesses.
+ maxItems: 1
+
required:
- compatible
- reg
diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,sa8775p-pas.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,sa8775p-pas.yaml
index dda2d144b720..73d25efed820 100644
--- a/Documentation/devicetree/bindings/remoteproc/qcom,sa8775p-pas.yaml
+++ b/Documentation/devicetree/bindings/remoteproc/qcom,sa8775p-pas.yaml
@@ -82,6 +82,12 @@ properties:
maxItems: 1
description: The names of the state bits used for SMP2P output
+ iommus:
+ description:
+ IOMMU specifiers of the streams used by the remote processor
+ firmware for its memory accesses.
+ maxItems: 1
+
required:
- compatible
- reg
diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,sc7180-pas.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,sc7180-pas.yaml
index b20780e5e26b..33c9ff6522ce 100644
--- a/Documentation/devicetree/bindings/remoteproc/qcom,sc7180-pas.yaml
+++ b/Documentation/devicetree/bindings/remoteproc/qcom,sc7180-pas.yaml
@@ -76,6 +76,12 @@ properties:
maxItems: 1
description: The names of the state bits used for SMP2P output
+ iommus:
+ description:
+ IOMMU specifiers of the streams used by the remote processor
+ firmware for its memory accesses.
+ maxItems: 1
+
required:
- compatible
- reg
diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,sc8280xp-pas.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,sc8280xp-pas.yaml
index 4bbe4a986c7c..6bff0ed118a3 100644
--- a/Documentation/devicetree/bindings/remoteproc/qcom,sc8280xp-pas.yaml
+++ b/Documentation/devicetree/bindings/remoteproc/qcom,sc8280xp-pas.yaml
@@ -73,6 +73,12 @@ properties:
maxItems: 1
description: The names of the state bits used for SMP2P output
+ iommus:
+ description:
+ IOMMU specifiers of the streams used by the remote processor
+ firmware for its memory accesses.
+ maxItems: 1
+
required:
- compatible
- reg
diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,sdx55-pas.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,sdx55-pas.yaml
index 8c16b01c53e4..83b9d7289e06 100644
--- a/Documentation/devicetree/bindings/remoteproc/qcom,sdx55-pas.yaml
+++ b/Documentation/devicetree/bindings/remoteproc/qcom,sdx55-pas.yaml
@@ -79,6 +79,12 @@ properties:
maxItems: 1
description: The names of the state bits used for SMP2P output
+ iommus:
+ description:
+ IOMMU specifiers of the streams used by the remote processor
+ firmware for its memory accesses.
+ maxItems: 1
+
required:
- compatible
- reg
diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,shikra-pas.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,shikra-pas.yaml
index 34a2f15e9361..74f83b7ce08d 100644
--- a/Documentation/devicetree/bindings/remoteproc/qcom,shikra-pas.yaml
+++ b/Documentation/devicetree/bindings/remoteproc/qcom,shikra-pas.yaml
@@ -88,6 +88,12 @@ properties:
items:
- const: stop
+ iommus:
+ description:
+ IOMMU specifiers of the streams used by the remote processor
+ firmware for its memory accesses.
+ maxItems: 1
+
required:
- compatible
- reg
diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,sm6115-pas.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,sm6115-pas.yaml
index 454ba82bd6f1..6ea56b497f89 100644
--- a/Documentation/devicetree/bindings/remoteproc/qcom,sm6115-pas.yaml
+++ b/Documentation/devicetree/bindings/remoteproc/qcom,sm6115-pas.yaml
@@ -79,6 +79,12 @@ properties:
maxItems: 1
description: The names of the state bits used for SMP2P output
+ iommus:
+ description:
+ IOMMU specifiers of the streams used by the remote processor
+ firmware for its memory accesses.
+ maxItems: 1
+
required:
- compatible
- reg
diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,sm6350-pas.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,sm6350-pas.yaml
index 42e02c64347a..28e44a1dcc7e 100644
--- a/Documentation/devicetree/bindings/remoteproc/qcom,sm6350-pas.yaml
+++ b/Documentation/devicetree/bindings/remoteproc/qcom,sm6350-pas.yaml
@@ -73,6 +73,12 @@ properties:
maxItems: 1
description: The names of the state bits used for SMP2P output
+ iommus:
+ description:
+ IOMMU specifiers of the streams used by the remote processor
+ firmware for its memory accesses.
+ maxItems: 1
+
required:
- compatible
- reg
diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,sm6375-pas.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,sm6375-pas.yaml
index 274f87880e2e..710dae4589b4 100644
--- a/Documentation/devicetree/bindings/remoteproc/qcom,sm6375-pas.yaml
+++ b/Documentation/devicetree/bindings/remoteproc/qcom,sm6375-pas.yaml
@@ -69,6 +69,12 @@ properties:
maxItems: 1
description: The names of the state bits used for SMP2P output
+ iommus:
+ description:
+ IOMMU specifiers of the streams used by the remote processor
+ firmware for its memory accesses.
+ maxItems: 1
+
required:
- compatible
- reg
diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,sm8150-pas.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,sm8150-pas.yaml
index 5a7c5f8c92d1..9fbf1b6aed76 100644
--- a/Documentation/devicetree/bindings/remoteproc/qcom,sm8150-pas.yaml
+++ b/Documentation/devicetree/bindings/remoteproc/qcom,sm8150-pas.yaml
@@ -89,6 +89,12 @@ properties:
maxItems: 1
description: The names of the state bits used for SMP2P output
+ iommus:
+ description:
+ IOMMU specifiers of the streams used by the remote processor
+ firmware for its memory accesses.
+ maxItems: 1
+
required:
- compatible
- reg
diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,sm8350-pas.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,sm8350-pas.yaml
index 72d0db5698c5..15da49130146 100644
--- a/Documentation/devicetree/bindings/remoteproc/qcom,sm8350-pas.yaml
+++ b/Documentation/devicetree/bindings/remoteproc/qcom,sm8350-pas.yaml
@@ -83,6 +83,12 @@ properties:
maxItems: 1
description: The names of the state bits used for SMP2P output
+ iommus:
+ description:
+ IOMMU specifiers of the streams used by the remote processor
+ firmware for its memory accesses.
+ maxItems: 1
+
required:
- compatible
- reg
diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,sm8550-pas.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,sm8550-pas.yaml
index 99e9aeeb4f62..a3131e6417f5 100644
--- a/Documentation/devicetree/bindings/remoteproc/qcom,sm8550-pas.yaml
+++ b/Documentation/devicetree/bindings/remoteproc/qcom,sm8550-pas.yaml
@@ -115,6 +115,12 @@ properties:
maxItems: 1
description: The names of the state bits used for SMP2P output
+ iommus:
+ description:
+ IOMMU specifiers of the streams used by the remote processor
+ firmware for its memory accesses.
+ maxItems: 1
+
required:
- compatible
- reg
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v6 2/5] dt-bindings: remoteproc: qcom,shikra-pas: Add iommus constraints
2026-11-19 11:43 [PATCH v6 0/5] arm64: dts: qcom: Add EL2 overlays for Shikra and SM8750 Komal Bajaj
2026-11-19 11:43 ` [PATCH v6 1/5] dt-bindings: remoteproc: Move iommus constraint to SoC-specific bindings Komal Bajaj
@ 2026-11-19 11:43 ` Komal Bajaj
2026-11-19 11:43 ` [PATCH v6 3/5] dt-bindings: remoteproc: qcom,sm8550-pas: Allow 6 iommus for SM8750 ADSP Komal Bajaj
` (2 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Komal Bajaj @ 2026-11-19 11:43 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio, Abel Vesa, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Mathieu Poirier,
Manivannan Sadhasivam, Bartosz Golaszewski, Kumar Patro,
Jingyi Wang, Luca Weiss, Shawn Guo
Cc: linux-arm-msm, devicetree, linux-kernel, linux-remoteproc,
Komal Bajaj
The number of IOMMU streams used by a remote processor is not necessarily
limited to one. On Shikra, LPAICP uses three streams, while CDSP uses one
and MPSS does not use any. The existing single-entry limit therefore cannot
describe the LPAICP firmware streams.
Increase the maximum number of iommus entries to three and constrain it per
compatible: require three entries for qcom,shikra-lpaicp-pas, allow only
one for qcom,shikra-cdsp-pas, and disallow the property for
qcom,shikra-mpss-pas.
Signed-off-by: Komal Bajaj <komal.bajaj@oss.qualcomm.com>
---
.../bindings/remoteproc/qcom,shikra-pas.yaml | 24 +++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,shikra-pas.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,shikra-pas.yaml
index 74f83b7ce08d..3b827f2aadb4 100644
--- a/Documentation/devicetree/bindings/remoteproc/qcom,shikra-pas.yaml
+++ b/Documentation/devicetree/bindings/remoteproc/qcom,shikra-pas.yaml
@@ -92,7 +92,8 @@ properties:
description:
IOMMU specifiers of the streams used by the remote processor
firmware for its memory accesses.
- maxItems: 1
+ minItems: 1
+ maxItems: 3
required:
- compatible
@@ -125,6 +126,25 @@ allOf:
items:
- const: cx
+ - if:
+ properties:
+ compatible:
+ enum:
+ - qcom,shikra-cdsp-pas
+ then:
+ properties:
+ iommus:
+ maxItems: 1
+
+ - if:
+ properties:
+ compatible:
+ enum:
+ - qcom,shikra-mpss-pas
+ then:
+ properties:
+ iommus: false
+
- if:
properties:
compatible:
@@ -140,6 +160,8 @@ allOf:
minItems: 2
firmware-name:
minItems: 2
+ iommus:
+ minItems: 3
power-domains: false
power-domain-names: false
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v6 3/5] dt-bindings: remoteproc: qcom,sm8550-pas: Allow 6 iommus for SM8750 ADSP
2026-11-19 11:43 [PATCH v6 0/5] arm64: dts: qcom: Add EL2 overlays for Shikra and SM8750 Komal Bajaj
2026-11-19 11:43 ` [PATCH v6 1/5] dt-bindings: remoteproc: Move iommus constraint to SoC-specific bindings Komal Bajaj
2026-11-19 11:43 ` [PATCH v6 2/5] dt-bindings: remoteproc: qcom,shikra-pas: Add iommus constraints Komal Bajaj
@ 2026-11-19 11:43 ` Komal Bajaj
2026-11-19 11:43 ` [PATCH v6 4/5] arm64: dts: qcom: shikra: Add EL2 overlay for remoteproc SMMU mappings Komal Bajaj
2026-11-19 11:43 ` [PATCH v6 5/5] arm64: dts: qcom: sm8750: " Komal Bajaj
4 siblings, 0 replies; 8+ messages in thread
From: Komal Bajaj @ 2026-11-19 11:43 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio, Abel Vesa, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Mathieu Poirier,
Manivannan Sadhasivam, Bartosz Golaszewski, Kumar Patro,
Jingyi Wang, Luca Weiss, Shawn Guo
Cc: linux-arm-msm, devicetree, linux-kernel, linux-remoteproc,
Komal Bajaj
Remote processors behind an IOMMU may use multiple firmware streams. On
SM8750, ADSP uses six IOMMU streams, which exceeds the single entry
currently allowed by the binding. CDSP uses a single stream, while MPSS
does not require any.
Allow up to six iommus entries in the binding. Require six entries for
qcom,sm8750-adsp-pas, disallow the property for qcom,sm8750-mpss-pas,
and retain the single-entry limit for the other compatibles.
Signed-off-by: Komal Bajaj <komal.bajaj@oss.qualcomm.com>
---
.../bindings/remoteproc/qcom,sm8550-pas.yaml | 26 +++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,sm8550-pas.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,sm8550-pas.yaml
index a3131e6417f5..45cc50d9c1b7 100644
--- a/Documentation/devicetree/bindings/remoteproc/qcom,sm8550-pas.yaml
+++ b/Documentation/devicetree/bindings/remoteproc/qcom,sm8550-pas.yaml
@@ -119,7 +119,8 @@ properties:
description:
IOMMU specifiers of the streams used by the remote processor
firmware for its memory accesses.
- maxItems: 1
+ minItems: 1
+ maxItems: 6
required:
- compatible
@@ -323,6 +324,29 @@ allOf:
- const: mx
- const: nsp
+ - if:
+ properties:
+ compatible:
+ contains:
+ const: qcom,sm8750-adsp-pas
+ then:
+ properties:
+ iommus:
+ minItems: 6
+ else:
+ properties:
+ iommus:
+ maxItems: 1
+
+ - if:
+ properties:
+ compatible:
+ contains:
+ const: qcom,sm8750-mpss-pas
+ then:
+ properties:
+ iommus: false
+
unevaluatedProperties: false
examples:
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v6 4/5] arm64: dts: qcom: shikra: Add EL2 overlay for remoteproc SMMU mappings
2026-11-19 11:43 [PATCH v6 0/5] arm64: dts: qcom: Add EL2 overlays for Shikra and SM8750 Komal Bajaj
` (2 preceding siblings ...)
2026-11-19 11:43 ` [PATCH v6 3/5] dt-bindings: remoteproc: qcom,sm8550-pas: Allow 6 iommus for SM8750 ADSP Komal Bajaj
@ 2026-11-19 11:43 ` Komal Bajaj
2026-11-19 11:57 ` sashiko-bot
2026-11-19 11:43 ` [PATCH v6 5/5] arm64: dts: qcom: sm8750: " Komal Bajaj
4 siblings, 1 reply; 8+ messages in thread
From: Komal Bajaj @ 2026-11-19 11:43 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio, Abel Vesa, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Mathieu Poirier,
Manivannan Sadhasivam, Bartosz Golaszewski, Kumar Patro,
Jingyi Wang, Luca Weiss, Shawn Guo
Cc: linux-arm-msm, devicetree, linux-kernel, linux-remoteproc,
Komal Bajaj, Abel Vesa, Dmitry Baryshkov
All existing Shikra board variants boot Linux under the Gunyah
hypervisor, with Linux running at EL1. Linux can also be booted
directly at EL2 on these devices.
For EL2 boot, describe the IOMMU streams used by the remote
processor firmware in the DeviceTree consumed by Linux.
Add an EL2-specific DT overlay and apply it to the Shikra IoT
variants to produce -el2.dtb artifacts alongside the standard
DTBs.
Co-developed-by: Bibek Kumar Patro <bibek.patro@oss.qualcomm.com>
Signed-off-by: Bibek Kumar Patro <bibek.patro@oss.qualcomm.com>
Reviewed-by: Abel Vesa <abel.vesa@oss.qualcomm.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: Komal Bajaj <komal.bajaj@oss.qualcomm.com>
---
arch/arm64/boot/dts/qcom/Makefile | 11 +++++++++
arch/arm64/boot/dts/qcom/shikra-el2.dtso | 38 ++++++++++++++++++++++++++++++++
2 files changed, 49 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
index 19310879349d..5c8d179f2792 100644
--- a/arch/arm64/boot/dts/qcom/Makefile
+++ b/arch/arm64/boot/dts/qcom/Makefile
@@ -416,9 +416,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-cqs-evk-imx577-camera.dtbo
shikra-cqs-evk-imx577-camera-dtbs := shikra-cqs-evk.dtb shikra-cqm-cqs-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 000000000000..89997ed7699e
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/shikra-el2.dtso
@@ -0,0 +1,38 @@
+// 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";
+};
+
+&iris {
+ status = "disabled";
+};
+
+&q6apmdai {
+ /delete-property/ memory-region;
+ iommus = <&apps_smmu 0x01cc 0x3>;
+};
+
+&remoteproc_cdsp {
+ iommus = <&apps_smmu 0x0200 0x0>;
+};
+
+&remoteproc_lpaicp {
+ iommus = <&apps_smmu 0x0360 0x0005>,
+ <&apps_smmu 0x0366 0x0000>,
+ <&apps_smmu 0x00e7 0x0000>;
+};
+
+&wifi {
+ wifi-firmware {
+ iommus = <&apps_smmu 0x01a2 0x0001>;
+ };
+};
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v6 5/5] arm64: dts: qcom: sm8750: Add EL2 overlay for remoteproc SMMU mappings
2026-11-19 11:43 [PATCH v6 0/5] arm64: dts: qcom: Add EL2 overlays for Shikra and SM8750 Komal Bajaj
` (3 preceding siblings ...)
2026-11-19 11:43 ` [PATCH v6 4/5] arm64: dts: qcom: shikra: Add EL2 overlay for remoteproc SMMU mappings Komal Bajaj
@ 2026-11-19 11:43 ` Komal Bajaj
2026-11-19 11:51 ` sashiko-bot
4 siblings, 1 reply; 8+ messages in thread
From: Komal Bajaj @ 2026-11-19 11:43 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio, Abel Vesa, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Mathieu Poirier,
Manivannan Sadhasivam, Bartosz Golaszewski, Kumar Patro,
Jingyi Wang, Luca Weiss, Shawn Guo
Cc: linux-arm-msm, devicetree, linux-kernel, linux-remoteproc,
Komal Bajaj
SM8750 board boot Linux under the Gunyah hypervisor, with Linux running
at EL1. Linux can also be booted directly at EL2 on these devices.
For EL2 boot, describe the IOMMU streams used by the remote processor
firmware in the DeviceTree consumed by Linux.
Add an EL2-specific DT overlay and apply it to the Shikra IoT variants
to produce -el2.dtb artifacts alongside the standard DTBs.
Signed-off-by: Komal Bajaj <komal.bajaj@oss.qualcomm.com>
---
arch/arm64/boot/dts/qcom/Makefile | 4 ++++
arch/arm64/boot/dts/qcom/sm8750-el2.dtso | 30 ++++++++++++++++++++++++++++++
2 files changed, 34 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
index 5c8d179f2792..60f627a469e9 100644
--- a/arch/arm64/boot/dts/qcom/Makefile
+++ b/arch/arm64/boot/dts/qcom/Makefile
@@ -511,6 +511,10 @@ dtb-$(CONFIG_ARCH_QCOM) += sm8650-mtp.dtb
dtb-$(CONFIG_ARCH_QCOM) += sm8650-qrd.dtb
dtb-$(CONFIG_ARCH_QCOM) += sm8650-valve-deckard.dtb
dtb-$(CONFIG_ARCH_QCOM) += sm8750-mtp.dtb
+
+sm8750-mtp-el2-dtbs := sm8750-mtp.dtb sm8750-el2.dtbo
+dtb-$(CONFIG_ARCH_QCOM) += sm8750-mtp-el2.dtb
+
dtb-$(CONFIG_ARCH_QCOM) += sm8750-qrd.dtb
dtb-$(CONFIG_ARCH_QCOM) += talos-evk.dtb
diff --git a/arch/arm64/boot/dts/qcom/sm8750-el2.dtso b/arch/arm64/boot/dts/qcom/sm8750-el2.dtso
new file mode 100644
index 000000000000..3e50c50e82dc
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sm8750-el2.dtso
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+
+ * Pakala specific modifications required to boot in EL2.
+ */
+
+/dts-v1/;
+/plugin/;
+
+&gpu_zap_shader {
+ status = "disabled";
+};
+
+&iris {
+ status = "disabled";
+};
+
+&remoteproc_adsp {
+ iommus = <&apps_smmu 0x1000 0x0>,
+ <&apps_smmu 0x10a0 0x0>,
+ <&apps_smmu 0x00a5 0x0>,
+ <&apps_smmu 0x0425 0x0>,
+ <&apps_smmu 0x0525 0x0>,
+ <&apps_smmu 0x0125 0x0>;
+};
+
+&remoteproc_cdsp {
+ iommus = <&apps_smmu 0x0c00 0x0>;
+};
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v6 5/5] arm64: dts: qcom: sm8750: Add EL2 overlay for remoteproc SMMU mappings
2026-11-19 11:43 ` [PATCH v6 5/5] arm64: dts: qcom: sm8750: " Komal Bajaj
@ 2026-11-19 11:51 ` sashiko-bot
0 siblings, 0 replies; 8+ messages in thread
From: sashiko-bot @ 2026-11-19 11:51 UTC (permalink / raw)
To: Komal Bajaj; +Cc: devicetree, robh, conor+dt
Thank you for your contribution! Sashiko AI review found 1 potential
issue to consider:
- [Low] arm64: dts: qcom: commit message mentions Shikra and omits
disabled nodes
--
commit 4293b12aa38fd366536aa13846bd84f70cea3ea7
Author: Komal Bajaj <komal.bajaj@oss.qualcomm.com>
> arm64: dts: qcom: sm8750: Add EL2 overlay for remoteproc SMMU mappings
>
> SM8750 board boot Linux under the Gunyah hypervisor, with Linux running
> at EL1. Linux can also be booted directly at EL2 on these devices.
>
> For EL2 boot, describe the IOMMU streams used by the remote processor
> firmware in the DeviceTree consumed by Linux.
>
> Add an EL2-specific DT overlay and apply it to the Shikra IoT variants
> to produce -el2.dtb artifacts alongside the standard DTBs.
>
> Signed-off-by: Komal Bajaj <komal.bajaj@oss.qualcomm.com>
[Severity: Low]
This isn't a bug, but the commit message mentions applying the overlay to
the Shikra IoT variants, whereas arch/arm64/boot/dts/qcom/Makefile applies
sm8750-el2.dtbo to sm8750-mtp.dtb to build sm8750-mtp-el2.dtb. In addition,
the subject and changelog only mention the remoteproc SMMU mappings, while
arch/arm64/boot/dts/qcom/sm8750-el2.dtso also disables gpu_zap_shader and
iris.
--
Sashiko AI review · https://sashiko.dev/#/patchset/20261119-shikra-el2-v6-0-0e91a1467e79@oss.qualcomm.com?part=5
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v6 4/5] arm64: dts: qcom: shikra: Add EL2 overlay for remoteproc SMMU mappings
2026-11-19 11:43 ` [PATCH v6 4/5] arm64: dts: qcom: shikra: Add EL2 overlay for remoteproc SMMU mappings Komal Bajaj
@ 2026-11-19 11:57 ` sashiko-bot
0 siblings, 0 replies; 8+ messages in thread
From: sashiko-bot @ 2026-11-19 11:57 UTC (permalink / raw)
To: Komal Bajaj; +Cc: devicetree, robh, conor+dt
Thank you for your contribution! Sashiko AI review found 1 potential
issue to consider:
- [High] arm64: dts: qcom: shikra-el2: q6apmdai iommus fails
q6apm_dai_probe()
--
commit 0d5069de0241cf74b87f4a2a71c79f4b11c8da67
Author: Komal Bajaj <komal.bajaj@oss.qualcomm.com>
arm64: dts: qcom: shikra: Add EL2 overlay for remoteproc SMMU mappings
This commit adds an EL2 DeviceTree overlay for Shikra boards to describe
IOMMU stream mappings for remoteproc firmware and applies it to the Shikra
EVK DTB targets.
> 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..89997ed7699ee
> --- /dev/null
> +++ b/arch/arm64/boot/dts/qcom/shikra-el2.dtso
> @@ -0,0 +1,38 @@
[ ... ]
> +&q6apmdai {
> + /delete-property/ memory-region;
> + iommus = <&apps_smmu 0x01cc 0x3>;
> +};
[Severity: High]
Does adding iommus to q6apmdai cause q6apm_dai_probe() to fail with
-EINVAL on Shikra EL2 builds?
In arch/arm64/boot/dts/qcom/shikra.dtsi, the ancestor gpr node sets
qcom,domain = <GPR_DOMAIN_ID_MODEM>, and q6apm_dai_probe() rejects any
iommus property when the GPR domain is GPR_DOMAIN_ID_MODEM:
sound/soc/qcom/qdsp6/q6apm-dai.c:q6apm_dai_probe() {
...
if (apm && apm->gdev &&
apm->gdev->domain_id == GPR_DOMAIN_ID_MODEM) {
if (!qcom_scm_is_available())
return -EPROBE_DEFER;
if (pdata->sid >= 0) {
dev_err(dev,
"iommus and mDSP SCM path are mutually exclusive\n");
return -EINVAL;
}
...
}
Because iommus sets pdata->sid to 0xc, the Q6APM front-end DAI driver will
fail to probe and audio will not register in EL2.
--
Sashiko AI review · https://sashiko.dev/#/patchset/20261119-shikra-el2-v6-0-0e91a1467e79@oss.qualcomm.com?part=4
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2026-11-19 11:57 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-19 11:43 [PATCH v6 0/5] arm64: dts: qcom: Add EL2 overlays for Shikra and SM8750 Komal Bajaj
2026-11-19 11:43 ` [PATCH v6 1/5] dt-bindings: remoteproc: Move iommus constraint to SoC-specific bindings Komal Bajaj
2026-11-19 11:43 ` [PATCH v6 2/5] dt-bindings: remoteproc: qcom,shikra-pas: Add iommus constraints Komal Bajaj
2026-11-19 11:43 ` [PATCH v6 3/5] dt-bindings: remoteproc: qcom,sm8550-pas: Allow 6 iommus for SM8750 ADSP Komal Bajaj
2026-11-19 11:43 ` [PATCH v6 4/5] arm64: dts: qcom: shikra: Add EL2 overlay for remoteproc SMMU mappings Komal Bajaj
2026-11-19 11:57 ` sashiko-bot
2026-11-19 11:43 ` [PATCH v6 5/5] arm64: dts: qcom: sm8750: " Komal Bajaj
2026-11-19 11:51 ` sashiko-bot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox