Merge "ARM: dts: msm: Exclude Q6 SMEM region from AQC IOVA space" (4b66b501) · Commits · e / devices / android_kernel_xiaomi_nabu

arch/arm64/boot/dts/qcom/sdxprairie-aqc.dtsi

+10 −10

Original line number	Diff line number	Diff line
		/* Copyright (c) 2019, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -60,11 +60,11 @@
		qcom,smmu;

		/* IOVA range is restricted to avoid conflicts with PCI BAR
		* space and IOVA spaces used by peripherals that are currently
		* attached to IPA.
		* space, Q6 SMEM and IOVA spaces used by peripherals that are
		* currently attached to IPA.
		*/
		qcom,smmu-iova-base = /bits/ 64 <0x80000000>;
		qcom,smmu-iova-size = /bits/ 64 <0x10000000>;
		qcom,smmu-iova-size = /bits/ 64 <0x0FE40000>;

		qcom,smmu-attr-atomic;
		qcom,smmu-attr-fastmap;
		@@ -122,11 +122,11 @@
		qcom,smmu;

		/* IOVA range is restricted to avoid conflicts with PCI BAR
		* space and IOVA spaces used by peripherals that are currently
		* attached to IPA.
		* space, Q6 SMEM and IOVA spaces used by peripherals that are
		* currently attached to IPA.
		*/
		qcom,smmu-iova-base = /bits/ 64 <0x80000000>;
		qcom,smmu-iova-size = /bits/ 64 <0x10000000>;
		qcom,smmu-iova-size = /bits/ 64 <0x0FE40000>;

		qcom,smmu-attr-atomic;
		qcom,smmu-attr-fastmap;
		@@ -184,11 +184,11 @@
		qcom,smmu;

		/* IOVA range is restricted to avoid conflicts with PCI BAR
		* space and IOVA spaces used by peripherals that are currently
		* attached to IPA.
		* space, Q6 SMEM and IOVA spaces used by peripherals that are
		* currently attached to IPA.
		*/
		qcom,smmu-iova-base = /bits/ 64 <0x80000000>;
		qcom,smmu-iova-size = /bits/ 64 <0x10000000>;
		qcom,smmu-iova-size = /bits/ 64 <0x0FE40000>;

		qcom,smmu-attr-atomic;
		qcom,smmu-attr-fastmap;