Re: CVS commit: src/sys [freeze on boot]

[Jason Thorpe <thorpej%me.com@localhost>]

> On Jan 20, 2020, at 3:44 PM, Christos Zoulas <christos%astron.com@localhost> wrote:
> 
> In article <20200120185023.GD28945%homeworld.netbsd.org@localhost>,
> Andrew Doran  <ad%netbsd.org@localhost> wrote:
>> Fix committed with sys/kern/kern_rwlock.c rev 1.62.  I didn't see the
>> problem as I am running with LOCKDEBUG.
>> 
>> Apologies for the disruption.
> 
> FYI: powerpc/arm do not build anymore...

This should fix the powerpc problem:

Index: lock_stubs.S
===================================================================
RCS file: /cvsroot/src/sys/arch/powerpc/powerpc/lock_stubs.S,v
retrieving revision 1.10
diff -u -p -r1.10 lock_stubs.S
--- lock_stubs.S	28 Feb 2014 05:38:15 -0000	1.10
+++ lock_stubs.S	21 Jan 2020 04:09:26 -0000
@@ -101,8 +101,8 @@ ENTRY(mutex_exit)
 /*
  * void rw_enter(krwlock_t *krw, krw_t op);
  */
-#if RW_READ_INCR != 16
-#error RW_READ_INCR != 16, clrrXi need fixing
+#if RW_READ_INCR != 32
+#error RW_READ_INCR != 32, clrrXi need fixing
 #endif
 #if RW_OWNER != 0
 #error RW_OWNER != 0, ldptr should be ldptru
@@ -115,7 +115,7 @@ ENTRY(rw_enter)
 	bne-	1f
 
 	ldptr	%r9,RW_OWNER(%r3)
-	clrrptri %r9,%r9,4		/* clear low 4 bits */
+	clrrptri %r9,%r9,5		/* clear low 5 bits */
 	addi	%r7,%r9,RW_READ_INCR
 	b	2f
 1:
@@ -140,7 +140,7 @@ ENTRY(rw_tryenter)
 	bne-	1f
 
 	ldptr	%r9,RW_OWNER(%r3)
-	clrrptri %r9,%r9,4		/* clear low 4 bits */
+	clrrptri %r9,%r9,5		/* clear low 5 bits */
 	addi	%r7,%r9,RW_READ_INCR
 	b	2f
 
@@ -169,7 +169,7 @@ ENTRY(rw_exit)
 	andi.	%r0,%r9,RW_WRITE_LOCKED
 	bne-	1f
 
-	clrrptri. %r9,%r9,4		/* clear low 4 bits */
+	clrrptri. %r9,%r9,5		/* clear low 5 bits */
 	beq-	3f			/* if 0, no reader, go slow */
 
 	addi	%r7,%r9,-RW_READ_INCR

> 
> http://releng.netbsd.org/builds/HEAD/202001201020Z/
> 
> christos
> 

-- thorpej