[xen stable-4.20] xen/arm: mask debug exceptions in initial AArch64 guest state

[patchbot@xxxxxxx]

commit 75f866e9f7656f2c2da71c9412bc5d08e0591ae8
Author:     Mykola Kvach <mykola_kvach@xxxxxxxx>
AuthorDate: Fri Jun 19 20:37:38 2026 +0200
Commit:     Michal Orzel <michal.orzel@xxxxxxx>
CommitDate: Mon Sep 21 14:00:01 2026 +0200

    xen/arm: mask debug exceptions in initial AArch64 guest state
    
    PSR_GUEST64_INIT currently masks SError, IRQ and FIQ, but leaves debug
    exceptions unmasked. Both the AArch64 Linux boot protocol and PSCI entry
    requirements expect PSTATE.DAIF to be masked.
    
    Add PSR_DBG_MASK to PSR_GUEST64_INIT. This fixes the initial AArch64 guest
    entry state as well as virtual PSCI CPU_ON and SYSTEM_SUSPEND resume entry.
    
    Signed-off-by: Mykola Kvach <mykola_kvach@xxxxxxxx>
    Reviewed-by: Julien Grall <julien@xxxxxxx>
    (cherry picked from commit ad8663a75aa8db4255d6690bfc210d559edc9f5b)
---
 xen/include/public/arch-arm.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h
index e2412a1747..d41100dcb0 100644
--- a/xen/include/public/arch-arm.h
+++ b/xen/include/public/arch-arm.h
@@ -408,7 +408,8 @@ typedef uint64_t xen_callback_t;
  * zImage kernels on aarch32.
  */
 #define PSR_GUEST32_INIT 
(PSR_Z|PSR_ABT_MASK|PSR_FIQ_MASK|PSR_IRQ_MASK|PSR_MODE_SVC)
-#define PSR_GUEST64_INIT (PSR_ABT_MASK|PSR_FIQ_MASK|PSR_IRQ_MASK|PSR_MODE_EL1h)
+#define PSR_GUEST64_INIT \
+    (PSR_DBG_MASK|PSR_ABT_MASK|PSR_FIQ_MASK|PSR_IRQ_MASK|PSR_MODE_EL1h)
 
 #define SCTLR_GUEST_INIT    xen_mk_ullong(0x00c50078)
 
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.20