Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f73ccd8 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Update SID mapping to save SMR space"

parents 6044c2fa 1fe9f526

arch/arm/boot/dts/qcom/msmterbium-iommu.dtsi

+60 −35
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ 
			reg = <0x1f09000 0x1000>;

			qcom,secure-context;

			interrupts = <0 241 0>;

			qcom,iommu-ctx-sids = <0x0>;

			qcom,iommu-sid-mask = <0x402>;

			qcom,iommu-ctx-sids = <0x2>;

			qcom,iommu-sid-mask = <0x401>;

			label = "gfx3d_secure";

		};
@@ -42,8 +42,17 @@ 
			reg = <0x1f0a000 0x1000>;

			interrupts = <0 242 0>;

			qcom,iommu-ctx-sids = <0x0>;

			qcom,iommu-sid-mask = <0x401>;

			label = "gfx3d_ns";

			qcom,iommu-sid-mask = <0x400>;

			label = "gfx3d_user";

		};



		qcom,iommu-ctx@1f0b000 {

			compatible = "qcom,msm-smmu-v2-ctx";

			reg = <0x1f0b000 0x1000>;

			interrupts = <0 242 0>;

			qcom,iommu-ctx-sids = <0x1>;

			qcom,iommu-sid-mask = <0x400>;

			label = "gfx3d_priv";

		};

	};
@@ -64,7 +73,7 @@ 
		qcom,cb-base-offset = <0x20000>;

		status = "ok";



		qcom,iommu-ctx@1e221000 {

		qcom,iommu-ctx@1e21000 {

			compatible = "qcom,msm-smmu-v2-ctx";

			reg = <0x1e21000 0x1000>;

			qcom,secure-context;
@@ -87,8 +96,10 @@ 
			reg = <0x1e23000 0x1000>;

			qcom,secure-context;

			interrupts = <0 54 0>;

			qcom,iommu-ctx-sids = <0x980 0x986 0x903 0x923

						0x3580 0x3586 0x3503 0x3523>;

			qcom,iommu-ctx-sids = <0x980 0x986 0x903

						0x3580 0x3586 0x3503>;

			qcom,iommu-sid-mask = <0x0 0x0 0x20

						0x0 0x0 0x20>;

			label = "venus_fw";

		};
@@ -96,7 +107,8 @@ 
			compatible = "qcom,msm-smmu-v2-ctx";

			reg = <0x1e24000 0x1000>;

			interrupts = <0 58 0>;

			qcom,iommu-ctx-sids = <0x1c01 0x1c02 0x1c03 0x1c04>;

			qcom,iommu-ctx-sids = <0x1c01 0x1c02 0x1c04>;

			qcom,iommu-sid-mask = <0x0 0x1 0x0>;

			label = "pronto_pil";

		};
@@ -123,11 +135,14 @@ 
			reg = <0x1e27000 0x1000>;

			qcom,secure-context;

			interrupts = <0 76 0>;

			qcom,iommu-ctx-sids = <0x940 0x905 0x907 0x90f

					0x908 0x90d 0x925 0x928 0x92d

					0x3540 0x3505 0x3507 0x350f

					0x3508 0x350d 0x3525 0x3528

					0x352d>;

			qcom,iommu-ctx-sids = <0x940 0x905 0x907

					0x908 0x90d 0x925 0x92d

					0x3540 0x3505 0x3507

					0x3508 0x350d 0x3525 0x352d>;

			qcom,iommu-sid-mask = <0x0 0x0 0x8

					0x20 0x0 0x0 0x0

					0x0 0x0 0x8

					0x20 0x0 0x0 0x0>;

			label = "venus_sec_non_pixel";

		};
@@ -136,8 +151,10 @@ 
			reg = <0x1e28000 0x1000>;

			qcom,secure-context;

			interrupts = <0 77 0>;

			qcom,iommu-ctx-sids = <0x902 0x90a 0x90e 0x909 0x90b

					0x3502 0x350a 0x350e 0x3509 0x350b>;

			qcom,iommu-ctx-sids = <0x902 0x90e 0x909

					0x3502 0x350e 0x3509>;

			qcom,iommu-sid-mask = <0x8 0x0 0x2

					0x8 0x0 0x2>;

			label = "venus_sec_bitstream";

		};
@@ -146,8 +163,10 @@ 
			reg = <0x1e29000 0x1000>;

			qcom,secure-context;

			interrupts = <0 80 0>;

			qcom,iommu-ctx-sids = <0x904 0x90c 0x910 0x92c

					0x3504 0x350c 0x3510 0x352c>;

			qcom,iommu-ctx-sids = <0x904 0x90c 0x910

					0x3504 0x350c 0x3510>;

			qcom,iommu-sid-mask = <0x0 0x20 0x0

					0x0 0x20 0x0>;

			label = "venus_sec_pixel";

		};
@@ -164,9 +183,9 @@ 
			compatible = "qcom,msm-smmu-v2-ctx";

			reg = <0x1e2b000 0x1000>;

			interrupts = <0 101 0>;

			qcom,iommu-ctx-sids = <0x1c0 0x1ca 0x1cb 0x1cc

			qcom,iommu-ctx-sids = <0x1c0 0x1ca 0x1cc

					0x1d0 0x1e0 0x1f0>;

                        qcom,iommu-sid-mask = <0x7 0x0 0x0 0x3

                        qcom,iommu-sid-mask = <0x7 0x1 0x3

					0xf 0xf 0x1>;

			label = "lpass";

		};
@@ -175,7 +194,8 @@ 
			compatible = "qcom,msm-smmu-v2-ctx";

			reg = <0x1e2c000 0x1000>;

			interrupts = <0 102 0>;

			qcom,iommu-ctx-sids = <0x1004 0x1006>;

			qcom,iommu-ctx-sids = <0x1004>;

			qcom,iommu-sid-mask = <0x2>;

			label = "q6";

		};
@@ -183,8 +203,10 @@ 
			compatible = "qcom,msm-smmu-v2-ctx";

			reg = <0x1e2d000 0x1000>;

			interrupts = <0 103 0>;

			qcom,iommu-ctx-sids = <0x926 0x929 0x92b

					0x3526 0x3529 0x352b>;

			qcom,iommu-ctx-sids = <0x926 0x929

					0x3526 0x3529>;

			qcom,iommu-sid-mask = <0x0 0x2

					0x0 0x2>;

			label = "venus_enc";

		};
@@ -217,7 +239,8 @@ 
			compatible = "qcom,msm-smmu-v2-ctx";

			reg = <0x1e32000 0x1000>;

			interrupts = <0 110 0>;

			qcom,iommu-ctx-sids = <0x1d4 0x1d5>;

			qcom,iommu-ctx-sids = <0x1d4>;

			qcom,iommu-sid-mask = <0x1>;

			label = "lpass_stream";

		};
@@ -249,16 +272,18 @@ 
			compatible = "qcom,msm-smmu-v2-ctx";

			reg = <0x1e36000 0x1000>;

			interrupts = <0 114 0>;

			qcom,iommu-ctx-sids = <0x800 0x801 0x80A 0x807

					0x80E 0x80F 0x808 0x809 0x80B

					0x80C 0x80D 0x810 0x811 0x821

					0x828 0x829 0x82B 0x82C 0x82D

					0x831

					0x3400 0x3401 0x3407 0x3408

					0x3409 0x340A 0x340B 0x340C

					0x340D 0x340E 0x340F 0x3410

					0x3411 0x3421 0x3428 0x3429

					0x342B 0x342C 0x342D 0x3431>;

			qcom,iommu-ctx-sids = <0x800 0x807 0x808

					0x80C 0x810 0x821 0x828

					0x82B 0x82C 0x831

					0x3400 0x3407 0x3408

					0x340C 0x3410 0x3421 0x3428

					0x342B 0x342C 0x3431>;

			qcom,iommu-sid-mask = <0x1 0x0 0x3

					0x3 0x1 0x0 0x1

					0x0 0x1 0x0

					0x1 0x0 0x3

					0x3 0x1 0x0 0x1

					0x0 0x1 0x0>;

			label = "venus_ns";

		};
@@ -299,7 +324,7 @@ 
			compatible = "qcom,msm-smmu-v2-ctx";

			reg = <0x1e3b000 0x1000>;

			interrupts = <0 119 0>;

			qcom,iommu-ctx-sids = <0x1402>;

			qcom,iommu-ctx-sids = <0x2c02>;

			label = "ipa_wlan";

		};
@@ -307,7 +332,7 @@ 
			compatible = "qcom,msm-smmu-v2-ctx";

			reg = <0x1e3c000 0x1000>;

			interrupts = <0 120 0>;

			qcom,iommu-ctx-sids = <0x1404>;

			qcom,iommu-ctx-sids = <0x2c04>;

			label = "ipa_uc";

		};

	};