diff options
| author | Ed Schouten <ed@FreeBSD.org> | 2017-11-26 14:28:27 +0000 |
|---|---|---|
| committer | Ed Schouten <ed@FreeBSD.org> | 2017-11-26 14:28:27 +0000 |
| commit | 7af24ff710c4638a3d8e83febcca54adb464da9f (patch) | |
| tree | d2060a0392b209a2015b584f45e48e48e95e29c8 /sys | |
| parent | 41c0f8d354aacc69c352dd05c201b1f213a0f422 (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arm64/arm64/exception.S | 6 | ||||
| -rw-r--r-- | sys/arm64/arm64/trap.c | 3 | ||||
| -rw-r--r-- | sys/arm64/include/armreg.h | 3 |
3 files changed, 7 insertions, 5 deletions
diff --git a/sys/arm64/arm64/exception.S b/sys/arm64/arm64/exception.S index 515d3fe3b3686..4be51750ffecd 100644 --- a/sys/arm64/arm64/exception.S +++ b/sys/arm64/arm64/exception.S @@ -219,8 +219,8 @@ exception_vectors: vempty /* FIQ 64-bit EL0 */ vector el0_error /* Error 64-bit EL0 */ - vempty /* Synchronous 32-bit EL0 */ - vempty /* IRQ 32-bit EL0 */ + vector el0_sync /* Synchronous 32-bit EL0 */ + vector el0_irq /* IRQ 32-bit EL0 */ vempty /* FIQ 32-bit EL0 */ - vempty /* Error 32-bit EL0 */ + vector el0_error /* Error 32-bit EL0 */ diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c index 3d81cebf5edd0..b706f97852cf5 100644 --- a/sys/arm64/arm64/trap.c +++ b/sys/arm64/arm64/trap.c @@ -381,7 +381,8 @@ do_el0_sync(struct thread *td, struct trapframe *frame) panic("VFP exception in userland"); #endif break; - case EXCP_SVC: + case EXCP_SVC32: + case EXCP_SVC64: svc_handler(td, frame); break; case EXCP_INSN_ABORT_L: diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index cf24fadf16239..b3580de6a8fcd 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -123,7 +123,8 @@ #define EXCP_UNKNOWN 0x00 /* Unkwn exception */ #define EXCP_FP_SIMD 0x07 /* VFP/SIMD trap */ #define EXCP_ILL_STATE 0x0e /* Illegal execution state */ -#define EXCP_SVC 0x15 /* SVC trap */ +#define EXCP_SVC32 0x11 /* SVC trap for AArch32 */ +#define EXCP_SVC64 0x15 /* SVC trap for AArch64 */ #define EXCP_MSR 0x18 /* MSR/MRS trap */ #define EXCP_INSN_ABORT_L 0x20 /* Instruction abort, from lower EL */ #define EXCP_INSN_ABORT 0x21 /* Instruction abort, from same EL */ |