Skip to contentSkip to conversation

Arm64 fix a bug of vbar_el3 initialization

PATCH New fenghua at phytium.com.cn 2 participants 2 messages Apr 19, 2014 – May 25, 2014 Arm (32-bit)

lore
Share & tools
lore

fenghua at phytium.com.cn

author
#0 lore raw

PATCH 1/1 Arm64 fix a bug of vbar_el3 initialization

From: David Feng <[email protected]>

Signed-off-by David Feng <[email protected]>
---
 arch/arm/cpu/armv8/start.S |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/cpu/armv8/start.S +2 -2
index 33d3f36..4b11aa4 100644
@@ -50,10 +50,10 @@ reset:
 	 */
 	adr	x0, vectors
 	switch_el x1, 3f, 2f, 1f
-3:	mrs	x0, scr_el3
+3:	msr	vbar_el3, x0
+	mrs	x0, scr_el3
 	orr	x0, x0, #0xf			/* SCR_EL3.NS|IRQ|FIQ|EA */
 	msr	scr_el3, x0
-	msr	vbar_el3, x0
 	msr	cptr_el3, xzr			/* Enable FP/SIMD */
 	ldr	x0, =COUNTER_FREQUENCY
 	msr	cntfrq_el0, x0			/* Initialize CNTFRQ */
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 Arm64 fix a bug of vbar_el3 initialization

Hi fenghua at phytium.com.cn,

Quoted 14 lines · fenghua at phytium.com.cn

From: David Feng <[email protected]>

Signed-off-by David Feng <[email protected]>
---
 arch/arm/cpu/armv8/start.S |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/cpu/armv8/start.S +0 -0
index 33d3f36..4b11aa4 100644
@@ -50,10 +50,10 @@ reset:
 	 */
 	adr	x0, vectors

arch/arm/cpu/armv8/start.S reset: · line 59

Quoted 10 lines
arch/arm/cpu/armv8/start.S +2 -2
 	switch_el x1, 3f, 2f, 1f
-3:	mrs	x0, scr_el3
+3:	msr	vbar_el3, x0
+	mrs	x0, scr_el3
 	orr	x0, x0, #0xf			/* SCR_EL3.NS|IRQ|FIQ|EA */
 	msr	scr_el3, x0
-	msr	vbar_el3, x0
 	msr	cptr_el3, xzr			/* Enable FP/SIMD */
 	ldr	x0, =COUNTER_FREQUENCY
 	msr	cntfrq_el0, x0			/* Initialize CNTFRQ */

Applied to u-boot-arm/master, thanks!

Amicalement,

Signature · 1 line
Albert.