Skip to content

Commit 2c409e0

Browse files
b49020andersson
authored andcommitted
arm64: dts: qcom: agatti: Fix IOMMU DT properties
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 <[email protected]> Reviewed-by: Konrad Dybcio <[email protected]> Reviewed-by: Akhil P Oommen <[email protected]> Reviewed-by: Dmitry Baryshkov <[email protected]> Signed-off-by: Sumit Garg <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Bjorn Andersson <[email protected]>
1 parent 7e59cd4 commit 2c409e0

1 file changed

Lines changed: 3 additions & 8 deletions

File tree

arch/arm64/boot/dts/qcom/agatti.dtsi

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1669,8 +1669,7 @@
16691669
&bimc SLAVE_EBI1 RPM_ALWAYS_TAG>;
16701670
interconnect-names = "gfx-mem";
16711671

1672-
iommus = <&adreno_smmu 0 1>,
1673-
<&adreno_smmu 2 0>;
1672+
iommus = <&adreno_smmu 0 1>;
16741673
operating-points-v2 = <&gpu_opp_table>;
16751674
power-domains = <&rpmpd QCM2290_VDDCX>;
16761675
qcom,gmu = <&gmu_wrapper>;
@@ -1951,8 +1950,7 @@
19511950

19521951
power-domains = <&dispcc MDSS_GDSC>;
19531952

1954-
iommus = <&apps_smmu 0x420 0x2>,
1955-
<&apps_smmu 0x421 0x0>;
1953+
iommus = <&apps_smmu 0x420 0x2>;
19561954
interconnects = <&mmrt_virt MASTER_MDP0 RPM_ALWAYS_TAG
19571955
&bimc SLAVE_EBI1 RPM_ALWAYS_TAG>,
19581956
<&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG
@@ -2436,10 +2434,7 @@
24362434

24372435
memory-region = <&pil_video_mem>;
24382436
iommus = <&apps_smmu 0x860 0x0>,
2439-
<&apps_smmu 0x880 0x0>,
2440-
<&apps_smmu 0x861 0x04>,
2441-
<&apps_smmu 0x863 0x0>,
2442-
<&apps_smmu 0x804 0xe0>;
2437+
<&apps_smmu 0x880 0x0>;
24432438

24442439
interconnects = <&mmnrt_virt MASTER_VIDEO_P0 RPM_ALWAYS_TAG
24452440
&bimc SLAVE_EBI1 RPM_ALWAYS_TAG>,

0 commit comments

Comments
 (0)