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

Commit f80dff9d authored by Dan Williams's avatar Dan Williams Committed by Russell King
Browse files

[ARM] 4185/2: entry: introduce get_irqnr_preamble and arch_ret_to_user 



get_irqnr_preamble allows machines to take some action before entering the
get_irqnr_and_base loop.  On iop we enable cp6 access.

arch_ret_to_user is added to the userspace return path to allow individual
architectures to take actions, like disabling coprocessor access, before
the final return to userspace.

Per Nicolas Pitre's note, there is no need to cp_wait on the return to user
as the latency to return is sufficient.

Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 588ef769

arch/arm/kernel/entry-armv.S

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
 * Interrupt handling.  Preserves r7, r8, r9

 */

	.macro	irq_handler

	get_irqnr_preamble r5, lr

1:	get_irqnr_and_base r0, r6, r5, lr

	movne	r1, sp

	@

arch/arm/kernel/entry-common.S

+7 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 */



#include <asm/unistd.h>

#include <asm/arch/entry-macro.S>



#include "entry-header.S"
@@ -25,6 +26,9 @@ ret_fast_syscall: 
	tst	r1, #_TIF_WORK_MASK

	bne	fast_work_pending



	/* perform architecture specific actions before user return */

	arch_ret_to_user r1, lr



	@ fast_restore_user_regs

	ldr	r1, [sp, #S_OFF + S_PSR]	@ get calling cpsr

	ldr	lr, [sp, #S_OFF + S_PC]!	@ get pc
@@ -61,6 +65,9 @@ ret_slow_syscall: 
	tst	r1, #_TIF_WORK_MASK

	bne	work_pending

no_work_pending:

	/* perform architecture specific actions before user return */

	arch_ret_to_user r1, lr



	@ slow_restore_user_regs

	ldr	r1, [sp, #S_PSR]		@ get calling cpsr

	ldr	lr, [sp, #S_PC]!		@ get pc

include/asm-arm/arch-aaec2000/entry-macro.S

+6 −0
Original line number Diff line number Diff line
@@ -15,6 +15,12 @@ 
		.macro	disable_fiq

		.endm



		.macro  get_irqnr_preamble, base, tmp

		.endm



		.macro  arch_ret_to_user, tmp1, tmp2

		.endm



		.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp

		mov	r4, #0xf8000000

		add	r4, r4, #0x00000500

include/asm-arm/arch-at91rm9200/entry-macro.S

+6 −0
Original line number Diff line number Diff line
@@ -16,6 +16,12 @@ 
	.macro	disable_fiq

	.endm



	.macro  get_irqnr_preamble, base, tmp

	.endm



	.macro  arch_ret_to_user, tmp1, tmp2

	.endm



	.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp

	ldr	\base, =(AT91_VA_BASE_SYS)		@ base virtual address of SYS peripherals

	ldr	\irqnr, [\base, #AT91_AIC_IVR]		@ read IRQ vector register: de-asserts nIRQ to processor (and clears interrupt)

include/asm-arm/arch-cl7500/entry-macro.S

+5 −0
Original line number Diff line number Diff line 
#include <asm/hardware.h>

#include <asm/hardware/entry-macro-iomd.S>

	.macro  get_irqnr_preamble, base, tmp

	.endm



	.macro  arch_ret_to_user, tmp1, tmp2

	.endm