From 038a03aa348481acdc5f8a918ec117a5d176118e Mon Sep 17 00:00:00 2001
From: Mikhail Krichanov <mikhailkrichanov@gmail.com>
Date: Wed, 29 May 2024 14:55:26 +0300
Subject: [PATCH] SysCall/AARCH64: Increased probability of QEMU's normal work.

---
 MdeModulePkg/Core/Dxe/SysCall/AARCH64/CoreBootServices.S | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/MdeModulePkg/Core/Dxe/SysCall/AARCH64/CoreBootServices.S b/MdeModulePkg/Core/Dxe/SysCall/AARCH64/CoreBootServices.S
index 7c56d717f8..068db95b1d 100644
--- a/MdeModulePkg/Core/Dxe/SysCall/AARCH64/CoreBootServices.S
+++ b/MdeModulePkg/Core/Dxe/SysCall/AARCH64/CoreBootServices.S
@@ -107,6 +107,9 @@ ASM_FUNC(ArmCallRing3)
 ASM_FUNC(ReturnToCore)
   // Zero Exception Syndrome Register to prevent QEMU from random crashing.
   msr  esr_el1, xzr
+  msr  spsr_el1, xzr
+  msr  elr_el1, xzr
+  msr  far_el1, xzr
   // Switch to Core Stack.
   mov  sp, x1
   // Restore Stack.