lkml.org 
[lkml]   [2004]   [Aug]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] fix bug in sparc64 user copy patch

There were a few slight bugs in the UltraSPARC-I/II/IIi/IIe
parts of that patch I sent you, here is the fix.

===== arch/sparc64/lib/U1copy_from_user.S 1.1 vs edited =====
--- 1.1/arch/sparc64/lib/U1copy_from_user.S 2004-08-19 20:10:28 -07:00
+++ edited/arch/sparc64/lib/U1copy_from_user.S 2004-08-20 10:22:41 -07:00
@@ -20,4 +20,14 @@
#define LOAD_BLK(addr,dest) ldda [addr] ASI_BLK_AIUS, dest
#define EX_RETVAL(x) 0

+ /* Writing to %asi is _expensive_ so we hardcode it.
+ * Reading %asi to check for KERNEL_DS is comparatively
+ * cheap.
+ */
+#define PREAMBLE \
+ rd %asi, %g1; \
+ cmp %g1, ASI_AIUS; \
+ bne,pn %icc, memcpy_user_stub; \
+ nop; \
+
#include "U1memcpy.S"
===== arch/sparc64/lib/U1memcpy.S 1.1 vs edited =====
--- 1.1/arch/sparc64/lib/U1memcpy.S 2004-08-19 20:10:30 -07:00
+++ edited/arch/sparc64/lib/U1memcpy.S 2004-08-20 11:37:27 -07:00
@@ -193,6 +193,7 @@
and %g2, 7, %g2
andncc %g3, 0x7, %g3
fmovd %f0, %f2
+ sub %g3, 0x8, %g3
sub %o2, %o4, %o2

add %g1, %o4, %g1
@@ -444,7 +445,7 @@
2: membar #StoreLoad | #StoreStore
VISExit
retl
- mov %g5, %o0
+ mov EX_RETVAL(%g5), %o0

.align 64
70: /* 16 < len <= (5 * 64) */
@@ -539,7 +540,7 @@
add %o1, 4, %o1

85: retl
- mov %g5, %o0
+ mov EX_RETVAL(%g5), %o0

.align 32
90: EX_LD(LOAD(ldub, %o1, %g1))
@@ -548,4 +549,4 @@
bgu,pt %XCC, 90b
add %o1, 1, %o1
retl
- mov %g5, %o0
+ mov EX_RETVAL(%g5), %o0
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2005-03-22 14:05    [from the cache]
©2003-2011 Jasper Spaans