Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / arch / powerpc / cpu / mpc85xx / tlb.c

diff --git a/arch/powerpc/cpu/mpc85xx/tlb.c b/arch/powerpc/cpu/mpc85xx/tlb.c
index 8748ecd1440d1ea53811d4a4e937c39428f9fc3c..4465ae7565a45be93f4f0d55a0fbf00d5e455311 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/tlb.c
+++ b/arch/powerpc/cpu/mpc85xx/tlb.c
@@ -1,19 +1,21 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2008-2011 Freescale Semiconductor, Inc.
  *
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
+#include <asm/bitops.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
 #ifdef CONFIG_ADDR_MAP
 #include <addr_map.h>
 #endif
 
+#include <linux/log2.h>
+
 DECLARE_GLOBAL_DATA_PTR;
 
 void invalidate_tlb(u8 tlb)
@@ -24,7 +26,7 @@ void invalidate_tlb(u8 tlb)
                mtspr(MMUCSR0, 0x2);
 }
 
-void init_tlbs(void)
+__weak void init_tlbs(void)
 {
        int i;
 
@@ -236,20 +238,26 @@ void init_addr_map(void)
 }
 #endif
 
-unsigned int
-setup_ddr_tlbs_phys(phys_addr_t p_addr, unsigned int memsize_in_meg)
+uint64_t tlb_map_range(ulong v_addr, phys_addr_t p_addr, uint64_t size,
+                      enum tlb_map_type map_type)
 {
        int i;
        unsigned int tlb_size;
-       unsigned int wimge = MAS2_M;
-       unsigned int ram_tlb_address = (unsigned int)CONFIG_SYS_DDR_SDRAM_BASE;
+       unsigned int wimge;
+       unsigned int perm;
        unsigned int max_cam, tsize_mask;
-       u64 size, memsize = (u64)memsize_in_meg << 20;
 
+       if (map_type == TLB_MAP_RAM) {
+               perm = MAS3_SX|MAS3_SW|MAS3_SR;
+               wimge = MAS2_M;
 #ifdef CONFIG_SYS_PPC_DDR_WIMGE
-       wimge = CONFIG_SYS_PPC_DDR_WIMGE;
+               wimge = CONFIG_SYS_PPC_DDR_WIMGE;
 #endif
-       size = min(memsize, CONFIG_MAX_MEM_MAPPED);
+       } else {
+               perm = MAS3_SW|MAS3_SR;
+               wimge = MAS2_I|MAS2_G;
+       }
+
        if ((mfspr(SPRN_MMUCFG) & MMUCFG_MAVN) == MMUCFG_MAVN_V1) {
                /* Convert (4^max) kB to (2^max) bytes */
                max_cam = ((mfspr(SPRN_TLB1CFG) >> 16) & 0xf) * 2 + 10;
@@ -261,11 +269,11 @@ setup_ddr_tlbs_phys(phys_addr_t p_addr, unsigned int memsize_in_meg)
        }
 
        for (i = 0; size && i < 8; i++) {
-               int ram_tlb_index = find_free_tlbcam();
+               int tlb_index = find_free_tlbcam();
                u32 camsize = __ilog2_u64(size) & tsize_mask;
-               u32 align = __ilog2(ram_tlb_address) & tsize_mask;
+               u32 align = __ilog2(v_addr) & tsize_mask;
 
-               if (ram_tlb_index == -1)
+               if (tlb_index == -1)
                        break;
 
                if (align == -2) align = max_cam;
@@ -277,18 +285,33 @@ setup_ddr_tlbs_phys(phys_addr_t p_addr, unsigned int memsize_in_meg)
 
                tlb_size = camsize - 10;
 
-               set_tlb(1, ram_tlb_address, p_addr,
-                       MAS3_SX|MAS3_SW|MAS3_SR, wimge,
-                       0, ram_tlb_index, tlb_size, 1);
+               set_tlb(1, v_addr, p_addr, perm, wimge,
+                       0, tlb_index, tlb_size, 1);
 
                size -= 1ULL << camsize;
-               memsize -= 1ULL << camsize;
-               ram_tlb_address += 1UL << camsize;
+               v_addr += 1UL << camsize;
                p_addr += 1UL << camsize;
        }
 
-       if (memsize)
-               print_size(memsize, " left unmapped\n");
+       return size;
+}
+
+unsigned int setup_ddr_tlbs_phys(phys_addr_t p_addr,
+                                unsigned int memsize_in_meg)
+{
+       unsigned int ram_tlb_address = (unsigned int)CONFIG_SYS_DDR_SDRAM_BASE;
+       u64 memsize = (u64)memsize_in_meg << 20;
+       u64 size;
+
+       size = min(memsize, (u64)CONFIG_MAX_MEM_MAPPED);
+       size = tlb_map_range(ram_tlb_address, p_addr, size, TLB_MAP_RAM);
+
+       if (size || memsize > CONFIG_MAX_MEM_MAPPED) {
+               print_size(memsize > CONFIG_MAX_MEM_MAPPED ?
+                          memsize - CONFIG_MAX_MEM_MAPPED + size : size,
+                          " left unmapped\n");
+       }
+
        return memsize_in_meg;
 }