Commit 49d7c655 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc 

Pull sparc fix from David Miller:
 "FPU register corruption bug fix"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc64: Fix userspace FPU register corruptions.
parents 8664b90b 44922150

arch/sparc/include/asm/visasm.h

+5 −11
Original line number Diff line number Diff line
@@ -28,16 +28,10 @@ 
 * Must preserve %o5 between VISEntryHalf and VISExitHalf */



#define VISEntryHalf					\

	rd		%fprs, %o5;			\

	andcc		%o5, FPRS_FEF, %g0;		\

	be,pt		%icc, 297f;			\

	 sethi		%hi(298f), %g7;			\

	sethi		%hi(VISenterhalf), %g1;		\

	jmpl		%g1 + %lo(VISenterhalf), %g0;	\

	 or		%g7, %lo(298f), %g7;		\

	clr		%o5;				\

297:	wr		%o5, FPRS_FEF, %fprs;		\

298:

	VISEntry



#define VISExitHalf					\

	VISExit



#define VISEntryHalfFast(fail_label)			\

	rd		%fprs, %o5;			\
@@ -47,7 +41,7 @@ 
	ba,a,pt		%xcc, fail_label;		\

297:	wr		%o5, FPRS_FEF, %fprs;



#define VISExitHalf					\

#define VISExitHalfFast					\

	wr		%o5, 0, %fprs;



#ifndef __ASSEMBLY__

arch/sparc/lib/NG4memcpy.S

+4 −1
Original line number Diff line number Diff line
@@ -240,8 +240,11 @@ FUNC_NAME: /* %o0=dst, %o1=src, %o2=len */ 
	add		%o0, 0x40, %o0

	bne,pt		%icc, 1b

	 LOAD(prefetch, %g1 + 0x200, #n_reads_strong)

#ifdef NON_USER_COPY

	VISExitHalfFast

#else

	VISExitHalf



#endif

	brz,pn		%o2, .Lexit

	 cmp		%o2, 19

	ble,pn		%icc, .Lsmall_unaligned

arch/sparc/lib/VISsave.S

+2 −65
Original line number Diff line number Diff line
@@ -44,8 +44,7 @@ vis1: ldub [%g6 + TI_FPSAVED], %g3 


	 stx		%g3, [%g6 + TI_GSR]

2:	add		%g6, %g1, %g3

	cmp		%o5, FPRS_DU

	be,pn		%icc, 6f

	mov		FPRS_DU | FPRS_DL | FPRS_FEF, %o5

	sll		%g1, 3, %g1

	stb		%o5, [%g3 + TI_FPSAVED]

	rd		%gsr, %g2
@@ -80,65 +79,3 @@ vis1: ldub [%g6 + TI_FPSAVED], %g3 
	.align		32

80:	jmpl		%g7 + %g0, %g0

	 nop
 


6:	ldub		[%g3 + TI_FPSAVED], %o5

	or		%o5, FPRS_DU, %o5

	add		%g6, TI_FPREGS+0x80, %g2

	stb		%o5, [%g3 + TI_FPSAVED]



	sll		%g1, 5, %g1

	add		%g6, TI_FPREGS+0xc0, %g3

	wr		%g0, FPRS_FEF, %fprs

	membar		#Sync

	stda		%f32, [%g2 + %g1] ASI_BLK_P

	stda		%f48, [%g3 + %g1] ASI_BLK_P

	membar		#Sync

	ba,pt		%xcc, 80f

	 nop



	.align		32

80:	jmpl		%g7 + %g0, %g0

	 nop



	.align		32

VISenterhalf:

	ldub		[%g6 + TI_FPDEPTH], %g1

	brnz,a,pn	%g1, 1f

	 cmp		%g1, 1

	stb		%g0, [%g6 + TI_FPSAVED]

	stx		%fsr, [%g6 + TI_XFSR]

	clr		%o5

	jmpl		%g7 + %g0, %g0

	 wr		%g0, FPRS_FEF, %fprs



1:	bne,pn		%icc, 2f

	 srl		%g1, 1, %g1

	ba,pt		%xcc, vis1

	 sub		%g7, 8, %g7

2:	addcc		%g6, %g1, %g3

	sll		%g1, 3, %g1

	andn		%o5, FPRS_DU, %g2

	stb		%g2, [%g3 + TI_FPSAVED]



	rd		%gsr, %g2

	add		%g6, %g1, %g3

	stx		%g2, [%g3 + TI_GSR]

	add		%g6, %g1, %g2

	stx		%fsr, [%g2 + TI_XFSR]

	sll		%g1, 5, %g1

3:	andcc		%o5, FPRS_DL, %g0

	be,pn		%icc, 4f

	 add		%g6, TI_FPREGS, %g2



	add		%g6, TI_FPREGS+0x40, %g3

	membar		#Sync

	stda		%f0, [%g2 + %g1] ASI_BLK_P

	stda		%f16, [%g3 + %g1] ASI_BLK_P

	membar		#Sync

	ba,pt		%xcc, 4f

	 nop



	.align		32

4:	and		%o5, FPRS_DU, %o5

	jmpl		%g7 + %g0, %g0

	 wr		%o5, FPRS_FEF, %fprs

arch/sparc/lib/ksyms.c

+0 −4
Original line number Diff line number Diff line
@@ -135,10 +135,6 @@ EXPORT_SYMBOL(copy_user_page); 
void VISenter(void);

EXPORT_SYMBOL(VISenter);



/* CRYPTO code needs this */

void VISenterhalf(void);

EXPORT_SYMBOL(VISenterhalf);



extern void xor_vis_2(unsigned long, unsigned long *, unsigned long *);

extern void xor_vis_3(unsigned long, unsigned long *, unsigned long *,

		unsigned long *);