MIRRORS/linux-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/linux-imx.git synced 2025-07-14 21:29:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "FROMLIST: KVM: arm64: nVHE: Add EL2h sync exception handler"

Browse Source 
Revert submission 3081516

Reason for revert: Cherry-picking corresponding FROMGIT commit

Reverted changes: /q/submissionid:3081516

Change-Id: I8b74b691aee25746c82bd31bd154c2bd002bf015
Signed-off-by: Pierre-Clément Tosi <ptosi@google.com>
This commit is contained in:
Pierre-Clément Tosi 2024-06-28 20:03:34 +00:00 committed by Will Deacon
parent ff1e4507cd
commit 5f4a702e41
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/arm64/kvm/hyp/nvhe/host.S
View File

@ -183,7 +183,7 @@ SYM_FUNC_END(__host_hvc)
.endif .endif
.endm .endm
.macro __host_el2_vect handler:req .macro invalid_host_el2_vect
.align 7 .align 7
/* /*
@ -203,7 +203,7 @@ SYM_FUNC_END(__host_hvc)
* been partially clobbered by __host_enter. * been partially clobbered by __host_enter.
*/ */
stp x0, x1, [sp, #-16]! stp x0, x1, [sp, #-16]!
b \handler b __hyp_panic
.L__hyp_sp_overflow\@: .L__hyp_sp_overflow\@:
/* Switch to the overflow stack */ /* Switch to the overflow stack */
@ -213,10 +213,6 @@ SYM_FUNC_END(__host_hvc)
ASM_BUG() ASM_BUG()
.endm .endm
.macro host_el2_sync_vect
__host_el2_vect __hyp_panic
.endm
.macro invalid_host_el1_vect .macro invalid_host_el1_vect
.align 7 .align 7
mov x0, xzr /* restore_host = false */ mov x0, xzr /* restore_host = false */
@ -226,10 +222,6 @@ SYM_FUNC_END(__host_hvc)
b __hyp_do_panic b __hyp_do_panic
.endm .endm
.macro invalid_host_el2_vect
__host_el2_vect __hyp_panic
.endm
/* /*
* The host vector does not use an ESB instruction in order to avoid consuming * The host vector does not use an ESB instruction in order to avoid consuming
* SErrors that should only be consumed by the host. Guest entry is deferred by * SErrors that should only be consumed by the host. Guest entry is deferred by
@ -247,7 +239,7 @@ SYM_CODE_START(__kvm_hyp_host_vector)
invalid_host_el2_vect // FIQ EL2t invalid_host_el2_vect // FIQ EL2t
invalid_host_el2_vect // Error EL2t invalid_host_el2_vect // Error EL2t
host_el2_sync_vect // Synchronous EL2h invalid_host_el2_vect // Synchronous EL2h
invalid_host_el2_vect // IRQ EL2h invalid_host_el2_vect // IRQ EL2h
invalid_host_el2_vect // FIQ EL2h invalid_host_el2_vect // FIQ EL2h
invalid_host_el2_vect // Error EL2h invalid_host_el2_vect // Error EL2h