arm: mach-k3: Remove non-cached memory map areas

All normal memory areas should be mapped as such.

We added these un-cached holes in our memory map to hack around the
remoteproc driver missing the proper cache maintenance operations.

The problem is having these non-cached memory map areas causes stability
issues later in system operation due to the nature of the K3 coherency
architecture. Plus these are board specific carveouts and instead
should have been added at the board level, not here in the SoC common
code area.

Remove these non-cached memory map areas.

Signed-off-by: Andrew Davis <[email protected]>
Reviewed-by: Nishanth Menon <[email protected]>
Tested-by: Nishanth Menon <[email protected]>

diff --git a/arch/arm/mach-k3/arm64-mmu.c b/arch/arm/mach-k3/arm64-mmu.c
index 5c858ae0f84e7ca5881e6e6d95bb0c9f8d124f66..2c2d75d3f41e0872953cda070b288ecc0254d730 100644 (file)
--- a/arch/arm/mach-k3/arm64-mmu.c
+++ b/arch/arm/mach-k3/arm64-mmu.c
@@ -30,13 +30,7 @@ struct mm_region am654_mem_map[] = {
        }, {
                .virt = 0xa0000000UL,
                .phys = 0xa0000000UL,
-               .size = 0x02100000UL,
-               .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL_NC) |
-                        PTE_BLOCK_INNER_SHARE
-       }, {
-               .virt = 0xa2100000UL,
-               .phys = 0xa2100000UL,
-               .size = 0x5df00000UL,
+               .size = 0x60000000UL,
                .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
                         PTE_BLOCK_INNER_SHARE
        }, {
@@ -81,13 +75,7 @@ struct mm_region j7200_mem_map[] = {
        }, {
                .virt = 0xa0000000UL,
                .phys = 0xa0000000UL,
-               .size = 0x04800000UL,
-               .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL_NC) |
-                        PTE_BLOCK_NON_SHARE
-       }, {
-               .virt = 0xa4800000UL,
-               .phys = 0xa4800000UL,
-               .size = 0x5b800000UL,
+               .size = 0x60000000UL,
                .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
                         PTE_BLOCK_INNER_SHARE
        }, {
@@ -129,13 +117,7 @@ struct mm_region j721e_mem_map[] = {
        }, {
                .virt = 0xa0000000UL,
                .phys = 0xa0000000UL,
-               .size = 0x1bc00000UL,
-               .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL_NC) |
-                        PTE_BLOCK_NON_SHARE
-       }, {
-               .virt = 0xbbc00000UL,
-               .phys = 0xbbc00000UL,
-               .size = 0x44400000UL,
+               .size = 0x60000000UL,
                .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
                         PTE_BLOCK_INNER_SHARE
        }, {
@@ -151,12 +133,6 @@ struct mm_region j721e_mem_map[] = {
                .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
                         PTE_BLOCK_NON_SHARE |
                         PTE_BLOCK_PXN | PTE_BLOCK_UXN
-       }, {
-               .virt = 0x4d80000000UL,
-               .phys = 0x4d80000000UL,
-               .size = 0x0002000000UL,
-               .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL_NC) |
-                        PTE_BLOCK_INNER_SHARE
        }, {
                /* List terminator */
                0,