diff mbox series

[U-Boot,v1,3/3] ARMv8: SError exception handling in PSCI exception vectors

Message ID 1534787856-18530-4-git-send-email-chee.hong.ang@intel.com
State Accepted
Commit eb13dddd2c0cf7e02f3cc52f783af332a64a63d2
Delegated to: Tom Rini
Headers show
Series Enable all asynchronous abort exceptions taken to EL3 | expand

Commit Message

Ang, Chee Hong Aug. 20, 2018, 5:57 p.m. UTC 
From: Chee Hong Ang <chee.hong.ang@intel.com>

Allow platform vendors to handle SError interrupt exceptions from
ARMv8 PSCI exception vectors by overriding this weak function
'plat_error_handler'.

Signed-off-by: Chee Hong Ang <chee.hong.ang@intel.com>
---
 arch/arm/cpu/armv8/psci.S | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

Comments

Tom Rini Nov. 17, 2018, 1:26 p.m. UTC | #1 
On Mon, Aug 20, 2018 at 10:57:36AM -0700, chee.hong.ang@intel.com wrote:

> From: Chee Hong Ang <chee.hong.ang@intel.com>
> 
> Allow platform vendors to handle SError interrupt exceptions from
> ARMv8 PSCI exception vectors by overriding this weak function
> 'plat_error_handler'.
> 
> Signed-off-by: Chee Hong Ang <chee.hong.ang@intel.com>

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/arch/arm/cpu/armv8/psci.S b/arch/arm/cpu/armv8/psci.S
index 097f91b..358df8f 100644
--- a/arch/arm/cpu/armv8/psci.S
+++ b/arch/arm/cpu/armv8/psci.S
@@ -236,6 +236,28 @@  handle_sync:
 
 	b	unhandled_exception
 
+#ifdef CONFIG_ARMV8_EA_EL3_FIRST
+/*
+ * Override this function if custom error handling is
+ * needed for asynchronous aborts
+ */
+ENTRY(plat_error_handler)
+	ret
+ENDPROC(plat_error_handler)
+.weak plat_error_handler
+
+handle_error:
+	bl	psci_get_cpu_id
+	bl	psci_get_cpu_stack_top
+	mov	x9, #1
+	msr	spsel, x9
+	mov	sp, x0
+
+	bl	plat_error_handler	/* Platform specific error handling */
+deadloop:
+	b	deadloop		/* Never return */
+#endif
+
 	.align	11
 	.globl	el3_exception_vectors
 el3_exception_vectors:
@@ -261,7 +283,11 @@  el3_exception_vectors:
 	.align	7
 	b	unhandled_exception	/* FIQ, Lower EL using AArch64 */
 	.align	7
+#ifdef CONFIG_ARMV8_EA_EL3_FIRST
+	b	handle_error		/* SError, Lower EL using AArch64 */
+#else
 	b	unhandled_exception	/* SError, Lower EL using AArch64 */
+#endif
 	.align	7
 	b	unhandled_exception	/* Sync, Lower EL using AArch32 */
 	.align	7