Skip to content

Commit

Permalink
MIPS: OCTEON: Delete unused COP2 saving code
Browse files Browse the repository at this point in the history
Commit 2c952e0 ("MIPS: Move cop2 save/restore to switch_to()")
removes assembler code to store COP2 registers.  Commit
a36d822 ("MIPS: OCTEON: Enable use of FPU") mistakenly
restores it

Fixes: a36d822 ("MIPS: OCTEON: Enable use of FPU")
Signed-off-by: Aleksey 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: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
Aleksey Makarov authored and Ralf Baechle committed Feb 20, 2015
1 parent 2d98cae commit 69f7cd4
Showing 1 changed file with 0 additions and 26 deletions.
26 changes: 0 additions & 26 deletions arch/mips/kernel/octeon_switch.S
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit 69f7cd4

Please sign in to comment.