[PATCH v3 0/3] arm64: dts: qcom: agatti: Fix IOMMU DT properties

[PATCH v3 0/3] arm64: dts: qcom: agatti: Fix IOMMU DT properties

[Sumit Garg]

From: Sumit Garg <sumit.garg@oss.qualcomm.com>

Fix IOMMU DT propeties for GPU, display and video peripherals via
dropping SMMU stream IDs which relates to secure context bank.

This problem only surfaced when the Gunyah based firmware stack is
ported on Agatti replacing the legacy QHEE based firmware stack. Assigning
Linux kernel (HLOS) VMID to secure context bank stream IDs is treated
as a fault by Gunyah hypervisor which were previously ignored by QHEE
hypervisor.

The DT changes should be backwards compatible with legacy QHEE based
firmware stack too.

Changes in v3:
---
- Fixed up maximum value for iommus property in DT bindings instead
  of adding the minimum value as that places implicit ordering
  requirements.
- Collected further review tag for patch #3

Changes in v2:
---
- Dropped Gunyah related reserved memory requirement changes
- Added DT bindings changes related to IOMMU property fixups
- Collected review tags for the DT changes

Sumit Garg (3):
  dt-bindings: display: msm: qcm2290-mdss: Fix iommus property
  dt-bindings: media: venus: Fix iommus property
  arm64: dts: qcom: agatti: Fix IOMMU DT properties

 .../bindings/display/msm/qcom,qcm2290-mdss.yaml       |  6 ++----
 .../devicetree/bindings/media/qcom,qcm2290-venus.yaml |  7 ++-----
 arch/arm64/boot/dts/qcom/agatti.dtsi                  | 11 +++--------
 3 files changed, 7 insertions(+), 17 deletions(-)

-- 
2.51.0

[PATCH v3 1/3] dt-bindings: display: msm: qcm2290-mdss: Fix iommus property

[Sumit Garg]

From: Sumit Garg <sumit.garg@oss.qualcomm.com>

Fix IOMMU DT propety for display via dropping SMMU stream IDs which
relates to secure context bank. Assigning Linux kernel (HLOS) VMID
to secure context bank stream IDs is incorrect. The maximum value
for iommus property is updated accordingly.

These DT bindings changes should be backwards compatible.

Signed-off-by: Sumit Garg <sumit.garg@oss.qualcomm.com>
---
 .../devicetree/bindings/display/msm/qcom,qcm2290-mdss.yaml  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Documentation/devicetree/bindings/display/msm/qcom,qcm2290-mdss.yaml b/Documentation/devicetree/bindings/display/msm/qcom,qcm2290-mdss.yaml
index f0cdb5422688..2772cdec7e42 100644
--- a/Documentation/devicetree/bindings/display/msm/qcom,qcm2290-mdss.yaml
+++ b/Documentation/devicetree/bindings/display/msm/qcom,qcm2290-mdss.yaml
@@ -33,7 +33,7 @@ properties:
       - const: core
 
   iommus:
-    maxItems: 2
+    maxItems: 1
 
   interconnects:
     items:
@@ -107,9 +107,7 @@ examples:
         interconnect-names = "mdp0-mem",
                              "cpu-cfg";
 
-        iommus = <&apps_smmu 0x420 0x2>,
-                 <&apps_smmu 0x421 0x0>;
-        ranges;
+        iommus = <&apps_smmu 0x420 0x2>;
 
         display-controller@5e01000 {
             compatible = "qcom,qcm2290-dpu";
-- 
2.51.0

[PATCH v3 2/3] dt-bindings: media: venus: Fix iommus property

[Sumit Garg]

From: Sumit Garg <sumit.garg@oss.qualcomm.com>

Fix IOMMU DT propety for venus via dropping SMMU stream IDs which
relates to secure context bank. Assigning Linux kernel (HLOS) VMID
to secure context bank stream IDs is incorrect. The maximum value
for iommus property is updated accordingly.

These DT bindings changes should be backwards compatible.

Signed-off-by: Sumit Garg <sumit.garg@oss.qualcomm.com>
---
 .../devicetree/bindings/media/qcom,qcm2290-venus.yaml      | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/Documentation/devicetree/bindings/media/qcom,qcm2290-venus.yaml b/Documentation/devicetree/bindings/media/qcom,qcm2290-venus.yaml
index 3f3ee82fc878..7e6dc410c2d2 100644
--- a/Documentation/devicetree/bindings/media/qcom,qcm2290-venus.yaml
+++ b/Documentation/devicetree/bindings/media/qcom,qcm2290-venus.yaml
@@ -42,7 +42,7 @@ properties:
       - const: vcodec0_bus
 
   iommus:
-    maxItems: 5
+    maxItems: 2
 
   interconnects:
     maxItems: 2
@@ -102,10 +102,7 @@ examples:
         memory-region = <&pil_video_mem>;
 
         iommus = <&apps_smmu 0x860 0x0>,
-                 <&apps_smmu 0x880 0x0>,
-                 <&apps_smmu 0x861 0x04>,
-                 <&apps_smmu 0x863 0x0>,
-                 <&apps_smmu 0x804 0xe0>;
+                 <&apps_smmu 0x880 0x0>;
 
         interconnects = <&mmnrt_virt MASTER_VIDEO_P0 RPM_ALWAYS_TAG
                          &bimc SLAVE_EBI1 RPM_ALWAYS_TAG>,
-- 
2.51.0

[PATCH v3 3/3] arm64: dts: qcom: agatti: Fix IOMMU DT properties

[Sumit Garg]

From: Sumit Garg <sumit.garg@oss.qualcomm.com>

Fix IOMMU DT propeties for GPU, display and video peripherals via
dropping SMMU stream IDs which relates to secure context bank.

This problem only surfaced when the Gunyah based firmware stack is
ported on Agatti replacing the legacy QHEE based firmware stack. Assigning
Linux kernel (HLOS) VMID to secure context bank stream IDs is treated
as a fault by Gunyah hypervisor which were previously ignored by QHEE
hypervisor.

The DT changes should be backwards compatible with legacy QHEE based
firmware stack too.

Suggested-by: Prakash Gupta <guptap@qti.qualcomm.com>
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Reviewed-by: Akhil P Oommen <akhilpo@oss.qualcomm.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: Sumit Garg <sumit.garg@oss.qualcomm.com>
---
 arch/arm64/boot/dts/qcom/agatti.dtsi | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/agatti.dtsi b/arch/arm64/boot/dts/qcom/agatti.dtsi
index 7815ece261ea..7c1a636e51f0 100644
--- a/arch/arm64/boot/dts/qcom/agatti.dtsi
+++ b/arch/arm64/boot/dts/qcom/agatti.dtsi
@@ -1665,8 +1665,7 @@ gpu: gpu@5900000 {
 					 &bimc SLAVE_EBI1 RPM_ALWAYS_TAG>;
 			interconnect-names = "gfx-mem";
 
-			iommus = <&adreno_smmu 0 1>,
-				 <&adreno_smmu 2 0>;
+			iommus = <&adreno_smmu 0 1>;
 			operating-points-v2 = <&gpu_opp_table>;
 			power-domains = <&rpmpd QCM2290_VDDCX>;
 			qcom,gmu = <&gmu_wrapper>;
@@ -1947,8 +1946,7 @@ mdss: display-subsystem@5e00000 {
 
 			power-domains = <&dispcc MDSS_GDSC>;
 
-			iommus = <&apps_smmu 0x420 0x2>,
-				 <&apps_smmu 0x421 0x0>;
+			iommus = <&apps_smmu 0x420 0x2>;
 			interconnects = <&mmrt_virt MASTER_MDP0 RPM_ALWAYS_TAG
 					 &bimc SLAVE_EBI1 RPM_ALWAYS_TAG>,
 					<&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG
@@ -2391,10 +2389,7 @@ venus: video-codec@5a00000 {
 
 			memory-region = <&pil_video_mem>;
 			iommus = <&apps_smmu 0x860 0x0>,
-				 <&apps_smmu 0x880 0x0>,
-				 <&apps_smmu 0x861 0x04>,
-				 <&apps_smmu 0x863 0x0>,
-				 <&apps_smmu 0x804 0xe0>;
+				 <&apps_smmu 0x880 0x0>;
 
 			interconnects = <&mmnrt_virt MASTER_VIDEO_P0 RPM_ALWAYS_TAG
 					 &bimc SLAVE_EBI1 RPM_ALWAYS_TAG>,
-- 
2.51.0

Re: [PATCH v3 0/3] arm64: dts: qcom: agatti: Fix IOMMU DT properties

[Rob Herring]

On Thu, Jan 22, 2026 at 05:40:39PM +0530, Sumit Garg wrote:
> From: Sumit Garg <sumit.garg@oss.qualcomm.com>
> 
> Fix IOMMU DT propeties for GPU, display and video peripherals via
> dropping SMMU stream IDs which relates to secure context bank.
> 
> This problem only surfaced when the Gunyah based firmware stack is
> ported on Agatti replacing the legacy QHEE based firmware stack. Assigning
> Linux kernel (HLOS) VMID to secure context bank stream IDs is treated
> as a fault by Gunyah hypervisor which were previously ignored by QHEE
> hypervisor.
> 
> The DT changes should be backwards compatible with legacy QHEE based
> firmware stack too.

To avoid intermittent warnings, Bjorn should pick up the whole series.

Rob

Re: [PATCH v3 1/3] dt-bindings: display: msm: qcm2290-mdss: Fix iommus property

[Rob Herring (Arm)]

On Thu, 22 Jan 2026 17:40:40 +0530, Sumit Garg wrote:
> From: Sumit Garg <sumit.garg@oss.qualcomm.com>
> 
> Fix IOMMU DT propety for display via dropping SMMU stream IDs which
> relates to secure context bank. Assigning Linux kernel (HLOS) VMID
> to secure context bank stream IDs is incorrect. The maximum value
> for iommus property is updated accordingly.
> 
> These DT bindings changes should be backwards compatible.
> 
> Signed-off-by: Sumit Garg <sumit.garg@oss.qualcomm.com>
> ---
>  .../devicetree/bindings/display/msm/qcom,qcm2290-mdss.yaml  | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 

Reviewed-by: Rob Herring (Arm) <robh@kernel.org>

Re: [PATCH v3 2/3] dt-bindings: media: venus: Fix iommus property

[Rob Herring (Arm)]

On Thu, 22 Jan 2026 17:40:41 +0530, Sumit Garg wrote:
> From: Sumit Garg <sumit.garg@oss.qualcomm.com>
> 
> Fix IOMMU DT propety for venus via dropping SMMU stream IDs which
> relates to secure context bank. Assigning Linux kernel (HLOS) VMID
> to secure context bank stream IDs is incorrect. The maximum value
> for iommus property is updated accordingly.
> 
> These DT bindings changes should be backwards compatible.
> 
> Signed-off-by: Sumit Garg <sumit.garg@oss.qualcomm.com>
> ---
>  .../devicetree/bindings/media/qcom,qcm2290-venus.yaml      | 7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)
> 

Reviewed-by: Rob Herring (Arm) <robh@kernel.org>

Re: [PATCH v3 0/3] arm64: dts: qcom: agatti: Fix IOMMU DT properties

[Sumit Garg]

Hey Bjorn,

On Thu, Jan 22, 2026 at 11:22:22AM -0600, Rob Herring wrote:
> On Thu, Jan 22, 2026 at 05:40:39PM +0530, Sumit Garg wrote:
> > From: Sumit Garg <sumit.garg@oss.qualcomm.com>
> > 
> > Fix IOMMU DT propeties for GPU, display and video peripherals via
> > dropping SMMU stream IDs which relates to secure context bank.
> > 
> > This problem only surfaced when the Gunyah based firmware stack is
> > ported on Agatti replacing the legacy QHEE based firmware stack. Assigning
> > Linux kernel (HLOS) VMID to secure context bank stream IDs is treated
> > as a fault by Gunyah hypervisor which were previously ignored by QHEE
> > hypervisor.
> > 
> > The DT changes should be backwards compatible with legacy QHEE based
> > firmware stack too.
> 
> To avoid intermittent warnings, Bjorn should pick up the whole series.
> 

Just a gentle reminder in case it slipped your attention. Can we pick
this as part of fixes for v7.0 release?

-Sumit

Re: [PATCH v3 0/3] arm64: dts: qcom: agatti: Fix IOMMU DT properties

[Bjorn Andersson]

On Mon, Mar 02, 2026 at 06:23:18PM +0530, Sumit Garg wrote:
> Hey Bjorn,
> 
> On Thu, Jan 22, 2026 at 11:22:22AM -0600, Rob Herring wrote:
> > On Thu, Jan 22, 2026 at 05:40:39PM +0530, Sumit Garg wrote:
> > > From: Sumit Garg <sumit.garg@oss.qualcomm.com>
> > > 
> > > Fix IOMMU DT propeties for GPU, display and video peripherals via
> > > dropping SMMU stream IDs which relates to secure context bank.
> > > 
> > > This problem only surfaced when the Gunyah based firmware stack is
> > > ported on Agatti replacing the legacy QHEE based firmware stack. Assigning
> > > Linux kernel (HLOS) VMID to secure context bank stream IDs is treated
> > > as a fault by Gunyah hypervisor which were previously ignored by QHEE
> > > hypervisor.
> > > 
> > > The DT changes should be backwards compatible with legacy QHEE based
> > > firmware stack too.
> > 
> > To avoid intermittent warnings, Bjorn should pick up the whole series.
> > 
> 
> Just a gentle reminder in case it slipped your attention. Can we pick
> this as part of fixes for v7.0 release?
> 

Thanks for the ping. Is the Gunyah firmware generally available and
would this thereby be considered a regression that we need to fix for
v7.0? Or can I just pick it for v7.1?

Regards,
Bjorn

> -Sumit

Re: [PATCH v3 0/3] arm64: dts: qcom: agatti: Fix IOMMU DT properties

[Sumit Garg]

On Wed, Mar 04, 2026 at 01:09:31PM -0600, Bjorn Andersson wrote:
> On Mon, Mar 02, 2026 at 06:23:18PM +0530, Sumit Garg wrote:
> > Hey Bjorn,
> > 
> > On Thu, Jan 22, 2026 at 11:22:22AM -0600, Rob Herring wrote:
> > > On Thu, Jan 22, 2026 at 05:40:39PM +0530, Sumit Garg wrote:
> > > > From: Sumit Garg <sumit.garg@oss.qualcomm.com>
> > > > 
> > > > Fix IOMMU DT propeties for GPU, display and video peripherals via
> > > > dropping SMMU stream IDs which relates to secure context bank.
> > > > 
> > > > This problem only surfaced when the Gunyah based firmware stack is
> > > > ported on Agatti replacing the legacy QHEE based firmware stack. Assigning
> > > > Linux kernel (HLOS) VMID to secure context bank stream IDs is treated
> > > > as a fault by Gunyah hypervisor which were previously ignored by QHEE
> > > > hypervisor.
> > > > 
> > > > The DT changes should be backwards compatible with legacy QHEE based
> > > > firmware stack too.
> > > 
> > > To avoid intermittent warnings, Bjorn should pick up the whole series.
> > > 
> > 
> > Just a gentle reminder in case it slipped your attention. Can we pick
> > this as part of fixes for v7.0 release?
> > 
> 
> Thanks for the ping. Is the Gunyah firmware generally available and
> would this thereby be considered a regression that we need to fix for
> v7.0?

Yeah it's already available internally and we are just waiting for a
public release of the Gunyah firmware which is expected to come before
v7.0 gets released.

So, please get these fixes in v7.0 as these are boot critical ones.

-Sumit

> Or can I just pick it for v7.1?
>
> Regards,
> Bjorn

Re: [PATCH v3 0/3] arm64: dts: qcom: agatti: Fix IOMMU DT properties

[Bjorn Andersson]

On Thu, 22 Jan 2026 17:40:39 +0530, Sumit Garg wrote:
> From: Sumit Garg <sumit.garg@oss.qualcomm.com>
> 
> Fix IOMMU DT propeties for GPU, display and video peripherals via
> dropping SMMU stream IDs which relates to secure context bank.
> 
> This problem only surfaced when the Gunyah based firmware stack is
> ported on Agatti replacing the legacy QHEE based firmware stack. Assigning
> Linux kernel (HLOS) VMID to secure context bank stream IDs is treated
> as a fault by Gunyah hypervisor which were previously ignored by QHEE
> hypervisor.
> 
> [...]

Applied, thanks!

[1/3] dt-bindings: display: msm: qcm2290-mdss: Fix iommus property
      commit: 966a08c293cb9290d3fe932961404e87b3f81327
[2/3] dt-bindings: media: venus: Fix iommus property
      commit: 7e59cd4ad586afd87f67491cf91fa1141292cf57
[3/3] arm64: dts: qcom: agatti: Fix IOMMU DT properties
      commit: 2c409e03fc04b5cded81b7add9ce509706c922e3

Best regards,
-- 
Bjorn Andersson <andersson@kernel.org>