From 764207865abf1ca25fbab424a7b3e3dcb3a6ae97 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Sat, 21 Mar 2020 19:45:04 -0400 Subject: [PATCH] target/arm: Set ID_MMFR4.HPDS for aarch64_max_initfn We had set this for aarch32-only in arm_max_initfn, but failed to set the same bit for aarch64. Backports commit dac65ba1d7945c5d58ab63d8769103634adb2b01 from qemu --- qemu/target/arm/cpu64.c | 1 + 1 file changed, 1 insertion(+) diff --git a/qemu/target/arm/cpu64.c b/qemu/target/arm/cpu64.c index fb68681c..359ede7b 100644 --- a/qemu/target/arm/cpu64.c +++ b/qemu/target/arm/cpu64.c @@ -348,6 +348,7 @@ static void aarch64_max_initfn(struct uc_struct *uc, Object *obj, void *opaque) cpu->isar.id_mmfr3 = u; u = cpu->isar.id_mmfr4; + u = FIELD_DP32(u, ID_MMFR4, HPDS, 1); /* AA32HPD */ u = FIELD_DP32(u, ID_MMFR4, AC2, 1); /* ACTLR2, HACTLR2 */ cpu->isar.id_mmfr4 = u;