armv8/cache: Consolidate setting for MAIR and TCR
PATCH v2 1/3 armv8/cache: Consolidate setting for MAIR and TCR
Move setting for MAIR and TCR to cache_v8.c, to avoid conflict with sub-architecture.
---
Changed since v1
v1: Acked-by: David Feng <[email protected]>
v2: No change.
arch/arm/cpu/armv8/cache_v8.c | 22 +++++++++++++++++++--- arch/arm/cpu/armv8/start.S | 22 ---------------------- 2 files changed, 19 insertions(+), 25 deletions(-)
arch/arm/cpu/armv8/cache_v8.c +19 -3
@@ -45,15 +45,31 @@ static void mmu_setup(void)/* load TTBR0 */ el =current_el (); -if (el ==1 ) +if (el ==1 ) { asmvolatile ("msr ttbr0_el1, %0" : :"r" (gd->arch.tlb_addr) :"memory" ); -else if (el ==2 ) + asmvolatile ("msr tcr_el1, %0" + : :"r" (TCR_FLAGS |TCR_EL1_IPS_BITS ) + :"memory" ); + asmvolatile ("msr mair_el1, %0" + : :"r" (MEMORY_ATTRIBUTES ) :"memory" ); + }else if (el ==2 ) { asmvolatile ("msr ttbr0_el2, %0" : :"r" (gd->arch.tlb_addr) :"memory" ); -else + asmvolatile ("msr tcr_el2, %0" + : :"r" (TCR_FLAGS |TCR_EL2_IPS_BITS ) + :"memory" ); + asmvolatile ("msr mair_el2, %0" + : :"r" (MEMORY_ATTRIBUTES ) :"memory" ); + }else { asmvolatile ("msr ttbr0_el3, %0" : :"r" (gd->arch.tlb_addr) :"memory" ); + asmvolatile ("msr tcr_el3, %0" + : :"r" (TCR_FLAGS |TCR_EL2_IPS_BITS ) + :"memory" ); + asmvolatile ("msr mair_el3, %0" + : :"r" (MEMORY_ATTRIBUTES ) :"memory" ); + }/* enable the mmu */ set_sctlr (get_sctlr () |CR_M );
arch/arm/cpu/armv8/start.S +0 -22
@@ -128,28 +128,6 @@ ENTRY(c_runtime_cpu_setup) isb sy #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 */ adr x0, vectors switch_el x1, 3f, 2f, 1f
Signature · 1 line
1.7.9.5
PATCH v2 2/3 armv8/cache: Flush D-cache, invalidate I-cache for relocation
If D-cache is enabled, we need to flush it, and invalidate i-cache before jumping to the new location. This should be done right after relocation.
---
Changed since v1:
v2: use macro switch_el
invalidate i-cache by detection of SCTLR.IC
arch/arm/cpu/armv8/start.S | 6 ------ arch/arm/lib/relocate_64.S | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 6 deletions(-)
arch/arm/cpu/armv8/start.S +0 -6
@@ -122,12 +122,6 @@ ENDPROC(lowlevel_init) /*-----------------------------------------------------------------------*/ ENTRY(c_runtime_cpu_setup) - /* If I-cache is enabled invalidate it */ -#ifndef CONFIG_SYS_ICACHE_OFF - ic iallu /* I+BTB cache invalidate */ - isb sy -#endif - /* Relocate vBAR */ adr x0, vectors switch_el x1, 3f, 2f, 1f
arch/arm/lib/relocate_64.S +19 -0
@@ -11,6 +11,7 @@ #include <asm-offsets.h> #include <config.h> #include <linux/linkage.h> +#include <asm/macro.h> /* * void relocate_code (addr_moni)
@@ -19,6 +20,9 @@ * x0 holds the destination address. */ ENTRY(relocate_code) + stp x29, x30, [sp, #-32]! /* create a stack frame */ + mov x29, sp + str x0, [sp, #16] /* * Copy u-boot from flash to RAM */
@@ -32,6 +36,7 @@ copy_loop: stp x10, x11, [x0], #16 /* copy to target address [x0] */ cmp x1, x2 /* until source end address [x2] */ b.lo copy_loop + str x0, [sp, #24] /* * Fix .rela.dyn relocations
@@ -54,5 +59,19 @@ fixnext: b.lo fixloop relocate_done: + switch_el x1, 3f, 2f, 1f + bl hang +3: mrs x0, sctlr_el3 + b 0f +2: mrs x0, sctlr_el2 + b 0f +1: mrs x0, sctlr_el1 +0: tbz w0, #2, 5f /* skip flushing cache if disabled */ + tbz w0, #12, 4f /* invalide i-cache is enabled */ + ic iallu /* i-cache invalidate all */ + isb sy +4: ldp x0, x1, [sp, #16] + bl __asm_flush_dcache_range +5: ldp x29, x30, [sp],#16 ret ENDPROC(relocate_code)
Signature · 1 line
1.7.9.5
PATCH v2 3/3 armv8/cache: Change cache invalidate and flush function
In reply to York SunWhen SoC first boots up, we should invalidate the cache but not flush it. We can use the same function for invalid and flush mostly, with a wrapper.
Invalidating large cache can ben slow on emulator, so we postpone doing so until I-cache is enabled, and before enabling D-cache.
---
Changed since v1:
v2: Move calling __asm_invalidate_icache_all from start.S to icache_enable()
Remove calling __asm_invalidate_tlb_all from start.S
arch/arm/cpu/armv8/cache.S | 53 +++++++++++++++++++++++++++++------------ arch/arm/cpu/armv8/cache_v8.c | 3 ++- arch/arm/cpu/armv8/start.S | 10 ++++---- arch/arm/include/asm/system.h | 1 + 4 files changed, 47 insertions(+), 20 deletions(-)
arch/arm/cpu/armv8/cache.S +38 -15
@@ -19,11 +19,12 @@ * clean and invalidate one level cache. * * x0: cache level - * x1~x9: clobbered + * x1: 0 flush & invalidate, 1 invalidate only + * x2~x9: clobbered */ ENTRY(__asm_flush_dcache_level) - lsl x1, x0, #1 - msr csselr_el1, x1 /* select cache level */ + lsl x12, x0, #1 + msr csselr_el1, x12 /* select cache level */ isb /* sync change of cssidr_el1 */ mrs x6, ccsidr_el1 /* read the new cssidr_el1 */ and x2, x6, #7 /* x2 <- log2(cache line size)-4 */
@@ -35,7 +36,7 @@ ENTRY(__asm_flush_dcache_level) clz w5, w4 /* bit position of #ways */ mov x4, #0x7fff and x4, x4, x6, lsr #13 /* x4 <- max number of #sets */ - /* x1 <- cache level << 1 */ + /* x12 <- cache level << 1 */ /* x2 <- line length offset */ /* x3 <- number of cache ways - 1 */ /* x4 <- number of cache sets - 1 */
@@ -45,11 +46,14 @@ loop_set: mov x6, x3 /* x6 <- working copy of #ways */ loop_way: lsl x7, x6, x5 - orr x9, x1, x7 /* map way and level to cisw value */ + orr x9, x12, x7 /* map way and level to cisw value */ lsl x7, x4, x2 orr x9, x9, x7 /* map set number to cisw value */ - dc cisw, x9 /* clean & invalidate by set/way */ - subs x6, x6, #1 /* decrement the way */ + tbz w1, #0, 1f + dc isw, x9 + b 2f +1: dc cisw, x9 /* clean & invalidate by set/way */ +2: subs x6, x6, #1 /* decrement the way */ b.ge loop_way subs x4, x4, #1 /* decrement the set */ b.ge loop_set
@@ -58,11 +62,14 @@ loop_way: ENDPROC(__asm_flush_dcache_level) /* - * void __asm_flush_dcache_all(void) + * void __asm_flush_dcache_all(int invalidate_only) + * + * x0: 0 flush & invalidate, 1 invalidate only * * clean and invalidate all data cache by SET/WAY. */ -ENTRY(__asm_flush_dcache_all) +ENTRY(__asm_dcache_all) + mov x1, x0 dsb sy mrs x10, clidr_el1 /* read clidr_el1 */ lsr x11, x10, #24
@@ -76,13 +83,13 @@ ENTRY(__asm_flush_dcache_all) /* x15 <- return address */ loop_level: - lsl x1, x0, #1 - add x1, x1, x0 /* x0 <- tripled cache level */ - lsr x1, x10, x1 - and x1, x1, #7 /* x1 <- cache type */ - cmp x1, #2 + lsl x12, x0, #1 + add x12, x12, x0 /* x0 <- tripled cache level */ + lsr x12, x10, x12 + and x12, x12, #7 /* x12 <- cache type */ + cmp x12, #2 b.lt skip /* skip if no cache or icache */ - bl __asm_flush_dcache_level + bl __asm_flush_dcache_level /* x1 = 0 flush, 1 invalidate */ skip: add x0, x0, #1 /* increment cache level */ cmp x11, x0
@@ -96,8 +103,24 @@ skip: finished: ret +ENDPROC(__asm_dcache_all) + +ENTRY(__asm_flush_dcache_all) + mov x16, lr + mov x0, #0 + bl __asm_dcache_all + mov lr, x16 + ret ENDPROC(__asm_flush_dcache_all) +ENTRY(__asm_invalidate_dcache_all) + mov x16, lr + mov x0, #0xffff + bl __asm_dcache_all + mov lr, x16 + ret +ENDPROC(__asm_invalidate_dcache_all) + /* * void __asm_flush_dcache_range(start, end) *
arch/arm/cpu/armv8/cache_v8.c +2 -1
@@ -80,7 +80,7 @@ static void mmu_setup(void)*/ void invalidate_dcache_all (void ) { -__asm_flush_dcache_all (); +__asm_invalidate_dcache_all (); }/*
@@ -177,6 +177,7 @@ int dcache_status(void)void icache_enable (void ) { +__asm_invalidate_icache_all ();set_sctlr (get_sctlr () |CR_I ); }
arch/arm/cpu/armv8/start.S +6 -4
@@ -64,10 +64,12 @@ reset: msr cpacr_el1, x0 /* Enable FP/SIMD */ 0: - /* Cache/BPB/TLB Invalidate */ - bl __asm_flush_dcache_all /* dCache clean&invalidate */ - bl __asm_invalidate_icache_all /* iCache invalidate */ - bl __asm_invalidate_tlb_all /* invalidate TLBs */ + /* + * Cache/BPB/TLB Invalidate + * i-cache is invalidated before enabled in icache_enable() + * tlb is invalidated before mmu is enabled in dcache_enable() + * d-cache is invalidated before enabled in dcache_enable() + */ /* Processor specific initialization */ bl lowlevel_init
arch/arm/include/asm/system.h +1 -0
@@ -66,6 +66,7 @@ static inline void set_sctlr(unsigned int val) }void __asm_flush_dcache_all (void ); +void __asm_invalidate_dcache_all (void );void __asm_flush_dcache_range (u64 start,u64 end);void __asm_invalidate_tlb_all (void );void __asm_invalidate_icache_all (void );
Signature · 1 line
1.7.9.5
PATCH v2 1/3 armv8/cache: Consolidate setting for MAIR and TCR
In reply to York SunHi York,
Quoted 9 lines · York Sun
Move setting for MAIR and TCR to
cache_v8.c, to avoid conflict with sub-architecture.Signed-off-by York Sun <[email protected]>CC David Feng <[email protected]>---
Changed since v1
v1: Acked-by: David Feng <[email protected]>
v2: No change.
Didn't a v3 already hit the list, and shouldn't this series be v4?
Amicalement,
Signature · 1 line
Albert.
PATCH v2 1/3 armv8/cache: Consolidate setting for MAIR and TCR
Quoted 8 lines · Albert ARIBAUD
Hi York,
Quoted 3 lines · York Sun
Move setting for MAIR and TCR to
cache_v8.c, to avoid conflict with sub-architecture.
Quoted 9 lines
Quoted 6 lines
Signed-off-by York Sun <[email protected]>CC David Feng <[email protected]>---
Changed since v1
v1: Acked-by: David Feng <[email protected]>
v2: No change.Didn't a v3 already hit the list, and shouldn't this series be v4?
Really? I don't recall. Did I leak an internal review patch to the list? Previous version is http://patchwork.ozlabs.org/patch/319067/
York
PATCH v2 1/3 armv8/cache: Consolidate setting for MAIR and TCR
Hi York,
Quoted 16 lines · York Sun
Quoted 15 lines · Albert ARIBAUD
Hi York,
Quoted 9 lines · York Sun
Move setting for MAIR and TCR to
cache_v8.c, to avoid conflict with sub-architecture.Signed-off-by York Sun <[email protected]>CC David Feng <[email protected]>---
Changed since v1
v1: Acked-by: David Feng <[email protected]>
v2: No change.
Quoted 5 lines
Quoted 2 lines
Didn't a v3 already hit the list, and shouldn't this series be v4?
Really? I don't recall. Did I leak an internal review patch to the list? Previous version is http://patchwork.ozlabs.org/patch/319067/
My mistake (and second one yesterday evening). V2 is fine.
Quoted 1 line
York
Amicalement,
Signature · 1 line
Albert.
PATCH v2 1/3 armv8/cache: Consolidate setting for MAIR and TCR
In reply to York SunHi York,
Quoted 6 lines · York Sun
Move setting for MAIR and TCR to
cache_v8.c, to avoid conflict with sub-architecture.Signed-off-by York Sun <[email protected]>CC David Feng <[email protected]>---
Whole series applied to u-boot-arm/master, thanks!
Amicalement,
Signature · 1 line
Albert.