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

Commit 8f261a64 authored by Will Deacon's avatar Will Deacon Committed by Channagoud Kadabi
Browse files

UPSTREAM: arm64: entry: Explicitly pass exception level to kernel_ventry macro 



We will need to treat exceptions from EL0 differently in kernel_ventry,
so rework the macro to take the exception level as an argument and
construct the branch target using that.

Reviewed-by: default avatarMark Rutland <mark.rutland@arm.com>
Tested-by: default avatarLaura Abbott <labbott@redhat.com>
Tested-by: default avatarShanker Donthineni <shankerd@codeaurora.org>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
(cherry picked from commit 5b1f7fe41909cde40decad9f0e8ee585777a0538)

[toddpoynor@google.com: fixup context, error -> error_invalid]
Change-Id: I5dfbce460f7617e33298a1ece09159572d55fb3a
Signed-off-by: default avatarTodd Poynor <toddpoynor@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Git-commit: 8fdbffb1
Git-repo: https://android.googlesource.com/kernel/common/


Signed-off-by: default avatarChannagoud Kadabi <ckadabi@codeaurora.org>
parent 153c648a

arch/arm64/kernel/entry.S

+22 −22
Original line number Diff line number Diff line
@@ -71,10 +71,10 @@ 
#define BAD_FIQ		2

#define BAD_ERROR	3



	.macro kernel_ventry	label

	.macro kernel_ventry, el, label, regsize = 64

	.align 7

	sub	sp, sp, #S_FRAME_SIZE

	b	\label

	b	el\()\el\()_\label

	.endm



	.macro	kernel_entry, el, regsize = 64
@@ -322,31 +322,31 @@ tsk .req x28 // current thread_info 


	.align	11

ENTRY(vectors)

	kernel_ventry	el1_sync_invalid		// Synchronous EL1t

	kernel_ventry	el1_irq_invalid			// IRQ EL1t

	kernel_ventry	el1_fiq_invalid			// FIQ EL1t

	kernel_ventry	el1_error_invalid		// Error EL1t

	kernel_ventry	1, sync_invalid			// Synchronous EL1t

	kernel_ventry	1, irq_invalid			// IRQ EL1t

	kernel_ventry	1, fiq_invalid			// FIQ EL1t

	kernel_ventry	1, error_invalid		// Error EL1t



	kernel_ventry	el1_sync			// Synchronous EL1h

	kernel_ventry	el1_irq				// IRQ EL1h

	kernel_ventry	el1_fiq_invalid			// FIQ EL1h

	kernel_ventry	el1_error_invalid		// Error EL1h

	kernel_ventry	1, sync				// Synchronous EL1h

	kernel_ventry	1, irq				// IRQ EL1h

	kernel_ventry	1, fiq_invalid			// FIQ EL1h

	kernel_ventry	1, error_invalid		// Error EL1h



	kernel_ventry	el0_sync			// Synchronous 64-bit EL0

	kernel_ventry	el0_irq				// IRQ 64-bit EL0

	kernel_ventry	el0_fiq_invalid			// FIQ 64-bit EL0

	kernel_ventry	el0_error_invalid		// Error 64-bit EL0

	kernel_ventry	0, sync				// Synchronous 64-bit EL0

	kernel_ventry	0, irq				// IRQ 64-bit EL0

	kernel_ventry	0, fiq_invalid			// FIQ 64-bit EL0

	kernel_ventry	0, error_invalid		// Error 64-bit EL0



#ifdef CONFIG_COMPAT

	kernel_ventry	el0_sync_compat			// Synchronous 32-bit EL0

	kernel_ventry	el0_irq_compat			// IRQ 32-bit EL0

	kernel_ventry	el0_fiq_invalid_compat		// FIQ 32-bit EL0

	kernel_ventry	el0_error_invalid_compat	// Error 32-bit EL0

	kernel_ventry	0, sync_compat, 32		// Synchronous 32-bit EL0

	kernel_ventry	0, irq_compat, 32		// IRQ 32-bit EL0

	kernel_ventry	0, fiq_invalid_compat, 32	// FIQ 32-bit EL0

	kernel_ventry	0, error_invalid_compat, 32	// Error 32-bit EL0

#else

	kernel_ventry	el0_sync_invalid		// Synchronous 32-bit EL0

	kernel_ventry	el0_irq_invalid			// IRQ 32-bit EL0

	kernel_ventry	el0_fiq_invalid			// FIQ 32-bit EL0

	kernel_ventry	el0_error_invalid		// Error 32-bit EL0

	kernel_ventry	0, sync_invalid, 32		// Synchronous 32-bit EL0

	kernel_ventry	0, irq_invalid, 32		// IRQ 32-bit EL0

	kernel_ventry	0, fiq_invalid, 32		// FIQ 32-bit EL0

	kernel_ventry	0, error_invalid, 32		// Error 32-bit EL0

#endif

END(vectors)