mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-09-26 16:21:25 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

armv8/cache: Consolidate setting for MAIR and TCR

Browse Source 
Move setting for MAIR and TCR to cache_v8.c, to avoid conflict with
sub-architecture.

Signed-off-by: York Sun <yorksun@freescale.com>
CC: David Feng <fenghua@phytium.com.cn>
This commit is contained in:
York Sun 2014-02-26 13:26:02 -08:00 committed by Albert ARIBAUD
parent 2c67e0e7cf
commit f5222cfd49
2 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,15 +45,31 @@ static void mmu_setup(void)
/* load TTBR0 */ /* load TTBR0 */
el = current_el(); el = current_el();
if (el == 1) if (el == 1) {
asm volatile("msr ttbr0_el1, %0" asm volatile("msr ttbr0_el1, %0"
: : "r" (gd->arch.tlb_addr) : "memory"); : : "r" (gd->arch.tlb_addr) : "memory");
else if (el == 2) asm volatile("msr tcr_el1, %0"
: : "r" (TCR_FLAGS | TCR_EL1_IPS_BITS)
: "memory");
asm volatile("msr mair_el1, %0"
: : "r" (MEMORY_ATTRIBUTES) : "memory");
} else if (el == 2) {
asm volatile("msr ttbr0_el2, %0" asm volatile("msr ttbr0_el2, %0"
: : "r" (gd->arch.tlb_addr) : "memory"); : : "r" (gd->arch.tlb_addr) : "memory");
else asm volatile("msr tcr_el2, %0"
: : "r" (TCR_FLAGS | TCR_EL2_IPS_BITS)
: "memory");
asm volatile("msr mair_el2, %0"
: : "r" (MEMORY_ATTRIBUTES) : "memory");
} else {
asm volatile("msr ttbr0_el3, %0" asm volatile("msr ttbr0_el3, %0"
: : "r" (gd->arch.tlb_addr) : "memory"); : : "r" (gd->arch.tlb_addr) : "memory");
asm volatile("msr tcr_el3, %0"
: : "r" (TCR_FLAGS | TCR_EL2_IPS_BITS)
: "memory");
asm volatile("msr mair_el3, %0"
: : "r" (MEMORY_ATTRIBUTES) : "memory");
}
/* enable the mmu */ /* enable the mmu */
set_sctlr(get_sctlr() | CR_M); set_sctlr(get_sctlr() | CR_M);

22
arch/arm/cpu/armv8/start.S
View File

@ -128,28 +128,6 @@ ENTRY(c_runtime_cpu_setup)
isb sy isb sy
#endif #endif
#ifndef CONFIG_SYS_DCACHE_OFF
/*
* Setup MAIR and TCR.
*/
ldr x0, =MEMORY_ATTRIBUTES
ldr x1, =TCR_FLAGS
switch_el x2, 3f, 2f, 1f
3: orr x1, x1, TCR_EL3_IPS_BITS
msr mair_el3, x0
msr tcr_el3, x1
b 0f
2: orr x1, x1, TCR_EL2_IPS_BITS
msr mair_el2, x0
msr tcr_el2, x1
b 0f
1: orr x1, x1, TCR_EL1_IPS_BITS
msr mair_el1, x0
msr tcr_el1, x1
0:
#endif
/* Relocate vBAR */ /* Relocate vBAR */
adr x0, vectors adr x0, vectors
switch_el x1, 3f, 2f, 1f switch_el x1, 3f, 2f, 1f