sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arch/armv7-ar: add isb after CACHE and TLB operations.

Browse Source
This commit is contained in:
zhangyuan21 2022-11-02 09:52:34 +08:00 committed by Xiang Xiao
parent 8be4bca3eb
commit cdeddcb028
4 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/src/armv7-a/arm_cpuhead.S
View File

@ -211,6 +211,7 @@ __cpu3_start:
mcr CP15_BPIALL(r0) /* Invalidate entire branch prediction array */ mcr CP15_BPIALL(r0) /* Invalidate entire branch prediction array */
mcr CP15_ICIALLU(r0) /* Invalidate I-cache */ mcr CP15_ICIALLU(r0) /* Invalidate I-cache */
#endif #endif
isb
/* Load the page table address. /* Load the page table address.
* *
@ -369,6 +370,7 @@ __cpu3_start:
/* Then write the configured control register */ /* Then write the configured control register */
mcr CP15_SCTLR(r0) /* Write control reg */ mcr CP15_SCTLR(r0) /* Write control reg */
isb
.rept 12 /* Cortex A8 wants lots of NOPs here */ .rept 12 /* Cortex A8 wants lots of NOPs here */
nop nop
.endr .endr

4
arch/arm/src/armv7-a/arm_head.S
View File

@ -208,6 +208,7 @@ __cpu0_start:
bic r0, r0, #(SCTLR_M | SCTLR_C) bic r0, r0, #(SCTLR_M | SCTLR_C)
bic r0, r0, #(SCTLR_I) bic r0, r0, #(SCTLR_I)
mcr CP15_SCTLR(r0) mcr CP15_SCTLR(r0)
isb
/* Clear the 16K level 1 page table */ /* Clear the 16K level 1 page table */
@ -364,6 +365,8 @@ __cpu0_start:
mcr CP15_ICIALLU(r0) /* Invalidate I-cache */ mcr CP15_ICIALLU(r0) /* Invalidate I-cache */
#endif #endif
isb
/* Load the page table address. /* Load the page table address.
* *
* NOTES: * NOTES:
@ -523,6 +526,7 @@ __cpu0_start:
/* Then write the configured control register */ /* Then write the configured control register */
mcr CP15_SCTLR(r0) /* Write control reg */ mcr CP15_SCTLR(r0) /* Write control reg */
isb
.rept 12 /* Cortex A8 wants lots of NOPs here */ .rept 12 /* Cortex A8 wants lots of NOPs here */
nop nop
.endr .endr

2
arch/arm/src/armv7-a/arm_pghead.S
View File

@ -320,6 +320,7 @@ __start:
mcr CP15_TLBIALL(r0,c5) mcr CP15_TLBIALL(r0,c5)
mcr CP15_BPIALL(r0) /* Invalidate entire branch prediction array */ mcr CP15_BPIALL(r0) /* Invalidate entire branch prediction array */
mcr CP15_ICIALLU(r0) /* Invalidate I-cache */ mcr CP15_ICIALLU(r0) /* Invalidate I-cache */
isb
/* Load the page table address. /* Load the page table address.
* *
@ -467,6 +468,7 @@ __start:
/* Then write the configured control register */ /* Then write the configured control register */
mcr CP15_SCTLR(r0) /* Write control reg */ mcr CP15_SCTLR(r0) /* Write control reg */
isb
.rept 12 /* Cortex A8 wants lots of NOPs here */ .rept 12 /* Cortex A8 wants lots of NOPs here */
nop nop
.endr .endr

2
arch/arm/src/armv7-r/arm_head.S
View File

@ -161,6 +161,7 @@ __start:
mcr CP15_BPIALL(r0) /* Invalidate entire branch prediction array */ mcr CP15_BPIALL(r0) /* Invalidate entire branch prediction array */
mcr CP15_ICIALLU(r0) /* Invalidate I-cache */ mcr CP15_ICIALLU(r0) /* Invalidate I-cache */
mcr CP15_DCIALLU(r0) /* Invalidate D-cache */ mcr CP15_DCIALLU(r0) /* Invalidate D-cache */
isb
/* Configure the system control register (see sctrl.h) */ /* Configure the system control register (see sctrl.h) */
@ -313,6 +314,7 @@ __start:
/* Then write the configured control register */ /* Then write the configured control register */
mcr CP15_SCTLR(r0) /* Write control reg */ mcr CP15_SCTLR(r0) /* Write control reg */
isb
.rept 12 /* Some CPUs want want lots of NOPs here */ .rept 12 /* Some CPUs want want lots of NOPs here */
nop nop
.endr .endr