Commit ab5eb336 authored by Max Filippov's avatar Max Filippov
Browse files

xtensa: move coprocessor_flush to the .text section 



coprocessor_flush is not a part of fast exception handlers, but it uses
parts of fast coprocessor handling code that's why it's in the same
source file. It uses call0 opcode to invoke those parts so there are no
limitations on their relative location, but the rest of the code calls
coprocessor_flush with call8 and that doesn't work when vectors are
placed in a different gigabyte-aligned area than the rest of the kernel.

Move coprocessor_flush from the .exception.text section to the .text so
that it's reachable from the rest of the kernel with call8.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
parent a38fd874

arch/xtensa/kernel/coprocessor.S

+33 −31
Original line number Diff line number Diff line
@@ -99,37 +99,6 @@ 
	LOAD_CP_REGS_TAB(6)

	LOAD_CP_REGS_TAB(7)



/*

 * coprocessor_flush(struct thread_info*, index)

 *                             a2        a3

 *

 * Save coprocessor registers for coprocessor 'index'.

 * The register values are saved to or loaded from the coprocessor area 

 * inside the task_info structure.

 *

 * Note that this function doesn't update the coprocessor_owner information!

 *

 */



ENTRY(coprocessor_flush)



	/* reserve 4 bytes on stack to save a0 */

	abi_entry(4)



	s32i	a0, a1, 0

	movi	a0, .Lsave_cp_regs_jump_table

	addx8	a3, a3, a0

	l32i	a4, a3, 4

	l32i	a3, a3, 0

	add	a2, a2, a4

	beqz	a3, 1f

	callx0	a3

1:	l32i	a0, a1, 0



	abi_ret(4)



ENDPROC(coprocessor_flush)



/*

 * Entry condition:

 *
@@ -245,6 +214,39 @@ ENTRY(fast_coprocessor) 


ENDPROC(fast_coprocessor)



	.text



/*

 * coprocessor_flush(struct thread_info*, index)

 *                             a2        a3

 *

 * Save coprocessor registers for coprocessor 'index'.

 * The register values are saved to or loaded from the coprocessor area

 * inside the task_info structure.

 *

 * Note that this function doesn't update the coprocessor_owner information!

 *

 */



ENTRY(coprocessor_flush)



	/* reserve 4 bytes on stack to save a0 */

	abi_entry(4)



	s32i	a0, a1, 0

	movi	a0, .Lsave_cp_regs_jump_table

	addx8	a3, a3, a0

	l32i	a4, a3, 4

	l32i	a3, a3, 0

	add	a2, a2, a4

	beqz	a3, 1f

	callx0	a3

1:	l32i	a0, a1, 0



	abi_ret(4)



ENDPROC(coprocessor_flush)



	.data



ENTRY(coprocessor_owner)