From 8ebab06c4824626ab4d7204133cd1e7b9c67f468 Mon Sep 17 00:00:00 2001

From: Xu Yandong <xuyandong2@huawei.com>

Date: Tue, 8 Feb 2022 21:36:22 +0800

Subject: [PATCH] cpu: add Kunpeng-920 cpu support

Add the Kunpeng-920 CPU model

Signed-off-by: Xu Yandong <xuyandong2@huawei.com>

Signed-off-by: Mingwang Li <limingwang@huawei.com>

---

 hw/arm/virt.c      |  1 +

 target/arm/cpu64.c | 21 +++++++++++++++++++++

 2 files changed, 22 insertions(+)

diff --git a/hw/arm/virt.c b/hw/arm/virt.c

index 30da05dfe0..a4a35584e9 100644

--- a/hw/arm/virt.c

+++ b/hw/arm/virt.c

@@ -201,6 +201,7 @@ static const char *valid_cpus[] = {

     ARM_CPU_TYPE_NAME("cortex-a53"),

     ARM_CPU_TYPE_NAME("cortex-a57"),

     ARM_CPU_TYPE_NAME("cortex-a72"),

+    ARM_CPU_TYPE_NAME("Kunpeng-920"),

     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 019edc66c9..aaca79f7c3 100644

--- a/target/arm/cpu64.c

+++ b/target/arm/cpu64.c

@@ -248,6 +248,26 @@ static void aarch64_a72_initfn(Object *obj)

     define_arm_cp_regs(cpu, cortex_a72_a57_a53_cp_reginfo);

 }

+static void aarch64_kunpeng_920_initfn(Object *obj)

+{

+    ARMCPU *cpu = ARM_CPU(obj);

+

+    /*

+     * Hisilicon Kunpeng-920 CPU is similar to cortex-a72,

+     * so first initialize cpu data as cortex-a72,

+     * and then update the special register.

+     */

+    aarch64_a72_initfn(obj);

+

+    cpu->midr = 0x480fd010;

+    cpu->ctr = 0x84448004;

+    cpu->isar.id_aa64pfr0 = 0x11001111;

+    cpu->isar.id_aa64dfr0 = 0x110305408;

+    cpu->isar.id_aa64isar0 = 0x10211120;

+    cpu->isar.id_aa64mmfr0 = 0x101125;

+    cpu->kvm_target = KVM_ARM_TARGET_GENERIC_V8;

+}

+

 void arm_cpu_sve_finalize(ARMCPU *cpu, Error **errp)

 {

     /*

@@ -892,6 +912,7 @@ static const ARMCPUInfo aarch64_cpus[] = {

     { .name = "cortex-a57",         .initfn = aarch64_a57_initfn },

     { .name = "cortex-a53",         .initfn = aarch64_a53_initfn },

     { .name = "cortex-a72",         .initfn = aarch64_a72_initfn },

+    { .name = "Kunpeng-920",        .initfn = aarch64_kunpeng_920_initfn},

     { .name = "a64fx",              .initfn = aarch64_a64fx_initfn },

     { .name = "max",                .initfn = aarch64_max_initfn },

 };

-- 

2.27.0