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

xtensa: move _SimulateUserKernelVectorException out of WindowVectors 



In configurations without window registers support the section
.WindowVectors.text may never be linked.
_SimulateUserKernelVectorException is a common handler for high priority
interrupts, it does not belong in that section anyway. Move it out of
that section and mark it as __XTENSA_HANDLER so it gets bundled with
other vector helpers.

Signed-off-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
parent 519d8195

arch/xtensa/kernel/vectors.S

+19 −21
Original line number Diff line number Diff line
@@ -650,6 +650,25 @@ ENTRY(_Level\level\()InterruptVector) 
	irq_entry_level 5

	irq_entry_level 6



#if XCHAL_EXCM_LEVEL >= 2

	/*

	 *  Continuation of medium priority interrupt dispatch code.

	 *  On entry here, a0 contains PS, and EPC2 contains saved a0:

	 */

	__XTENSA_HANDLER

	.align 4

_SimulateUserKernelVectorException:

	addi	a0, a0, (1 << PS_EXCM_BIT)

#if !XTENSA_FAKE_NMI

	wsr	a0, ps

#endif

	bbsi.l	a0, PS_UM_BIT, 1f	# branch if user mode

	xsr	a0, excsave2		# restore a0

	j	_KernelExceptionVector	# simulate kernel vector exception

1:	xsr	a0, excsave2		# restore a0

	j	_UserExceptionVector	# simulate user vector exception

#endif





/* Window overflow and underflow handlers.

 * The handlers must be 64 bytes apart, first starting with the underflow
@@ -680,27 +699,6 @@ ENTRY_ALIGN64(_WindowOverflow4) 


ENDPROC(_WindowOverflow4)





#if XCHAL_EXCM_LEVEL >= 2

	/*  Not a window vector - but a convenient location

	 *  (where we know there's space) for continuation of

	 *  medium priority interrupt dispatch code.

	 *  On entry here, a0 contains PS, and EPC2 contains saved a0:

	 */

	.align 4

_SimulateUserKernelVectorException:

	addi	a0, a0, (1 << PS_EXCM_BIT)

#if !XTENSA_FAKE_NMI

	wsr	a0, ps

#endif

	bbsi.l	a0, PS_UM_BIT, 1f	# branch if user mode

	xsr	a0, excsave2		# restore a0

	j	_KernelExceptionVector	# simulate kernel vector exception

1:	xsr	a0, excsave2		# restore a0

	j	_UserExceptionVector	# simulate user vector exception

#endif





/* 4-Register Window Underflow Vector (Handler) */



ENTRY_ALIGN64(_WindowUnderflow4)