[qemu-xen staging] hw/arm/boot: Fix PAUTH for EL3 direct kernel boot

[patchbot@xxxxxxx]

commit 24ac0d309ab379cd0347f198c2db5b2b48b02887
Author:     Richard Henderson <richard.henderson@xxxxxxxxxx>
AuthorDate: Mon Jul 27 16:12:10 2020 +0100
Commit:     Peter Maydell <peter.maydell@xxxxxxxxxx>
CommitDate: Mon Jul 27 16:12:10 2020 +0100

    hw/arm/boot: Fix PAUTH for EL3 direct kernel boot
    
    When booting an EL3 cpu with -kernel, we set up EL3 and then
    drop down to EL2.  We need to enable access to v8.3-PAuth
    keys and instructions at EL3 before doing so.
    
    Signed-off-by: Richard Henderson <richard.henderson@xxxxxxxxxx>
    Message-id: 20200724163853.504655-2-richard.henderson@xxxxxxxxxx
    Reviewed-by: Peter Maydell <peter.maydell@xxxxxxxxxx>
    Signed-off-by: Peter Maydell <peter.maydell@xxxxxxxxxx>
---
 hw/arm/boot.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index fef4072db1..c44fd3382d 100644
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -736,6 +736,9 @@ static void do_cpu_reset(void *opaque)
                     } else {
                         env->pstate = PSTATE_MODE_EL1h;
                     }
+                    if (cpu_isar_feature(aa64_pauth, cpu)) {
+                        env->cp15.scr_el3 |= SCR_API | SCR_APK;
+                    }
                     /* AArch64 kernels never boot in secure mode */
                     assert(!info->secure_boot);
                     /* This hook is only supported for AArch32 currently:
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#staging