GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-06-05 22:31:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

PPC: 85xx: Generalize DDR TLB mapping function

Browse source 
The DDR mapping function really is just a generic virtual -> physical
mapping function. Generalize it so it can support any virtual starting
offset and IO maps just the same.

Signed-off-by: Alexander Graf <agraf@suse.de>
Acked-by: Scott Wood <scottwood@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
This commit is contained in:
Alexander Graf 2014-04-11 17:09:43 +02:00 • committed by York Sun
parent 46a346834b
commit f29f804a93
2 changed files with 40 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
arch/powerpc/cpu/mpc85xx/tlb.c
View file

@ -236,20 +236,26 @@ void init_addr_map(void)
} }
#endif #endif
unsigned int uint64_t tlb_map_range(ulong v_addr, phys_addr_t p_addr, uint64_t size,
setup_ddr_tlbs_phys(phys_addr_t p_addr, unsigned int memsize_in_meg) enum tlb_map_type map_type)
{ {
int i; int i;
unsigned int tlb_size; unsigned int tlb_size;
unsigned int wimge = MAS2_M; unsigned int wimge;
unsigned int ram_tlb_address = (unsigned int)CONFIG_SYS_DDR_SDRAM_BASE; unsigned int perm;
unsigned int max_cam, tsize_mask; 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 #ifdef CONFIG_SYS_PPC_DDR_WIMGE
wimge = CONFIG_SYS_PPC_DDR_WIMGE; wimge = CONFIG_SYS_PPC_DDR_WIMGE;
#endif #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) { if ((mfspr(SPRN_MMUCFG) & MMUCFG_MAVN) == MMUCFG_MAVN_V1) {
/* Convert (4^max) kB to (2^max) bytes */ /* Convert (4^max) kB to (2^max) bytes */
max_cam = ((mfspr(SPRN_TLB1CFG) >> 16) & 0xf) * 2 + 10; max_cam = ((mfspr(SPRN_TLB1CFG) >> 16) & 0xf) * 2 + 10;
@ -261,11 +267,11 @@ setup_ddr_tlbs_phys(phys_addr_t p_addr, unsigned int memsize_in_meg)
} }
for (i = 0; size && i < 8; i++) { 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 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; break;
if (align == -2) align = max_cam; if (align == -2) align = max_cam;
@ -277,18 +283,29 @@ setup_ddr_tlbs_phys(phys_addr_t p_addr, unsigned int memsize_in_meg)
tlb_size = camsize - 10; tlb_size = camsize - 10;
set_tlb(1, ram_tlb_address, p_addr, set_tlb(1, v_addr, p_addr, perm, wimge,
MAS3_SX|MAS3_SW|MAS3_SR, wimge, 0, tlb_index, tlb_size, 1);
0, ram_tlb_index, tlb_size, 1);
size -= 1ULL << camsize; size -= 1ULL << camsize;
memsize -= 1ULL << camsize; v_addr += 1UL << camsize;
ram_tlb_address += 1UL << camsize;
p_addr += 1UL << camsize; p_addr += 1UL << camsize;
} }
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;
memsize = min(memsize, CONFIG_MAX_MEM_MAPPED);
memsize = tlb_map_range(ram_tlb_address, p_addr, memsize, TLB_MAP_RAM);
if (memsize) if (memsize)
print_size(memsize, " left unmapped\n"); print_size(memsize, " left unmapped\n");
return memsize_in_meg; return memsize_in_meg;
} }

8
arch/powerpc/include/asm/mmu.h
View file

@ -509,6 +509,14 @@ extern void print_tlbcam(void);
extern unsigned int setup_ddr_tlbs(unsigned int memsize_in_meg); extern unsigned int setup_ddr_tlbs(unsigned int memsize_in_meg);
extern void clear_ddr_tlbs(unsigned int memsize_in_meg); extern void clear_ddr_tlbs(unsigned int memsize_in_meg);
enum tlb_map_type {
TLB_MAP_RAM,
TLB_MAP_IO,
};
extern uint64_t tlb_map_range(ulong v_addr, phys_addr_t p_addr, uint64_t size,
enum tlb_map_type map_type);
extern void write_tlb(u32 _mas0, u32 _mas1, u32 _mas2, u32 _mas3, u32 _mas7); extern void write_tlb(u32 _mas0, u32 _mas1, u32 _mas2, u32 _mas3, u32 _mas7);
#define SET_TLB_ENTRY(_tlb, _epn, _rpn, _perms, _wimge, _ts, _esel, _sz, _iprot) \ #define SET_TLB_ENTRY(_tlb, _epn, _rpn, _perms, _wimge, _ts, _esel, _sz, _iprot) \