Module Name: src
Committed By: jmcneill
Date: Thu Oct 30 01:15:30 UTC 2014
Modified Files:
src/sys/arch/evbarm/awin: awin_start.S
Log Message:
fix a31_mpinit sync for real this time (thanks matt@)
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/awin/awin_start.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/awin/awin_start.S
diff -u src/sys/arch/evbarm/awin/awin_start.S:1.4 src/sys/arch/evbarm/awin/awin_start.S:1.5
--- src/sys/arch/evbarm/awin/awin_start.S:1.4 Thu Oct 30 00:55:53 2014
+++ src/sys/arch/evbarm/awin/awin_start.S Thu Oct 30 01:15:30 2014
@@ -41,7 +41,7 @@
#include <arm/allwinner/awin_reg.h>
#include <evbarm/awin/platform.h>
-RCSID("$NetBSD: awin_start.S,v 1.4 2014/10/30 00:55:53 jmcneill Exp $")
+RCSID("$NetBSD: awin_start.S,v 1.5 2014/10/30 01:15:30 jmcneill Exp $")
#if defined(VERBOSE_INIT_ARM)
#define XPUTC(n) mov r0, n; bl xputc
@@ -409,8 +409,8 @@ a31_mpinit_cpu:
1: dmb // memory barrier
ldr r0, [r6] // load hatched
- tst r0, #0xe // our bits set yet?
- bxeq r4 // yes, return
+ cmp r0, #0xe // our bits set yet?
+ bxge r4 // yes, return
subs r5, r5, #1 // decrement count
bxeq r4 // 0? return
mov r0, #0x1d800 // 5.03ms