Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69f7cd47 authored by Aleksey Makarov's avatar Aleksey Makarov Committed by Ralf Baechle
Browse files

MIPS: OCTEON: Delete unused COP2 saving code 



Commit 2c952e06 ("MIPS: Move cop2 save/restore to switch_to()")
removes assembler code to store COP2 registers.  Commit
a36d8225 ("MIPS: OCTEON: Enable use of FPU") mistakenly
restores it

Fixes: a36d8225 ("MIPS: OCTEON: Enable use of FPU")
Signed-off-by: default avatarAleksey Makarov <aleksey.makarov@auriga.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Cc: David Daney <david.daney@cavium.com>
Patchwork: https://patchwork.linux-mips.org/patch/8937/


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

arch/mips/kernel/octeon_switch.S

+0 −26
Original line number Diff line number Diff line
@@ -52,32 +52,6 @@ 
	.set pop

1:



	/* check if we need to save COP2 registers */

	LONG_L	t0, ST_OFF(t3)

	bbit0	t0, 30, 1f



	/* Disable COP2 in the stored process state */

	li	t1, ST0_CU2

	xor	t0, t1

	LONG_S	t0, ST_OFF(t3)



	/* Enable COP2 so we can save it */

	mfc0	t0, CP0_STATUS

	or	t0, t1

	mtc0	t0, CP0_STATUS



	/* Save COP2 */

	daddu	a0, THREAD_CP2

	jal octeon_cop2_save

	dsubu	a0, THREAD_CP2



	/* Disable COP2 now that we are done */

	mfc0	t0, CP0_STATUS

	li	t1, ST0_CU2

	xor	t0, t1

	mtc0	t0, CP0_STATUS



1:

#if CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE > 0

	/* Check if we need to store CVMSEG state */

	dmfc0	t0, $11,7	/* CvmMemCtl */