From 2fde9442a128a2a28aed01a5399f491df199ce08 Mon Sep 17 00:00:00 2001 From: Dong Aisheng Date: Tue, 24 Dec 2019 18:38:49 +0800 Subject: [PATCH] LF-665-20 arm64: dts: imx8x: make sure cma do not overlap dma zone After commit 1a8e1cef7603 ("arm64: use both ZONE_DMA and ZONE_DMA32"), ZONE_DMA will contain the lower 1G of memory. Change the CMA range start or size to ensure it's not overlapped with dma zone. Signed-off-by: Dong Aisheng --- arch/arm64/boot/dts/freescale/imx8qxp-ddr3l-val.dts | 2 +- arch/arm64/boot/dts/freescale/imx8qxp-lpddr4-val.dts | 2 +- arch/arm64/boot/dts/freescale/imx8qxp-mek-dom0.dts | 2 +- arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 2 +- arch/arm64/boot/dts/freescale/imx8x-17x17-val.dtsi | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-ddr3l-val.dts b/arch/arm64/boot/dts/freescale/imx8qxp-ddr3l-val.dts index 05411ec714a6..98787df3567d 100644 --- a/arch/arm64/boot/dts/freescale/imx8qxp-ddr3l-val.dts +++ b/arch/arm64/boot/dts/freescale/imx8qxp-ddr3l-val.dts @@ -16,7 +16,7 @@ compatible = "shared-dma-pool"; reusable; size = <0 0x14000000>; - alloc-ranges = <0 0x96000000 0 0x14000000>; + alloc-ranges = <0 0xc0000000 0 0x14000000>; linux,cma-default; }; }; diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-lpddr4-val.dts b/arch/arm64/boot/dts/freescale/imx8qxp-lpddr4-val.dts index fdde9fca2f82..1c220a51c9ea 100755 --- a/arch/arm64/boot/dts/freescale/imx8qxp-lpddr4-val.dts +++ b/arch/arm64/boot/dts/freescale/imx8qxp-lpddr4-val.dts @@ -72,7 +72,7 @@ compatible = "shared-dma-pool"; reusable; size = <0 0x3c000000>; - alloc-ranges = <0 0x96000000 0 0x3c000000>; + alloc-ranges = <0 0xc0000000 0 0x3c000000>; linux,cma-default; }; }; diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-mek-dom0.dts b/arch/arm64/boot/dts/freescale/imx8qxp-mek-dom0.dts index 9cd0ea20937f..770b12cabc31 100644 --- a/arch/arm64/boot/dts/freescale/imx8qxp-mek-dom0.dts +++ b/arch/arm64/boot/dts/freescale/imx8qxp-mek-dom0.dts @@ -29,7 +29,7 @@ compatible = "shared-dma-pool"; reusable; size = <0 0x30000000>; - alloc-ranges = <0 0xb0000000 0 0x40000000>; + alloc-ranges = <0 0xc0000000 0 0x40000000>; linux,cma-default; }; }; diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts b/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts index cb34dbef9598..7d1fe434a030 100755 --- a/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts +++ b/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts @@ -142,7 +142,7 @@ compatible = "shared-dma-pool"; reusable; size = <0 0x3c000000>; - alloc-ranges = <0 0x96000000 0 0x3c000000>; + alloc-ranges = <0 0xc0000000 0 0x3c000000>; linux,cma-default; }; }; diff --git a/arch/arm64/boot/dts/freescale/imx8x-17x17-val.dtsi b/arch/arm64/boot/dts/freescale/imx8x-17x17-val.dtsi index 7a609d29836a..7e2819f255fd 100644 --- a/arch/arm64/boot/dts/freescale/imx8x-17x17-val.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8x-17x17-val.dtsi @@ -11,7 +11,7 @@ compatible = "shared-dma-pool"; reusable; size = <0 0x14000000>; - alloc-ranges = <0 0x96000000 0 0x14000000>; + alloc-ranges = <0 0xc0000000 0 0x14000000>; linux,cma-default; }; }; -- 2.17.1