Revert the last two mach-k3 changes

This reverts both commit 4628730ee6c4 ("mach-k3: add runtime memory
carveouts for MMU table") as well as commit b77066d73261 ("mach-k3: add
dynamic mmu fixups for SPL stage") as some feedback from previous
iterations was missed.

This reverts commit b77066d73261855af406422fbbe28a5d527f4dbf and commit
4628730ee6c40864dbe475e4ca91e47a92f371fe.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/mach-k3/arm64/arm64-mmu.c b/arch/arm/mach-k3/arm64/arm64-mmu.c
index 74c8558..0e07b1b 100644 (file)
--- a/arch/arm/mach-k3/arm64/arm64-mmu.c
+++ b/arch/arm/mach-k3/arm64/arm64-mmu.c
@@ -9,19 +9,11 @@
  *
  */
 
-#include <linux/sizes.h>
 #include <asm/system.h>
 #include <asm/armv8/mmu.h>
-#include <mach/k3-ddr.h>
-#include <sort.h>
 
-#include "../common_fdt.h"
-
-DECLARE_GLOBAL_DATA_PTR;
-
-struct mm_region k3_mem_map[K3_MMU_REGIONS_COUNT] = {
+struct mm_region k3_mem_map[] = {
        {
-               /* Peripherals */
                .virt = 0x0UL,
                .phys = 0x0UL,
                .size = 0x80000000UL,
@@ -29,31 +21,30 @@ struct mm_region k3_mem_map[K3_MMU_REGIONS_COUNT] = {
                         PTE_BLOCK_NON_SHARE |
                         PTE_BLOCK_PXN | PTE_BLOCK_UXN
        }, {
-               /* Higher DDR banks */
+               .virt = 0x80000000UL,
+               .phys = 0x80000000UL,
+               .size = 0x1e780000UL,
+               .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
+                        PTE_BLOCK_INNER_SHARE
+       }, {
+               .virt = 0xa0000000UL,
+               .phys = 0xa0000000UL,
+               .size = 0x60000000UL,
+               .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
+                        PTE_BLOCK_INNER_SHARE
+       }, {
                .virt = 0x880000000UL,
                .phys = 0x880000000UL,
                .size = 0x80000000UL,
                .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
                         PTE_BLOCK_INNER_SHARE
        }, {
-               /* Flash peripherals */
                .virt = 0x500000000UL,
                .phys = 0x500000000UL,
                .size = 0x380000000UL,
                .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
                         PTE_BLOCK_NON_SHARE |
                         PTE_BLOCK_PXN | PTE_BLOCK_UXN
-       }, {
-               /* Map SPL load region and the next 128MiB as cacheable */
-               .virt = CONFIG_SPL_TEXT_BASE,
-               .phys = CONFIG_SPL_TEXT_BASE,
-               .size = SZ_128M,
-               .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
-                        PTE_BLOCK_INNER_SHARE
-       }, {
-               /* Framebuffer reserved, size set at runtime */
-               .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
-                        PTE_BLOCK_INNER_SHARE
        }, {
                /* List terminator */
                0,
@@ -61,225 +52,3 @@ struct mm_region k3_mem_map[K3_MMU_REGIONS_COUNT] = {
 };
 
 struct mm_region *mem_map = k3_mem_map;
-
-int k3_spl_mem_map_init(void)
-{
-       unsigned int i;
-       int k3_map_idx = -EINVAL;
-
-       for (i = 0; i < K3_MMU_REGIONS_COUNT; i++) {
-               if (k3_mem_map[i].virt == 0 && k3_mem_map[i].phys == 0 &&
-                   k3_mem_map[i].size == 0) {
-                       k3_map_idx = i;
-                       break;
-               }
-       }
-
-       if (k3_map_idx == -EINVAL) {
-               pr_err("%s: Failed to find fixup region in MMU memory map\n",
-                      __func__);
-               return -EINVAL;
-       }
-
-       if (k3_map_idx >= K3_MMU_REGIONS_COUNT - 1) {
-               pr_err("%s: Not enough space in MMU map for the added entry\n",
-                      __func__);
-               return -ENOMEM;
-       }
-
-       if (CONFIG_IS_ENABLED(VIDEO)) {
-               k3_mem_map[k3_map_idx].virt = gd_video_bottom();
-               k3_mem_map[k3_map_idx].phys = gd_video_bottom();
-               k3_mem_map[k3_map_idx].size =
-                       gd_video_top() - gd_video_bottom();
-               k3_mem_map[k3_map_idx].attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
-                                              PTE_BLOCK_INNER_SHARE;
-               k3_map_idx++;
-       }
-
-       k3_mem_map[k3_map_idx] = (const struct mm_region){ 0 };
-
-       return 0;
-}
-
-static int dt_reserved_cmp(const void *a, const void *b)
-{
-       const struct fdt_resource *val_a = a, *val_b = b;
-
-       return (val_a->start - val_b->start);
-}
-
-int k3_mem_map_init(void)
-{
-       fdt_addr_t mem_base;
-       fdt_size_t mem_size;
-       struct fdt_resource dt_reserved[K3_MMU_REGIONS_COUNT],
-               coalesced[K3_MMU_REGIONS_COUNT];
-       int k3_map_idx = -EINVAL, ret, nodeoffset, subnode;
-       void *blob = (void *)gd->fdt_blob;
-       unsigned int carveout_len, i, j;
-
-       ret = fdt_fixup_reserved(blob, "tfa", CONFIG_K3_ATF_LOAD_ADDR, 0x80000);
-       if (ret) {
-               pr_err("%s: Failed to fixup reserved node for tfa [%d]\n",
-                      __func__, ret);
-               return ret;
-       }
-
-       ret = fdt_fixup_reserved(blob, "optee", CONFIG_K3_OPTEE_LOAD_ADDR,
-                                0x1800000);
-       if (ret) {
-               pr_err("%s: Failed to fixup reserved node for optee [%d]\n",
-                      __func__, ret);
-               return ret;
-       }
-
-       nodeoffset = fdt_subnode_offset(blob, 0, "memory");
-       if (nodeoffset < 0) {
-               pr_err("%s: Failed to get memory data: %s\n", __func__,
-                      fdt_strerror(nodeoffset));
-               return nodeoffset;
-       }
-
-       mem_base = fdtdec_get_addr_size(blob, nodeoffset, "reg", &mem_size);
-       if (mem_base != CFG_SYS_SDRAM_BASE)
-               return -EINVAL;
-
-       for (i = 0; i < K3_MMU_REGIONS_COUNT; i++) {
-               if (k3_mem_map[i].virt == CONFIG_SPL_TEXT_BASE) {
-                       k3_map_idx = i;
-                       break;
-               }
-       }
-
-       if (k3_map_idx == -EINVAL) {
-               pr_err("%s: Failed to find DDR region in MMU memory map\n",
-                      __func__);
-               return -EINVAL;
-       }
-
-       i = 0;
-       nodeoffset = fdt_subnode_offset(blob, 0, "reserved-memory");
-       fdt_for_each_subnode(subnode, blob, nodeoffset) {
-               const char *name;
-               fdt_addr_t addr, end_addr;
-               fdt_size_t size;
-
-               if (i >= K3_MMU_REGIONS_COUNT) {
-                       /*
-                        * This is a recoverable error if the regions can be
-                        * coalesced, the required logic can be implemented once
-                        * requirement arises.
-                        */
-                       pr_err("%s: Not enough space in MMU map for carveouts\n",
-                              __func__);
-                       return -ENOMEM;
-               }
-
-               name = fdt_get_name(blob, subnode, NULL);
-               addr = fdtdec_get_addr_size(blob, subnode, "reg", &size);
-
-               if (addr == FDT_ADDR_T_NONE)
-                       continue;
-
-               if (!fdtdec_get_bool(blob, subnode, "no-map"))
-                       continue;
-
-               if (addr >= mem_base + mem_size)
-                       continue;
-
-               end_addr = addr + size;
-
-               if (end_addr <= mem_base)
-                       continue;
-
-               debug("Added memory carveout at 0x%llx, size: 0x%llx for '%s'\n",
-                     addr, size, name);
-
-               addr = max(addr, mem_base);
-               end_addr = min(end_addr, mem_base + mem_size);
-               size = end_addr - addr;
-               dt_reserved[i].start = addr;
-               dt_reserved[i].end = end_addr;
-               i++;
-       }
-       carveout_len = i;
-
-       if (!carveout_len)
-               return 0;
-
-       /* sort carveout regions by address required for creating carveouts */
-       qsort(dt_reserved, carveout_len, sizeof(dt_reserved[0]),
-             dt_reserved_cmp);
-
-       /* coalesce regions */
-       struct fdt_resource coalescing_temp = dt_reserved[0];
-
-       j = 0;
-       for (i = 1; i < carveout_len; i++) {
-               struct fdt_resource current = dt_reserved[i];
-
-               if (coalescing_temp.end >= current.start) {
-                       coalescing_temp.end = current.end;
-                       continue;
-               }
-               coalesced[j] = coalescing_temp;
-               coalescing_temp = current;
-               j++;
-       }
-
-       coalesced[j] = coalescing_temp;
-       carveout_len = j + 1;
-
-       if (coalesced[0].start != mem_base) {
-               k3_mem_map[k3_map_idx].virt = mem_base;
-               k3_mem_map[k3_map_idx].phys = mem_base;
-               k3_mem_map[k3_map_idx].size = coalesced[0].start - mem_base;
-               k3_mem_map[k3_map_idx].attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
-                                              PTE_BLOCK_INNER_SHARE;
-               k3_map_idx++;
-       }
-
-       for (i = 1; i < carveout_len; i++) {
-               k3_mem_map[k3_map_idx].virt = coalesced[i - 1].end;
-               k3_mem_map[k3_map_idx].phys = coalesced[i - 1].end;
-               k3_mem_map[k3_map_idx].size =
-                       coalesced[i].start - coalesced[i - 1].end;
-               k3_mem_map[k3_map_idx].attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
-                                              PTE_BLOCK_INNER_SHARE;
-               k3_map_idx++;
-       }
-
-       k3_mem_map[k3_map_idx].virt = coalesced[carveout_len - 1].end;
-       k3_mem_map[k3_map_idx].phys = coalesced[carveout_len - 1].end;
-       k3_mem_map[k3_map_idx].size =
-               mem_base + mem_size - coalesced[carveout_len - 1].end;
-       k3_mem_map[k3_map_idx].attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
-                                      PTE_BLOCK_INNER_SHARE;
-       k3_map_idx++;
-
-       /* map reserved memory as non cachable */
-       for (i = 0; i < carveout_len; i++) {
-               k3_mem_map[k3_map_idx].virt = coalesced[i].start;
-               k3_mem_map[k3_map_idx].phys = coalesced[i].start;
-               k3_mem_map[k3_map_idx].size =
-                       coalesced[i].end - coalesced[i].start;
-               k3_mem_map[k3_map_idx].attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL_NC) |
-                                              PTE_BLOCK_INNER_SHARE;
-               k3_map_idx++;
-       }
-
-       debug("%s: MMU Table configured as:\n", __func__);
-       debug("   |virt start\t\t|virt end\t|phys\t\t|size\t\t|attrs:\n");
-       for (i = 0; i < k3_map_idx; i++) {
-               debug("%2d: 0x%-12llx\t0x%-12llx\t0x%-12llx\t0x%-12llx\t0x%llx\n",
-                     i, k3_mem_map[i].virt,
-                     k3_mem_map[i].virt + k3_mem_map[i].size,
-                     k3_mem_map[i].phys, k3_mem_map[i].size,
-                     k3_mem_map[i].attrs);
-       }
-
-       k3_mem_map[k3_map_idx] = (const struct mm_region){ 0 };
-
-       return 0;
-}

diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c
index 723076e..f8c53b2 100644 (file)
--- a/arch/arm/mach-k3/common.c
+++ b/arch/arm/mach-k3/common.c
@@ -15,7 +15,6 @@
 #include <asm/global_data.h>
 #include <linux/printk.h>
 #include "common.h"
-#include "mach/k3-ddr.h"
 #include <dm.h>
 #include <remoteproc.h>
 #include <asm/cache.h>
@@ -269,6 +268,9 @@ void spl_enable_cache(void)
 
        dram_init();
 
+       /* reserve TLB table */
+       gd->arch.tlb_size = PGTABLE_SIZE;
+
        gd->ram_top += get_effective_memsize();
        gd->relocaddr = gd->ram_top;
 
@@ -276,15 +278,6 @@ void spl_enable_cache(void)
        if (ret)
                panic("Failed to reserve framebuffer memory (%d)\n", ret);
 
-       if (IS_ENABLED(CONFIG_ARM64)) {
-               ret = k3_spl_mem_map_init();
-               if (ret)
-                       panic("Failed to perform MMU fixups: %d\n", ret);
-       }
-
-       /* reserve TLB table */
-       gd->arch.tlb_size = PGTABLE_SIZE;
-
        gd->arch.tlb_addr = gd->relocaddr - gd->arch.tlb_size;
        gd->arch.tlb_addr &= ~(0x10000 - 1);
        debug("TLB table from %08lx to %08lx\n", gd->arch.tlb_addr,

diff --git a/arch/arm/mach-k3/include/mach/k3-ddr.h b/arch/arm/mach-k3/include/mach/k3-ddr.h
index 375a1a8..39e6725 100644 (file)
--- a/arch/arm/mach-k3/include/mach/k3-ddr.h
+++ b/arch/arm/mach-k3/include/mach/k3-ddr.h
@@ -8,22 +8,10 @@
 
 #include <spl.h>
 
-/* Number of mappable regions in the MMU page table */
-#define K3_MMU_REGIONS_COUNT 32
-
 int dram_init(void);
 int dram_init_banksize(void);
 
 void fixup_ddr_driver_for_ecc(struct spl_image_info *spl_image);
 void fixup_memory_node(struct spl_image_info *spl_image);
 
-/* Performs MMU memory map fixups at SPL stage */
-int k3_spl_mem_map_init(void);
-
-/*
- * Modifies the MMU memory map based on DDR size and reserved-memory
- * nodes in DT
- */
-int k3_mem_map_init(void);
-
 #endif /* _K3_DDR_H_ */

diff --git a/board/beagle/beagleplay/beagleplay.c b/board/beagle/beagleplay/beagleplay.c
index 031040f..7863581 100644 (file)
--- a/board/beagle/beagleplay/beagleplay.c
+++ b/board/beagle/beagleplay/beagleplay.c
@@ -13,7 +13,6 @@
 #include <spl.h>
 
 #include <asm/arch/hardware.h>
-#include <mach/k3-ddr.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -49,17 +48,6 @@ int board_init(void)
 
 int dram_init(void)
 {
-       int ret;
-
-       if (IS_ENABLED(CONFIG_ARM64) && xpl_phase() != PHASE_SPL) {
-               ret = k3_mem_map_init();
-               if (ret) {
-                       printf("%s: Error fixing up MMU memory map: %d\n",
-                              __func__, ret);
-                       return ret;
-               }
-       }
-
        return fdtdec_setup_mem_size_base();
 }
 

diff --git a/board/ti/common/k3-ddr.c b/board/ti/common/k3-ddr.c
index ee882f6..a8425da 100644 (file)
--- a/board/ti/common/k3-ddr.c
+++ b/board/ti/common/k3-ddr.c
@@ -7,7 +7,6 @@
 #include <dm/uclass.h>
 #include <k3-ddrss.h>
 #include <spl.h>
-#include <mach/k3-ddr.h>
 
 #include "k3-ddr.h"
 
@@ -15,15 +14,6 @@ int dram_init(void)
 {
        s32 ret;
 
-       if (IS_ENABLED(CONFIG_ARM64) && xpl_phase() != PHASE_SPL) {
-               ret = k3_mem_map_init();
-               if (ret) {
-                       printf("%s: Error fixing up MMU memory map: %d\n",
-                              __func__, ret);
-                       return ret;
-               }
-       }
-
        ret = fdtdec_setup_mem_size_base_lowest();
        if (ret)
                printf("Error setting up mem size and base. %d\n", ret);