Merge with Linux 2.1.131 and more MIPS goodies.

(Did I mention that CVS is buggy ...)

2 files changed, 74 insertions, 28 deletions

diff --git a/arch/ppc/lib/locks.c b/arch/ppc/lib/locks.c
index 0bb06f808..073e7076c 100644
--- a/arch/ppc/lib/locks.c
+++ b/arch/ppc/lib/locks.c
@@ -1,5 +1,5 @@
 /*
- * $Id: locks.c,v 1.18 1998/07/28 03:50:27 cort Exp $
+ * $Id: locks.c,v 1.20 1998/10/08 01:17:32 cort Exp $
  *
  * Locks for smp ppc 
  * 
@@ -18,13 +18,13 @@
 #define DEBUG_LOCKS 1
 
 #undef INIT_STUCK
-#define INIT_STUCK 10000
+#define INIT_STUCK 0xffffffff
 
 void _spin_lock(spinlock_t *lock)
 {
 	int cpu = smp_processor_id();
 #ifdef DEBUG_LOCKS
-	int stuck = INIT_STUCK;
+	unsigned int stuck = INIT_STUCK;
 #endif /* DEBUG_LOCKS */
 	/* try expensive atomic load/store to get lock */
 	while((unsigned long )xchg_u32((void *)&lock->lock,0xffffffff)) {
@@ -67,13 +67,13 @@ int spin_trylock(spinlock_t *lock)
 void _spin_unlock(spinlock_t *lp)
 {
 #ifdef DEBUG_LOCKS
-	if ( !lp->lock )
-		panic("_spin_unlock(%p): no lock cpu %d %s/%d\n", lp,
-		       smp_processor_id(),current->comm,current->pid);
+  	if ( !lp->lock )
+		printk("_spin_unlock(%p): no lock cpu %d %s/%d\n", lp,
+		      smp_processor_id(),current->comm,current->pid);
 	if ( lp->owner_cpu != smp_processor_id() )
-		panic("_spin_unlock(%p): cpu %d trying clear of cpu %d pc %lx val %lx\n",
-		       lp, smp_processor_id(), (int)lp->owner_cpu,
-		       lp->owner_pc,lp->lock);
+		printk("_spin_unlock(%p): cpu %d trying clear of cpu %d pc %lx val %lx\n",
+		      lp, smp_processor_id(), (int)lp->owner_cpu,
+		      lp->owner_pc,lp->lock);
 #endif /* DEBUG_LOCKS */
 	lp->owner_pc = lp->owner_cpu = 0;
 	eieio();
diff --git a/arch/ppc/lib/string.S b/arch/ppc/lib/string.S
index cc59aaa81..2ff171ee3 100644
--- a/arch/ppc/lib/string.S
+++ b/arch/ppc/lib/string.S
@@ -219,12 +219,12 @@ memchr:
 
 	.globl	__copy_tofrom_user
 __copy_tofrom_user:
-	rlwinm.	r7,r5,32-3,3,31		/* r0 = r5 >> 3 */
+	srwi.	r7,r5,3
 	addi	r6,r3,-4
 	addi	r4,r4,-4
-	li	r3,0			/* success return value */
-	beq	2f			/* if less than 8 bytes to do */
-	andi.	r0,r6,3			/* get dest word aligned */
+	li	r3,0		/* success return value */
+	beq	2f		/* if less than 8 bytes to do */
+	andi.	r0,r6,3		/* get dest word aligned */
 	mtctr	r7
 	bne	5f
 1:	lwz	r7,4(r4)
@@ -238,7 +238,7 @@ __copy_tofrom_user:
 14:	lwzu	r0,4(r4)
 	addi	r5,r5,-4
 15:	stwu	r0,4(r6)
-3:	cmpwi	0,r5,0
+3:	cmpwi	0,r5,0		/* do 1 byte at a time for the remainder */
 	beqlr
 	mtctr	r5
 	addi	r4,r4,3
@@ -247,32 +247,78 @@ __copy_tofrom_user:
 16:	stbu	r0,1(r6)
 	bdnz	4b
 	blr
-5:	subfic	r0,r0,4
-	mtctr	r0
+5:	subfic	r0,r0,4		/* copy bytes until we have the */
+	mtctr	r0		/* destination 4-byte aligned */
+	subf	r5,r0,r5
 6:	lbz	r7,4(r4)
 	addi	r4,r4,1
 17:	stb	r7,4(r6)
 	addi	r6,r6,1
 	bdnz	6b
-	subf	r5,r0,r5
-	rlwinm.	r7,r5,32-3,3,31
+	srwi.	r7,r5,3
 	beq	2b
 	mtctr	r7
 	b	1b
-99:	li	r3,-EFAULT
+/* we come here on a fault in the 8-byte-at-a-time loop */
+88:	subi	r4,r4,8		/* compensate for the lwzu */
+98:	mfctr	r0
+	rlwimi	r5,r0,3,0,28	/* use the byte-at-a-time loop to */
+	b	3b		/* copy up to the byte at fault */
+/* here on a write fault in the single-word copy */
+96:	subi	r4,r4,4
+	b	3b
+/* here on a read fault in the initial single-byte copy */
+90:	mfctr	r3
+	add	r3,r3,r5
+	b	70f
+/* here on a read fault in the final single-byte copy */
+99:	mfctr	r3
+	subi	r6,r6,3
+/* clear out the rest of the destination: r3 bytes starting at 4(r6) */
+70:	li	r0,0
+	mr.	r5,r3
+	beq	76f
+71:	andi.	r4,r6,3
+	beq	72f
+77:	stb	r0,4(r6)
+	addi	r6,r6,1
+	addic.	r5,r5,-1
+	bne	71b
+72:	srwi.	r7,r5,2
+	beq	73f
+	mtctr	r7
+74:	stwu	r0,4(r6)
+	bdnz	74b
+73:	andi.	r5,r5,3
+	beq	76f
+	mtctr	r5
+	addi	r6,r6,3
+75:	stbu	r0,1(r6)
+	bdnz	75b
+76:	blr
+/* here on a write fault in the initial single-byte copy */
+80:	mfctr	r3
+	add	r3,r3,r5
 	blr
+/* here on a write fault in the final single-byte copy */
+81:	mfctr	r3
+	blr
+
 .section __ex_table,"a"
 	.align	2
-	.long	1b,99b
-	.long	11b,99b
-	.long	12b,99b
-	.long	13b,99b
-	.long	14b,99b
-	.long	15b,99b
+	.long	1b,98b
+	.long	11b,98b
+	.long	12b,88b
+	.long	13b,88b
+	.long	14b,3b
+	.long	15b,96b
 	.long	4b,99b
-	.long	16b,99b
-	.long	6b,99b
-	.long	17b,99b
+	.long	16b,81b
+	.long	6b,90b
+	.long	17b,80b
+	.long	77b,76b
+	.long	74b,76b
+	.long	75b,76b
 .text
 
 #undef CLEAR_USE_DCBZ 1