andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

AArch64: Remove EL-agnostic TLB helper functions 

Also, don't invalidate the TLBs in disable_mmu() function, it's better
to do it in enable_mmu() function just before actually enabling the
MMU.

Change-Id: Ib32d6660019b0b2c17254156aad4be67ab4970e1
This commit is contained in:
Sandrine Bailleux 2013-11-15 14:46:44 +00:00 committed by Dan Handley
parent 3738274dc1
commit 295538bc37
3 changed files with 1 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/aarch64/arch_helpers.h
View File

@ -48,8 +48,6 @@
/*******************************************************************************
* TLB maintenance accessor prototypes
******************************************************************************/
extern void tlbiall(void);
extern void tlbiallis(void);
extern void tlbialle1(void);
extern void tlbialle1is(void);
extern void tlbialle2(void);

22
lib/arch/aarch64/tlb_helpers.S
View File

@ -30,8 +30,6 @@
#include <arch_helpers.h>
.globl tlbiall
.globl tlbiallis
.globl tlbialle1
.globl tlbialle1is
.globl tlbialle2
@ -43,26 +41,6 @@
.section .text, "ax"
tlbiall:; .type tlbiall, %function
mrs x0, CurrentEl
cmp x0, #(MODE_EL1 << MODE_EL_SHIFT)
b.eq tlbialle1
cmp x0, #(MODE_EL2 << MODE_EL_SHIFT)
b.eq tlbialle2
cmp x0, #(MODE_EL3 << MODE_EL_SHIFT)
b.eq tlbialle3
tlbiallis:; .type tlbiallis, %function
mrs x0, CurrentEl
cmp x0, #(MODE_EL1 << MODE_EL_SHIFT)
b.eq tlbialle1is
cmp x0, #(MODE_EL2 << MODE_EL_SHIFT)
b.eq tlbialle2is
cmp x0, #(MODE_EL3 << MODE_EL_SHIFT)
b.eq tlbialle3is
tlbialle1:; .type tlbialle1, %function
tlbi alle1
dsb sy

5
plat/fvp/aarch64/fvp_common.c
View File

@ -461,7 +461,7 @@ void enable_mmu()
TCR_RGN_INNER_WBA | TCR_T0SZ_4GB;
if (GET_EL(current_el) == MODE_EL3) {
tcr |= TCR_EL3_RES1;
/* Invalidate all TLBs */
/* Invalidate EL3 TLBs */
tlbialle3();
} else {
/* Invalidate EL1 TLBs */
@ -491,9 +491,6 @@ void disable_mmu(void)
write_ttbr0(0);
write_sctlr(0);
/* Invalidate TLBs of the CurrentEL */
tlbiall();
/* Flush the caches */
dcsw_op_all(DCCISW);