85xx: Add support to populate addr map based on TLB settings
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
parent
78bbc5ce15
commit
ecf5b98c7a
|
@ -26,6 +26,11 @@
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <asm/processor.h>
|
#include <asm/processor.h>
|
||||||
#include <asm/mmu.h>
|
#include <asm/mmu.h>
|
||||||
|
#ifdef CONFIG_ADDR_MAP
|
||||||
|
#include <addr_map.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
DECLARE_GLOBAL_DATA_PTR;
|
||||||
|
|
||||||
void set_tlb(u8 tlb, u32 epn, u64 rpn,
|
void set_tlb(u8 tlb, u32 epn, u64 rpn,
|
||||||
u8 perms, u8 wimge,
|
u8 perms, u8 wimge,
|
||||||
|
@ -47,6 +52,11 @@ void set_tlb(u8 tlb, u32 epn, u64 rpn,
|
||||||
mtspr(MAS7, _mas7);
|
mtspr(MAS7, _mas7);
|
||||||
#endif
|
#endif
|
||||||
asm volatile("isync;msync;tlbwe;isync");
|
asm volatile("isync;msync;tlbwe;isync");
|
||||||
|
|
||||||
|
#ifdef CONFIG_ADDR_MAP
|
||||||
|
if ((tlb == 1) && (gd->flags & GD_FLG_RELOC))
|
||||||
|
addrmap_set_entry(epn, rpn, (1UL << ((tsize * 2) + 10)), esel);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void disable_tlb(u8 esel)
|
void disable_tlb(u8 esel)
|
||||||
|
@ -67,6 +77,11 @@ void disable_tlb(u8 esel)
|
||||||
mtspr(MAS7, _mas7);
|
mtspr(MAS7, _mas7);
|
||||||
#endif
|
#endif
|
||||||
asm volatile("isync;msync;tlbwe;isync");
|
asm volatile("isync;msync;tlbwe;isync");
|
||||||
|
|
||||||
|
#ifdef CONFIG_ADDR_MAP
|
||||||
|
if (gd->flags & GD_FLG_RELOC)
|
||||||
|
addrmap_set_entry(0, 0, 0, esel);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void invalidate_tlb(u8 tlb)
|
void invalidate_tlb(u8 tlb)
|
||||||
|
@ -91,6 +106,25 @@ void init_tlbs(void)
|
||||||
return ;
|
return ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef CONFIG_ADDR_MAP
|
||||||
|
void init_addr_map(void)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
|
||||||
|
for (i = 0; i < num_tlb_entries; i++) {
|
||||||
|
if (tlb_table[i].tlb == 0)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
addrmap_set_entry(tlb_table[i].epn,
|
||||||
|
tlb_table[i].rpn,
|
||||||
|
(1UL << ((tlb_table[i].tsize * 2) + 10)),
|
||||||
|
tlb_table[i].esel);
|
||||||
|
}
|
||||||
|
|
||||||
|
return ;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
unsigned int setup_ddr_tlbs(unsigned int memsize_in_meg)
|
unsigned int setup_ddr_tlbs(unsigned int memsize_in_meg)
|
||||||
{
|
{
|
||||||
unsigned int tlb_size;
|
unsigned int tlb_size;
|
||||||
|
|
|
@ -431,6 +431,9 @@ extern void set_tlb(u8 tlb, u32 epn, u64 rpn,
|
||||||
extern void disable_tlb(u8 esel);
|
extern void disable_tlb(u8 esel);
|
||||||
extern void invalidate_tlb(u8 tlb);
|
extern void invalidate_tlb(u8 tlb);
|
||||||
extern void init_tlbs(void);
|
extern void init_tlbs(void);
|
||||||
|
#ifdef CONFIG_ADDR_MAP
|
||||||
|
extern void init_addr_map(void);
|
||||||
|
#endif
|
||||||
extern unsigned int setup_ddr_tlbs(unsigned int memsize_in_meg);
|
extern unsigned int setup_ddr_tlbs(unsigned int memsize_in_meg);
|
||||||
|
|
||||||
#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) \
|
||||||
|
|
|
@ -75,6 +75,10 @@
|
||||||
#include <keyboard.h>
|
#include <keyboard.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef CONFIG_ADDR_MAP
|
||||||
|
#include <asm/mmu.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_SYS_UPDATE_FLASH_SIZE
|
#ifdef CONFIG_SYS_UPDATE_FLASH_SIZE
|
||||||
extern int update_flash_size (int flash_size);
|
extern int update_flash_size (int flash_size);
|
||||||
#endif
|
#endif
|
||||||
|
@ -694,6 +698,10 @@ void board_init_r (gd_t *id, ulong dest_addr)
|
||||||
*/
|
*/
|
||||||
trap_init (dest_addr);
|
trap_init (dest_addr);
|
||||||
|
|
||||||
|
#if defined(CONFIG_ADDR_MAP) && defined(CONFIG_E500)
|
||||||
|
init_addr_map();
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined(CONFIG_BOARD_EARLY_INIT_R)
|
#if defined(CONFIG_BOARD_EARLY_INIT_R)
|
||||||
board_early_init_r ();
|
board_early_init_r ();
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue