diff options
| author | York Sun <york.sun@nxp.com> | 2016-06-24 16:46:19 -0700 |
|---|---|---|
| committer | York Sun <york.sun@nxp.com> | 2016-07-15 09:01:43 -0700 |
| commit | 50e93b95653da44b9743357dfa3701e8482fd167 (patch) | |
| tree | 8db0847067eba3dffa8d67bc5ad12a6b3ff2dee0 | |
| parent | e61a7534e33063a76e105d895e5c6317f2d0cd76 (diff) | |
armv8: Add tlb_allocated to arch global data
When secure ram is used, MMU tables have to be put into secure ram.
To use common MMU code, gd->arch.tlb_addr will be used to host TLB
entry pointer. To save allocated memory for later use, tlb_allocated
variable is added to global data structure.
Signed-off-by: York Sun <york.sun@nxp.com>
| -rw-r--r-- | arch/arm/include/asm/global_data.h | 1 | ||||
| -rw-r--r-- | common/board_f.c | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/include/asm/global_data.h b/arch/arm/include/asm/global_data.h index 2d76cd477d4..10550174df4 100644 --- a/arch/arm/include/asm/global_data.h +++ b/arch/arm/include/asm/global_data.h @@ -57,6 +57,7 @@ struct arch_global_data { * 0x2 maintained */ phys_addr_t secure_ram; + unsigned long tlb_allocated; #endif #ifdef CONFIG_OMAP_COMMON diff --git a/common/board_f.c b/common/board_f.c index 0fc96bd4c6c..a1138b0a129 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -432,6 +432,15 @@ static int reserve_mmu(void) gd->arch.tlb_addr = gd->relocaddr; debug("TLB table from %08lx to %08lx\n", gd->arch.tlb_addr, gd->arch.tlb_addr + gd->arch.tlb_size); + +#ifdef CONFIG_SYS_MEM_RESERVE_SECURE + /* + * Record allocated tlb_addr in case gd->tlb_addr to be overwritten + * with location within secure ram. + */ + gd->arch.tlb_allocated = gd->arch.tlb_addr; +#endif + return 0; } #endif |