leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

thunderx: Move mmu table into board file

Browse Source 
The MMU range table can vary depending on things we may only find
out at runtime. While the very simple ThunderX variant does not
change, other boards will, so move the definition from a static
entry in a header file to the board file.

Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Alexander Graf 2016-03-04 01:09:48 +01:00 committed by Tom Rini
parent 5e2ec773bb
commit d473f0c621
4 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/cpu/armv8/cache_v8.c
View File

@ -36,8 +36,6 @@ DECLARE_GLOBAL_DATA_PTR;
*/
#ifdef CONFIG_SYS_FULL_VA
static struct mm_region mem_map[] = CONFIG_SYS_MEM_MAP;
static u64 get_tcr(int el, u64 *pips, u64 *pva_bits)
{
u64 max_addr = 0;
@ -46,7 +44,7 @@ static u64 get_tcr(int el, u64 *pips, u64 *pva_bits)
int i;
/* Find the largest address we need to support */
for (i = 0; i < ARRAY_SIZE(mem_map); i++)
for (i = 0; mem_map[i].size || mem_map[i].attrs; i++)
max_addr = max(max_addr, mem_map[i].base + mem_map[i].size);
/* Calculate the maximum physical (and thus virtual) address */
@ -266,7 +264,7 @@ static int count_required_pts(u64 addr, int level, u64 maxaddr)
int i;
enum pte_type pte_type = PTE_INVAL;
for (i = 0; i < ARRAY_SIZE(mem_map); i++) {
for (i = 0; mem_map[i].size || mem_map[i].attrs; i++) {
struct mm_region *map = &mem_map[i];
u64 start = map->base;
u64 end = start + map->size;
@ -364,7 +362,7 @@ static void setup_pgtables(void)
create_table();
/* Now add all MMU table entries one after another to the table */
for (i = 0; i < ARRAY_SIZE(mem_map); i++)
for (i = 0; mem_map[i].size || mem_map[i].attrs; i++)
add_map(&mem_map[i]);
/* Create the same thing once more for our emergency page table */

2
arch/arm/include/asm/armv8/mmu.h
View File

@ -203,6 +203,8 @@ struct mm_region {
u64 size;
u64 attrs;
};
extern struct mm_region *mem_map;
#endif
#endif /* _ASM_ARMV8_MMU_H_ */

24
board/cavium/thunderx/thunderx.c
View File

@ -10,6 +10,7 @@
#include <linux/compiler.h>
#include <cavium/atf.h>
#include <asm/armv8/mmu.h>
#if !CONFIG_IS_ENABLED(OF_CONTROL)
#include <dm/platdata.h>
@ -42,6 +43,29 @@ U_BOOT_DEVICE(thunderx_serial1) = {
DECLARE_GLOBAL_DATA_PTR;
static struct mm_region thunderx_mem_map[] = {
{
.base = 0x000000000000UL,
.size = 0x40000000000UL,
.attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_NON_SHARE,
}, {
.base = 0x800000000000UL,
.size = 0x40000000000UL,
.attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
PTE_BLOCK_NON_SHARE,
}, {
.base = 0x840000000000UL,
.size = 0x40000000000UL,
.attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
PTE_BLOCK_NON_SHARE,
}, {
/* List terminator */
0,
}
};
struct mm_region *mem_map = thunderx_mem_map;
int board_init(void)
{
return 0;

11
include/configs/thunderx_88xx.h
View File

@ -26,17 +26,6 @@
#define CONFIG_SYS_LOWMEM_BASE MEM_BASE
#define CONFIG_SYS_MEM_MAP {{0x000000000000UL, 0x40000000000UL, \
PTE_BLOCK_MEMTYPE(MT_NORMAL) | \
PTE_BLOCK_NON_SHARE}, \
{0x800000000000UL, 0x40000000000UL, \
PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | \
PTE_BLOCK_NON_SHARE}, \
{0x840000000000UL, 0x40000000000UL, \
PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | \
PTE_BLOCK_NON_SHARE}, \
}
#define CONFIG_SYS_MEM_MAP_SIZE 3
#define CONFIG_SYS_VA_BITS 48