[PATCH 1/2] arm64: versal2: Drop static DDR MMU mappings

[Michal Simek]

DDR coverage is already populated later from the DRAM banks discovered by
mem_map_fill(). Drop the stale static mappings so the MMU table matches
address map more closely.

Signed-off-by: Michal Simek <michal.simek at amd.com>
---

 arch/arm/mach-versal2/cpu.c | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/arch/arm/mach-versal2/cpu.c b/arch/arm/mach-versal2/cpu.c
index 3f3bfc949360..f5db0660ad54 100644
--- a/arch/arm/mach-versal2/cpu.c
+++ b/arch/arm/mach-versal2/cpu.c
@@ -27,9 +27,9 @@
 DECLARE_GLOBAL_DATA_PTR;
 
 #if CONFIG_IS_ENABLED(PCIE_DW_AMD)
-#define VERSAL2_MEM_MAP_USED	6
+#define VERSAL2_MEM_MAP_USED	4
 #else
-#define VERSAL2_MEM_MAP_USED	5
+#define VERSAL2_MEM_MAP_USED	3
 #endif
 
 #define DRAM_BANKS CONFIG_NR_DRAM_BANKS
@@ -59,19 +59,6 @@ static struct mm_region versal2_mem_map[VERSAL2_MEM_MAP_MAX] = {
 		.attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
 			 PTE_BLOCK_NON_SHARE |
 			 PTE_BLOCK_PXN | PTE_BLOCK_UXN
-	}, {
-		.virt = 0x600000000UL,
-		.phys = 0x600000000UL,
-		.size = 0x800000000UL,
-		.attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
-			 PTE_BLOCK_INNER_SHARE
-	}, {
-		.virt = 0xe00000000UL,
-		.phys = 0xe00000000UL,
-		.size = 0xf200000000UL,
-		.attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
-			 PTE_BLOCK_NON_SHARE |
-			 PTE_BLOCK_PXN | PTE_BLOCK_UXN
 #if CONFIG_IS_ENABLED(PCIE_DW_AMD)
 	}, {
 		/* PCIe DBI (1 MB) and config space (255 MB) are contiguous */
-- 
2.43.0

base-commit: 19d429b48dc3eaea37494e69313d58ba1c1da24e
branch: debian-sent3