Commit 466aec5f authored by James Hogan's avatar James Hogan Committed by Ralf Baechle
Browse files

Revert "MIPS: Don't assume 64-bit FP registers for context switch" 



This reverts commit 02987633.

The basic premise of the patch was incorrect since MSA context
(including FP state) is saved using st.d which stores two consecutive
64-bit words in memory rather than a single 128-bit word. This means
that even with big endian MSA, the FP state is still in the first 64-bit
word.

Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
Signed-off-by: default avatarPaul Burton <paul.burton@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/9168/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 84ab45b3

arch/mips/include/asm/asmmacro-32.h

+64 −64
Original line number Diff line number Diff line
@@ -16,38 +16,38 @@ 
	.set push

	SET_HARDFLOAT

	cfc1	\tmp,  fcr31

	swc1	$f0,  THREAD_FPR0_LS64(\thread)

	swc1	$f1,  THREAD_FPR1_LS64(\thread)

	swc1	$f2,  THREAD_FPR2_LS64(\thread)

	swc1	$f3,  THREAD_FPR3_LS64(\thread)

	swc1	$f4,  THREAD_FPR4_LS64(\thread)

	swc1	$f5,  THREAD_FPR5_LS64(\thread)

	swc1	$f6,  THREAD_FPR6_LS64(\thread)

	swc1	$f7,  THREAD_FPR7_LS64(\thread)

	swc1	$f8,  THREAD_FPR8_LS64(\thread)

	swc1	$f9,  THREAD_FPR9_LS64(\thread)

	swc1	$f10, THREAD_FPR10_LS64(\thread)

	swc1	$f11, THREAD_FPR11_LS64(\thread)

	swc1	$f12, THREAD_FPR12_LS64(\thread)

	swc1	$f13, THREAD_FPR13_LS64(\thread)

	swc1	$f14, THREAD_FPR14_LS64(\thread)

	swc1	$f15, THREAD_FPR15_LS64(\thread)

	swc1	$f16, THREAD_FPR16_LS64(\thread)

	swc1	$f17, THREAD_FPR17_LS64(\thread)

	swc1	$f18, THREAD_FPR18_LS64(\thread)

	swc1	$f19, THREAD_FPR19_LS64(\thread)

	swc1	$f20, THREAD_FPR20_LS64(\thread)

	swc1	$f21, THREAD_FPR21_LS64(\thread)

	swc1	$f22, THREAD_FPR22_LS64(\thread)

	swc1	$f23, THREAD_FPR23_LS64(\thread)

	swc1	$f24, THREAD_FPR24_LS64(\thread)

	swc1	$f25, THREAD_FPR25_LS64(\thread)

	swc1	$f26, THREAD_FPR26_LS64(\thread)

	swc1	$f27, THREAD_FPR27_LS64(\thread)

	swc1	$f28, THREAD_FPR28_LS64(\thread)

	swc1	$f29, THREAD_FPR29_LS64(\thread)

	swc1	$f30, THREAD_FPR30_LS64(\thread)

	swc1	$f31, THREAD_FPR31_LS64(\thread)

	swc1	$f0,  THREAD_FPR0(\thread)

	swc1	$f1,  THREAD_FPR1(\thread)

	swc1	$f2,  THREAD_FPR2(\thread)

	swc1	$f3,  THREAD_FPR3(\thread)

	swc1	$f4,  THREAD_FPR4(\thread)

	swc1	$f5,  THREAD_FPR5(\thread)

	swc1	$f6,  THREAD_FPR6(\thread)

	swc1	$f7,  THREAD_FPR7(\thread)

	swc1	$f8,  THREAD_FPR8(\thread)

	swc1	$f9,  THREAD_FPR9(\thread)

	swc1	$f10, THREAD_FPR10(\thread)

	swc1	$f11, THREAD_FPR11(\thread)

	swc1	$f12, THREAD_FPR12(\thread)

	swc1	$f13, THREAD_FPR13(\thread)

	swc1	$f14, THREAD_FPR14(\thread)

	swc1	$f15, THREAD_FPR15(\thread)

	swc1	$f16, THREAD_FPR16(\thread)

	swc1	$f17, THREAD_FPR17(\thread)

	swc1	$f18, THREAD_FPR18(\thread)

	swc1	$f19, THREAD_FPR19(\thread)

	swc1	$f20, THREAD_FPR20(\thread)

	swc1	$f21, THREAD_FPR21(\thread)

	swc1	$f22, THREAD_FPR22(\thread)

	swc1	$f23, THREAD_FPR23(\thread)

	swc1	$f24, THREAD_FPR24(\thread)

	swc1	$f25, THREAD_FPR25(\thread)

	swc1	$f26, THREAD_FPR26(\thread)

	swc1	$f27, THREAD_FPR27(\thread)

	swc1	$f28, THREAD_FPR28(\thread)

	swc1	$f29, THREAD_FPR29(\thread)

	swc1	$f30, THREAD_FPR30(\thread)

	swc1	$f31, THREAD_FPR31(\thread)

	sw	\tmp, THREAD_FCR31(\thread)

	.set pop

	.endm
@@ -56,38 +56,38 @@ 
	.set push

	SET_HARDFLOAT

	lw	\tmp, THREAD_FCR31(\thread)

	lwc1	$f0,  THREAD_FPR0_LS64(\thread)

	lwc1	$f1,  THREAD_FPR1_LS64(\thread)

	lwc1	$f2,  THREAD_FPR2_LS64(\thread)

	lwc1	$f3,  THREAD_FPR3_LS64(\thread)

	lwc1	$f4,  THREAD_FPR4_LS64(\thread)

	lwc1	$f5,  THREAD_FPR5_LS64(\thread)

	lwc1	$f6,  THREAD_FPR6_LS64(\thread)

	lwc1	$f7,  THREAD_FPR7_LS64(\thread)

	lwc1	$f8,  THREAD_FPR8_LS64(\thread)

	lwc1	$f9,  THREAD_FPR9_LS64(\thread)

	lwc1	$f10, THREAD_FPR10_LS64(\thread)

	lwc1	$f11, THREAD_FPR11_LS64(\thread)

	lwc1	$f12, THREAD_FPR12_LS64(\thread)

	lwc1	$f13, THREAD_FPR13_LS64(\thread)

	lwc1	$f14, THREAD_FPR14_LS64(\thread)

	lwc1	$f15, THREAD_FPR15_LS64(\thread)

	lwc1	$f16, THREAD_FPR16_LS64(\thread)

	lwc1	$f17, THREAD_FPR17_LS64(\thread)

	lwc1	$f18, THREAD_FPR18_LS64(\thread)

	lwc1	$f19, THREAD_FPR19_LS64(\thread)

	lwc1	$f20, THREAD_FPR20_LS64(\thread)

	lwc1	$f21, THREAD_FPR21_LS64(\thread)

	lwc1	$f22, THREAD_FPR22_LS64(\thread)

	lwc1	$f23, THREAD_FPR23_LS64(\thread)

	lwc1	$f24, THREAD_FPR24_LS64(\thread)

	lwc1	$f25, THREAD_FPR25_LS64(\thread)

	lwc1	$f26, THREAD_FPR26_LS64(\thread)

	lwc1	$f27, THREAD_FPR27_LS64(\thread)

	lwc1	$f28, THREAD_FPR28_LS64(\thread)

	lwc1	$f29, THREAD_FPR29_LS64(\thread)

	lwc1	$f30, THREAD_FPR30_LS64(\thread)

	lwc1	$f31, THREAD_FPR31_LS64(\thread)

	lwc1	$f0,  THREAD_FPR0(\thread)

	lwc1	$f1,  THREAD_FPR1(\thread)

	lwc1	$f2,  THREAD_FPR2(\thread)

	lwc1	$f3,  THREAD_FPR3(\thread)

	lwc1	$f4,  THREAD_FPR4(\thread)

	lwc1	$f5,  THREAD_FPR5(\thread)

	lwc1	$f6,  THREAD_FPR6(\thread)

	lwc1	$f7,  THREAD_FPR7(\thread)

	lwc1	$f8,  THREAD_FPR8(\thread)

	lwc1	$f9,  THREAD_FPR9(\thread)

	lwc1	$f10, THREAD_FPR10(\thread)

	lwc1	$f11, THREAD_FPR11(\thread)

	lwc1	$f12, THREAD_FPR12(\thread)

	lwc1	$f13, THREAD_FPR13(\thread)

	lwc1	$f14, THREAD_FPR14(\thread)

	lwc1	$f15, THREAD_FPR15(\thread)

	lwc1	$f16, THREAD_FPR16(\thread)

	lwc1	$f17, THREAD_FPR17(\thread)

	lwc1	$f18, THREAD_FPR18(\thread)

	lwc1	$f19, THREAD_FPR19(\thread)

	lwc1	$f20, THREAD_FPR20(\thread)

	lwc1	$f21, THREAD_FPR21(\thread)

	lwc1	$f22, THREAD_FPR22(\thread)

	lwc1	$f23, THREAD_FPR23(\thread)

	lwc1	$f24, THREAD_FPR24(\thread)

	lwc1	$f25, THREAD_FPR25(\thread)

	lwc1	$f26, THREAD_FPR26(\thread)

	lwc1	$f27, THREAD_FPR27(\thread)

	lwc1	$f28, THREAD_FPR28(\thread)

	lwc1	$f29, THREAD_FPR29(\thread)

	lwc1	$f30, THREAD_FPR30(\thread)

	lwc1	$f31, THREAD_FPR31(\thread)

	ctc1	\tmp, fcr31

	.set pop

	.endm

arch/mips/include/asm/asmmacro.h

+64 −64
Original line number Diff line number Diff line
@@ -60,22 +60,22 @@ 
	.set	push

	SET_HARDFLOAT

	cfc1	\tmp, fcr31

	sdc1	$f0,  THREAD_FPR0_LS64(\thread)

	sdc1	$f2,  THREAD_FPR2_LS64(\thread)

	sdc1	$f4,  THREAD_FPR4_LS64(\thread)

	sdc1	$f6,  THREAD_FPR6_LS64(\thread)

	sdc1	$f8,  THREAD_FPR8_LS64(\thread)

	sdc1	$f10, THREAD_FPR10_LS64(\thread)

	sdc1	$f12, THREAD_FPR12_LS64(\thread)

	sdc1	$f14, THREAD_FPR14_LS64(\thread)

	sdc1	$f16, THREAD_FPR16_LS64(\thread)

	sdc1	$f18, THREAD_FPR18_LS64(\thread)

	sdc1	$f20, THREAD_FPR20_LS64(\thread)

	sdc1	$f22, THREAD_FPR22_LS64(\thread)

	sdc1	$f24, THREAD_FPR24_LS64(\thread)

	sdc1	$f26, THREAD_FPR26_LS64(\thread)

	sdc1	$f28, THREAD_FPR28_LS64(\thread)

	sdc1	$f30, THREAD_FPR30_LS64(\thread)

	sdc1	$f0,  THREAD_FPR0(\thread)

	sdc1	$f2,  THREAD_FPR2(\thread)

	sdc1	$f4,  THREAD_FPR4(\thread)

	sdc1	$f6,  THREAD_FPR6(\thread)

	sdc1	$f8,  THREAD_FPR8(\thread)

	sdc1	$f10, THREAD_FPR10(\thread)

	sdc1	$f12, THREAD_FPR12(\thread)

	sdc1	$f14, THREAD_FPR14(\thread)

	sdc1	$f16, THREAD_FPR16(\thread)

	sdc1	$f18, THREAD_FPR18(\thread)

	sdc1	$f20, THREAD_FPR20(\thread)

	sdc1	$f22, THREAD_FPR22(\thread)

	sdc1	$f24, THREAD_FPR24(\thread)

	sdc1	$f26, THREAD_FPR26(\thread)

	sdc1	$f28, THREAD_FPR28(\thread)

	sdc1	$f30, THREAD_FPR30(\thread)

	sw	\tmp, THREAD_FCR31(\thread)

	.set	pop

	.endm
@@ -84,22 +84,22 @@ 
	.set	push

	.set	mips64r2

	SET_HARDFLOAT

	sdc1	$f1,  THREAD_FPR1_LS64(\thread)

	sdc1	$f3,  THREAD_FPR3_LS64(\thread)

	sdc1	$f5,  THREAD_FPR5_LS64(\thread)

	sdc1	$f7,  THREAD_FPR7_LS64(\thread)

	sdc1	$f9,  THREAD_FPR9_LS64(\thread)

	sdc1	$f11, THREAD_FPR11_LS64(\thread)

	sdc1	$f13, THREAD_FPR13_LS64(\thread)

	sdc1	$f15, THREAD_FPR15_LS64(\thread)

	sdc1	$f17, THREAD_FPR17_LS64(\thread)

	sdc1	$f19, THREAD_FPR19_LS64(\thread)

	sdc1	$f21, THREAD_FPR21_LS64(\thread)

	sdc1	$f23, THREAD_FPR23_LS64(\thread)

	sdc1	$f25, THREAD_FPR25_LS64(\thread)

	sdc1	$f27, THREAD_FPR27_LS64(\thread)

	sdc1	$f29, THREAD_FPR29_LS64(\thread)

	sdc1	$f31, THREAD_FPR31_LS64(\thread)

	sdc1	$f1,  THREAD_FPR1(\thread)

	sdc1	$f3,  THREAD_FPR3(\thread)

	sdc1	$f5,  THREAD_FPR5(\thread)

	sdc1	$f7,  THREAD_FPR7(\thread)

	sdc1	$f9,  THREAD_FPR9(\thread)

	sdc1	$f11, THREAD_FPR11(\thread)

	sdc1	$f13, THREAD_FPR13(\thread)

	sdc1	$f15, THREAD_FPR15(\thread)

	sdc1	$f17, THREAD_FPR17(\thread)

	sdc1	$f19, THREAD_FPR19(\thread)

	sdc1	$f21, THREAD_FPR21(\thread)

	sdc1	$f23, THREAD_FPR23(\thread)

	sdc1	$f25, THREAD_FPR25(\thread)

	sdc1	$f27, THREAD_FPR27(\thread)

	sdc1	$f29, THREAD_FPR29(\thread)

	sdc1	$f31, THREAD_FPR31(\thread)

	.set	pop

	.endm
@@ -118,22 +118,22 @@ 
	.set	push

	SET_HARDFLOAT

	lw	\tmp, THREAD_FCR31(\thread)

	ldc1	$f0,  THREAD_FPR0_LS64(\thread)

	ldc1	$f2,  THREAD_FPR2_LS64(\thread)

	ldc1	$f4,  THREAD_FPR4_LS64(\thread)

	ldc1	$f6,  THREAD_FPR6_LS64(\thread)

	ldc1	$f8,  THREAD_FPR8_LS64(\thread)

	ldc1	$f10, THREAD_FPR10_LS64(\thread)

	ldc1	$f12, THREAD_FPR12_LS64(\thread)

	ldc1	$f14, THREAD_FPR14_LS64(\thread)

	ldc1	$f16, THREAD_FPR16_LS64(\thread)

	ldc1	$f18, THREAD_FPR18_LS64(\thread)

	ldc1	$f20, THREAD_FPR20_LS64(\thread)

	ldc1	$f22, THREAD_FPR22_LS64(\thread)

	ldc1	$f24, THREAD_FPR24_LS64(\thread)

	ldc1	$f26, THREAD_FPR26_LS64(\thread)

	ldc1	$f28, THREAD_FPR28_LS64(\thread)

	ldc1	$f30, THREAD_FPR30_LS64(\thread)

	ldc1	$f0,  THREAD_FPR0(\thread)

	ldc1	$f2,  THREAD_FPR2(\thread)

	ldc1	$f4,  THREAD_FPR4(\thread)

	ldc1	$f6,  THREAD_FPR6(\thread)

	ldc1	$f8,  THREAD_FPR8(\thread)

	ldc1	$f10, THREAD_FPR10(\thread)

	ldc1	$f12, THREAD_FPR12(\thread)

	ldc1	$f14, THREAD_FPR14(\thread)

	ldc1	$f16, THREAD_FPR16(\thread)

	ldc1	$f18, THREAD_FPR18(\thread)

	ldc1	$f20, THREAD_FPR20(\thread)

	ldc1	$f22, THREAD_FPR22(\thread)

	ldc1	$f24, THREAD_FPR24(\thread)

	ldc1	$f26, THREAD_FPR26(\thread)

	ldc1	$f28, THREAD_FPR28(\thread)

	ldc1	$f30, THREAD_FPR30(\thread)

	ctc1	\tmp, fcr31

	.endm
@@ -141,22 +141,22 @@ 
	.set	push

	.set	mips64r2

	SET_HARDFLOAT

	ldc1	$f1,  THREAD_FPR1_LS64(\thread)

	ldc1	$f3,  THREAD_FPR3_LS64(\thread)

	ldc1	$f5,  THREAD_FPR5_LS64(\thread)

	ldc1	$f7,  THREAD_FPR7_LS64(\thread)

	ldc1	$f9,  THREAD_FPR9_LS64(\thread)

	ldc1	$f11, THREAD_FPR11_LS64(\thread)

	ldc1	$f13, THREAD_FPR13_LS64(\thread)

	ldc1	$f15, THREAD_FPR15_LS64(\thread)

	ldc1	$f17, THREAD_FPR17_LS64(\thread)

	ldc1	$f19, THREAD_FPR19_LS64(\thread)

	ldc1	$f21, THREAD_FPR21_LS64(\thread)

	ldc1	$f23, THREAD_FPR23_LS64(\thread)

	ldc1	$f25, THREAD_FPR25_LS64(\thread)

	ldc1	$f27, THREAD_FPR27_LS64(\thread)

	ldc1	$f29, THREAD_FPR29_LS64(\thread)

	ldc1	$f31, THREAD_FPR31_LS64(\thread)

	ldc1	$f1,  THREAD_FPR1(\thread)

	ldc1	$f3,  THREAD_FPR3(\thread)

	ldc1	$f5,  THREAD_FPR5(\thread)

	ldc1	$f7,  THREAD_FPR7(\thread)

	ldc1	$f9,  THREAD_FPR9(\thread)

	ldc1	$f11, THREAD_FPR11(\thread)

	ldc1	$f13, THREAD_FPR13(\thread)

	ldc1	$f15, THREAD_FPR15(\thread)

	ldc1	$f17, THREAD_FPR17(\thread)

	ldc1	$f19, THREAD_FPR19(\thread)

	ldc1	$f21, THREAD_FPR21(\thread)

	ldc1	$f23, THREAD_FPR23(\thread)

	ldc1	$f25, THREAD_FPR25(\thread)

	ldc1	$f27, THREAD_FPR27(\thread)

	ldc1	$f29, THREAD_FPR29(\thread)

	ldc1	$f31, THREAD_FPR31(\thread)

	.set	pop

	.endm

arch/mips/kernel/asm-offsets.c

+0 −66
Original line number Diff line number Diff line
@@ -167,72 +167,6 @@ void output_thread_fpu_defines(void) 
	OFFSET(THREAD_FPR30, task_struct, thread.fpu.fpr[30]);

	OFFSET(THREAD_FPR31, task_struct, thread.fpu.fpr[31]);



	/* the least significant 64 bits of each FP register */

	OFFSET(THREAD_FPR0_LS64, task_struct,

	       thread.fpu.fpr[0].val64[FPR_IDX(64, 0)]);

	OFFSET(THREAD_FPR1_LS64, task_struct,

	       thread.fpu.fpr[1].val64[FPR_IDX(64, 0)]);

	OFFSET(THREAD_FPR2_LS64, task_struct,

	       thread.fpu.fpr[2].val64[FPR_IDX(64, 0)]);

	OFFSET(THREAD_FPR3_LS64, task_struct,

	       thread.fpu.fpr[3].val64[FPR_IDX(64, 0)]);

	OFFSET(THREAD_FPR4_LS64, task_struct,

	       thread.fpu.fpr[4].val64[FPR_IDX(64, 0)]);

	OFFSET(THREAD_FPR5_LS64, task_struct,

	       thread.fpu.fpr[5].val64[FPR_IDX(64, 0)]);

	OFFSET(THREAD_FPR6_LS64, task_struct,

	       thread.fpu.fpr[6].val64[FPR_IDX(64, 0)]);

	OFFSET(THREAD_FPR7_LS64, task_struct,

	       thread.fpu.fpr[7].val64[FPR_IDX(64, 0)]);

	OFFSET(THREAD_FPR8_LS64, task_struct,

	       thread.fpu.fpr[8].val64[FPR_IDX(64, 0)]);

	OFFSET(THREAD_FPR9_LS64, task_struct,

	       thread.fpu.fpr[9].val64[FPR_IDX(64, 0)]);

	OFFSET(THREAD_FPR10_LS64, task_struct,

	       thread.fpu.fpr[10].val64[FPR_IDX(64, 0)]);

	OFFSET(THREAD_FPR11_LS64, task_struct,

	       thread.fpu.fpr[11].val64[FPR_IDX(64, 0)]);

	OFFSET(THREAD_FPR12_LS64, task_struct,

	       thread.fpu.fpr[12].val64[FPR_IDX(64, 0)]);

	OFFSET(THREAD_FPR13_LS64, task_struct,

	       thread.fpu.fpr[13].val64[FPR_IDX(64, 0)]);

	OFFSET(THREAD_FPR14_LS64, task_struct,

	       thread.fpu.fpr[14].val64[FPR_IDX(64, 0)]);

	OFFSET(THREAD_FPR15_LS64, task_struct,

	       thread.fpu.fpr[15].val64[FPR_IDX(64, 0)]);

	OFFSET(THREAD_FPR16_LS64, task_struct,

	       thread.fpu.fpr[16].val64[FPR_IDX(64, 0)]);

	OFFSET(THREAD_FPR17_LS64, task_struct,

	       thread.fpu.fpr[17].val64[FPR_IDX(64, 0)]);

	OFFSET(THREAD_FPR18_LS64, task_struct,

	       thread.fpu.fpr[18].val64[FPR_IDX(64, 0)]);

	OFFSET(THREAD_FPR19_LS64, task_struct,

	       thread.fpu.fpr[19].val64[FPR_IDX(64, 0)]);

	OFFSET(THREAD_FPR20_LS64, task_struct,

	       thread.fpu.fpr[20].val64[FPR_IDX(64, 0)]);

	OFFSET(THREAD_FPR21_LS64, task_struct,

	       thread.fpu.fpr[21].val64[FPR_IDX(64, 0)]);

	OFFSET(THREAD_FPR22_LS64, task_struct,

	       thread.fpu.fpr[22].val64[FPR_IDX(64, 0)]);

	OFFSET(THREAD_FPR23_LS64, task_struct,

	       thread.fpu.fpr[23].val64[FPR_IDX(64, 0)]);

	OFFSET(THREAD_FPR24_LS64, task_struct,

	       thread.fpu.fpr[24].val64[FPR_IDX(64, 0)]);

	OFFSET(THREAD_FPR25_LS64, task_struct,

	       thread.fpu.fpr[25].val64[FPR_IDX(64, 0)]);

	OFFSET(THREAD_FPR26_LS64, task_struct,

	       thread.fpu.fpr[26].val64[FPR_IDX(64, 0)]);

	OFFSET(THREAD_FPR27_LS64, task_struct,

	       thread.fpu.fpr[27].val64[FPR_IDX(64, 0)]);

	OFFSET(THREAD_FPR28_LS64, task_struct,

	       thread.fpu.fpr[28].val64[FPR_IDX(64, 0)]);

	OFFSET(THREAD_FPR29_LS64, task_struct,

	       thread.fpu.fpr[29].val64[FPR_IDX(64, 0)]);

	OFFSET(THREAD_FPR30_LS64, task_struct,

	       thread.fpu.fpr[30].val64[FPR_IDX(64, 0)]);

	OFFSET(THREAD_FPR31_LS64, task_struct,

	       thread.fpu.fpr[31].val64[FPR_IDX(64, 0)]);



	OFFSET(THREAD_FCR31, task_struct, thread.fpu.fcr31);

	OFFSET(THREAD_MSA_CSR, task_struct, thread.fpu.msacsr);

	BLANK();

CRA Git | Maintained and supported by SUSTech CRA and CCSE