From 7f03b024d2607f2fb12f0b09ac975151db60f0fe Mon Sep 17 00:00:00 2001
From: Richard Henderson <richard.henderson@linaro.org>
Date: Tue, 22 Jan 2019 16:38:05 -0500
Subject: [PATCH] target/arm: Enable PAuth for -cpu max

Backports commit 1ce32e47db52e3511132c7104770eae65d412144 from qemu
---
 qemu/target/arm/cpu64.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/qemu/target/arm/cpu64.c b/qemu/target/arm/cpu64.c
index a35847a1..326fdb1a 100644
--- a/qemu/target/arm/cpu64.c
+++ b/qemu/target/arm/cpu64.c
@@ -261,6 +261,10 @@ static void aarch64_max_initfn(struct uc_struct *uc, Object *obj, void *opaque)
 
     t = cpu->isar.id_aa64isar1;
     t = FIELD_DP64(t, ID_AA64ISAR1, FCMA, 1);
+    t = FIELD_DP64(t, ID_AA64ISAR1, APA, 1); /* PAuth, architected only */
+    t = FIELD_DP64(t, ID_AA64ISAR1, API, 0);
+    t = FIELD_DP64(t, ID_AA64ISAR1, GPA, 1);
+    t = FIELD_DP64(t, ID_AA64ISAR1, GPI, 0);
     cpu->isar.id_aa64isar1 = t;
 
     t = cpu->isar.id_aa64pfr0;