75 lines
2.6 KiB
Diff
75 lines
2.6 KiB
Diff
From ec35c96006851a956a7e401f29af0ffe137c4bb9 Mon Sep 17 00:00:00 2001
|
|
From: Jiadong Zeng <zengjiadong@phytium.com.cn>
|
|
Date: Tue, 8 Feb 2022 22:56:37 +0800
|
|
Subject: [PATCH] add Phytium's CPU models: FT-2000+ and Tengyun-S2500.
|
|
|
|
Signed-off-by: Jiadong Zeng <zengjiadong@phytium.com.cn>
|
|
Signed-off-by: Mingwang Li <limingwang@huawei.com>
|
|
---
|
|
hw/arm/virt.c | 2 ++
|
|
target/arm/cpu64.c | 28 ++++++++++++++++++++++++++++
|
|
2 files changed, 30 insertions(+)
|
|
|
|
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
|
|
index a4a35584e9..3c972fdab0 100644
|
|
--- a/hw/arm/virt.c
|
|
+++ b/hw/arm/virt.c
|
|
@@ -202,6 +202,8 @@ static const char *valid_cpus[] = {
|
|
ARM_CPU_TYPE_NAME("cortex-a57"),
|
|
ARM_CPU_TYPE_NAME("cortex-a72"),
|
|
ARM_CPU_TYPE_NAME("Kunpeng-920"),
|
|
+ ARM_CPU_TYPE_NAME("FT-2000+"),
|
|
+ ARM_CPU_TYPE_NAME("Tengyun-S2500"),
|
|
ARM_CPU_TYPE_NAME("a64fx"),
|
|
ARM_CPU_TYPE_NAME("host"),
|
|
ARM_CPU_TYPE_NAME("max"),
|
|
diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c
|
|
index 556b6f3691..08d886de7b 100644
|
|
--- a/target/arm/cpu64.c
|
|
+++ b/target/arm/cpu64.c
|
|
@@ -676,6 +676,32 @@ static Property arm_cpu_pauth_property =
|
|
static Property arm_cpu_pauth_impdef_property =
|
|
DEFINE_PROP_BOOL("pauth-impdef", ARMCPU, prop_pauth_impdef, false);
|
|
|
|
+static void aarch64_max_ft2000plus_initfn(Object *obj)
|
|
+{
|
|
+ ARMCPU *cpu = ARM_CPU(obj);
|
|
+
|
|
+ if (kvm_enabled()) {
|
|
+ kvm_arm_set_cpu_features_from_host(cpu);
|
|
+ kvm_arm_add_vcpu_properties(obj);
|
|
+ } else {
|
|
+ aarch64_a72_initfn(obj);
|
|
+ cpu->midr = 0x70186622;
|
|
+ }
|
|
+}
|
|
+
|
|
+static void aarch64_max_tengyun_s2500_initfn(Object *obj)
|
|
+{
|
|
+ ARMCPU *cpu = ARM_CPU(obj);
|
|
+
|
|
+ if (kvm_enabled()) {
|
|
+ kvm_arm_set_cpu_features_from_host(cpu);
|
|
+ kvm_arm_add_vcpu_properties(obj);
|
|
+ } else {
|
|
+ aarch64_a72_initfn(obj);
|
|
+ cpu->midr = 0x70186632;
|
|
+ }
|
|
+}
|
|
+
|
|
/* -cpu max: if KVM is enabled, like -cpu host (best possible with this host);
|
|
* otherwise, a CPU with as many features enabled as our emulation supports.
|
|
* The version of '-cpu max' for qemu-system-arm is defined in cpu.c;
|
|
@@ -914,6 +940,8 @@ static const ARMCPUInfo aarch64_cpus[] = {
|
|
{ .name = "cortex-a53", .initfn = aarch64_a53_initfn },
|
|
{ .name = "cortex-a72", .initfn = aarch64_a72_initfn },
|
|
{ .name = "Kunpeng-920", .initfn = aarch64_kunpeng_920_initfn},
|
|
+ { .name = "FT-2000+", .initfn = aarch64_max_ft2000plus_initfn },
|
|
+ { .name = "Tengyun-S2500", .initfn = aarch64_max_tengyun_s2500_initfn },
|
|
{ .name = "a64fx", .initfn = aarch64_a64fx_initfn },
|
|
{ .name = "max", .initfn = aarch64_max_initfn },
|
|
};
|
|
--
|
|
2.27.0
|
|
|