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 <aisheng.dong@nxp.com>

diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-ddr3l-val.dts b/arch/arm64/boot/dts/freescale/imx8qxp-ddr3l-val.dts
index 05411ec..98787df 100644 (file)
--- 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 fdde9fc..1c220a5 100755 (executable)
--- 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 9cd0ea2..770b12c 100644 (file)
--- 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 cb34dbe..7d1fe43 100755 (executable)
--- 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 7a609d2..7e2819f 100644 (file)
--- 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;
                };
        };