0c39e725b0
To support CPU feature in AArch64, we need to move some field from ARMCPU to ARMISARegisters, add more definitions of ID fields, and add suport query-cpu-model-expansion qmp command. Let's backport upstream patches to do these. Signed-off-by: Peng Liang <liangpeng10@huawei.com>
58 lines
2.1 KiB
Diff
58 lines
2.1 KiB
Diff
From 69eedbfc873ded9bf35439b813e9f6a7431dc727 Mon Sep 17 00:00:00 2001
|
|
From: Richard Henderson <richard.henderson@linaro.org>
|
|
Date: Sat, 8 Feb 2020 12:58:12 +0000
|
|
Subject: [PATCH 09/13] target/arm: Enable ARMv8.2-ATS1E1 in -cpu max
|
|
|
|
This includes enablement of ARMv8.1-PAN.
|
|
|
|
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
|
|
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
|
|
Message-id: 20200208125816.14954-17-richard.henderson@linaro.org
|
|
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
|
---
|
|
target/arm/cpu.c | 4 ++++
|
|
target/arm/cpu64.c | 5 +++++
|
|
2 files changed, 9 insertions(+)
|
|
|
|
diff --git a/target/arm/cpu.c b/target/arm/cpu.c
|
|
index a23c71db..119bd275 100644
|
|
--- a/target/arm/cpu.c
|
|
+++ b/target/arm/cpu.c
|
|
@@ -2484,6 +2484,10 @@ static void arm_max_initfn(Object *obj)
|
|
t = FIELD_DP32(t, MVFR2, FPMISC, 4); /* FP MaxNum */
|
|
cpu->isar.mvfr2 = t;
|
|
|
|
+ t = cpu->id_mmfr3;
|
|
+ t = FIELD_DP32(t, ID_MMFR3, PAN, 2); /* ATS1E1 */
|
|
+ cpu->id_mmfr3 = t;
|
|
+
|
|
t = cpu->id_mmfr4;
|
|
t = FIELD_DP32(t, ID_MMFR4, HPDS, 1); /* AA32HPD */
|
|
cpu->id_mmfr4 = t;
|
|
diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c
|
|
index 7ad8b5e2..a0d07fd7 100644
|
|
--- a/target/arm/cpu64.c
|
|
+++ b/target/arm/cpu64.c
|
|
@@ -362,6 +362,7 @@ static void aarch64_max_initfn(Object *obj)
|
|
t = cpu->isar.id_aa64mmfr1;
|
|
t = FIELD_DP64(t, ID_AA64MMFR1, HPDS, 1); /* HPD */
|
|
t = FIELD_DP64(t, ID_AA64MMFR1, LO, 1);
|
|
+ t = FIELD_DP64(t, ID_AA64MMFR1, PAN, 2); /* ATS1E1 */
|
|
cpu->isar.id_aa64mmfr1 = t;
|
|
|
|
/* Replicate the same data to the 32-bit id registers. */
|
|
@@ -382,6 +383,10 @@ static void aarch64_max_initfn(Object *obj)
|
|
u = FIELD_DP32(u, ID_ISAR6, SPECRES, 1);
|
|
cpu->isar.id_isar6 = u;
|
|
|
|
+ u = cpu->id_mmfr3;
|
|
+ u = FIELD_DP32(u, ID_MMFR3, PAN, 2); /* ATS1E1 */
|
|
+ cpu->id_mmfr3 = u;
|
|
+
|
|
/*
|
|
* FIXME: We do not yet support ARMv8.2-fp16 for AArch32 yet,
|
|
* so do not set MVFR1.FPHP. Strictly speaking this is not legal,
|
|
--
|
|
2.25.1
|
|
|