From nobody Wed May 7 10:32:53 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1652098875; cv=none;
d=zohomail.com; s=zohoarc;
b=ErnMJyFDtpUfaS+RHzjVkKSvJxzlTNRpVOVsAUpSMNFDtIpKUsivCDkqU+sKR2Q4oZjjFcw9wyt0HrCP/DEqmk6ZT4inRFBisBUCPXanNwzq1AV4UBbUk4LW1NuBvVwe9v73alvHwNNlx+pg+KN1mwabFkOjkLcjzYXeJ2IFaCk=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1652098875;
h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
bh=gvIVM7y/OILbDxrcgpLmhBrY6fNb+2S83OGiai4zK8Y=;
b=cbs0BgpNENdGoGHBM5QBCZLVSvqavvvPn3LP0NDTjDN5wSwZXDhoZpF8ye1uBbfEuk+bidACB1d81TQE/E+zN+jxxP0xn5yuvoKkk/N+NfrZz3Mj7+uf33O41JUocXCWwKbHEGWhj87XA+ND+z1RHRh+ahwpFcFv86CbsnQ+xfY=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<peter.maydell@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1652098875055136.3094417759463;
Mon, 9 May 2022 05:21:15 -0700 (PDT)
Received: from localhost ([::1]:36174 helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1no2O2-000554-1Y
for importer@patchew.org; Mon, 09 May 2022 08:21:14 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:50068)
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)
id 1no22k-0007s3-0H
for qemu-devel@nongnu.org; Mon, 09 May 2022 07:59:14 -0400
Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:35730)
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)
id 1no22i-0001LM-6z
for qemu-devel@nongnu.org; Mon, 09 May 2022 07:59:13 -0400
Received: by mail-wm1-x32a.google.com with SMTP id
c190-20020a1c35c7000000b0038e37907b5bso10651166wma.0
for <qemu-devel@nongnu.org>; Mon, 09 May 2022 04:59:11 -0700 (PDT)
Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2])
by smtp.gmail.com with ESMTPSA id
bs6-20020a056000070600b0020c5253d8bdsm12199928wrb.9.2022.05.09.04.59.09
for <qemu-devel@nongnu.org>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 09 May 2022 04:59:10 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;
h=from:to:subject:date:message-id:in-reply-to:references:mime-version
:content-transfer-encoding;
bh=gvIVM7y/OILbDxrcgpLmhBrY6fNb+2S83OGiai4zK8Y=;
b=cQxqmszrPWVCDJHnwbatVfI0y2Qmm/lUY58pI6TPOGFe/PY6d3MM8uQD6snuorfyzk
r1eQJHYblAIKi/wgStgRzkHmqpiFl4QZeQ7WcXLs/HLX3mO1PUlbkuctZIT6W9gqJN+D
Pi8eZvCG0gxQc/d6qrF9YKw0B9cAMKnNtSfBFaaFvYLoYhgJdqaFEvurXqKWZpyd4/HT
WVNMXOs3HhWvasYNNO3tlKvi5S2FuERzsrb+mAh5AJMbzzr9G6Swrv2RDT/3U5jeJHOT
RqMDM9v9SzRc5qTYhz2kC+tcHaA+cn3+zjVZujTgeIKOHqVKSCF7ZKzeV8gMI4PiqUsl
fKMQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20210112;
h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=gvIVM7y/OILbDxrcgpLmhBrY6fNb+2S83OGiai4zK8Y=;
b=OiyqMhgX4JV5TRJkKuzRnIgL3LLptsqIZ+971TCHjXp8Pm/ufUjolNzuzvirtvWJWc
TiykXChEwQIG41PW7ravlUWMLMEfC6EqIicDi0qAXrzuczsnOEou4rjtN0QMfAfrbWdO
WF4xVSPxzNkHp/9hGsehjzBIqUv5e9gCTGt+foQXPJ6tYeraN8gIVehundvsW1YHjS2o
VXsp8nNMD2Y2GL9mDXi0klJMn6ZLy8omzuRzrGyHMxypQJoAOeCua2aKHmtVgR4ZjBEb
PfeLa3o3qbiTdCk7np+/OJPt7Bt02Tf5m5mV5aE14fgnjp4wcVjp7YyWepc5neYkPweR
39cw==
X-Gm-Message-State: AOAM530D8qs+dx/qA21tv+GS5P96Qc+HvMNNWYCI71Aaf8gsL2IQQnJn
NG7RIcF+VMr+gj09GoPvUGkOPVwgdZm+AA==
X-Google-Smtp-Source:
ABdhPJzgB8RA9x2n4WMx1pD8c5iPTYCkeCHDn5SjWYAI75AeHQ5U8q0lkwu2i6AfV0qk42fXX01vkw==
X-Received: by 2002:a05:600c:5105:b0:394:7d22:aa93 with SMTP id
o5-20020a05600c510500b003947d22aa93mr14277202wms.107.1652097550670;
Mon, 09 May 2022 04:59:10 -0700 (PDT)
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PULL 25/32] target/arm: Define neoverse-n1
Date: Mon, 9 May 2022 12:58:41 +0100
Message-Id: <20220509115848.3521805-26-peter.maydell@linaro.org>
X-Mailer: git-send-email 2.25.1
In-Reply-To: <20220509115848.3521805-1-peter.maydell@linaro.org>
References: <20220509115848.3521805-1-peter.maydell@linaro.org>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::32a;
envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32a.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001,
T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1652098876208100003
Content-Type: text/plain; charset="utf-8"
From: Richard Henderson <richard.henderson@linaro.org>
Enable the n1 for virt and sbsa board use.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20220506180242.216785-25-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
docs/system/arm/virt.rst | 1 +
hw/arm/sbsa-ref.c | 1 +
hw/arm/virt.c | 1 +
target/arm/cpu64.c | 66 ++++++++++++++++++++++++++++++++++++++++
4 files changed, 69 insertions(+)
diff --git a/docs/system/arm/virt.rst b/docs/system/arm/virt.rst
index 3e264d85af8..3d1058a80c0 100644
--- a/docs/system/arm/virt.rst
+++ b/docs/system/arm/virt.rst
@@ -58,6 +58,7 @@ Supported guest CPU types:
- ``cortex-a76`` (64-bit)
- ``a64fx`` (64-bit)
- ``host`` (with KVM only)
+- ``neoverse-n1`` (64-bit)
- ``max`` (same as ``host`` for KVM; best possible emulation with TCG)
=20
Note that the default is ``cortex-a15``, so for an AArch64 guest you must
diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c
index 2ddde88f5eb..dac8860f2d0 100644
--- a/hw/arm/sbsa-ref.c
+++ b/hw/arm/sbsa-ref.c
@@ -146,6 +146,7 @@ static const char * const valid_cpus[] =3D {
ARM_CPU_TYPE_NAME("cortex-a57"),
ARM_CPU_TYPE_NAME("cortex-a72"),
ARM_CPU_TYPE_NAME("cortex-a76"),
+ ARM_CPU_TYPE_NAME("neoverse-n1"),
ARM_CPU_TYPE_NAME("max"),
};
=20
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 12bc2318ecb..da7e3ede563 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -204,6 +204,7 @@ static const char *valid_cpus[] =3D {
ARM_CPU_TYPE_NAME("cortex-a72"),
ARM_CPU_TYPE_NAME("cortex-a76"),
ARM_CPU_TYPE_NAME("a64fx"),
+ ARM_CPU_TYPE_NAME("neoverse-n1"),
ARM_CPU_TYPE_NAME("host"),
ARM_CPU_TYPE_NAME("max"),
};
diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c
index adfe6b26be7..04427e073f1 100644
--- a/target/arm/cpu64.c
+++ b/target/arm/cpu64.c
@@ -259,6 +259,71 @@ static void aarch64_a76_initfn(Object *obj)
cpu->isar.mvfr2 =3D 0x00000043;
}
=20
+static void aarch64_neoverse_n1_initfn(Object *obj)
+{
+ ARMCPU *cpu =3D ARM_CPU(obj);
+
+ cpu->dtb_compatible =3D "arm,neoverse-n1";
+ set_feature(&cpu->env, ARM_FEATURE_V8);
+ set_feature(&cpu->env, ARM_FEATURE_NEON);
+ set_feature(&cpu->env, ARM_FEATURE_GENERIC_TIMER);
+ set_feature(&cpu->env, ARM_FEATURE_AARCH64);
+ set_feature(&cpu->env, ARM_FEATURE_CBAR_RO);
+ set_feature(&cpu->env, ARM_FEATURE_EL2);
+ set_feature(&cpu->env, ARM_FEATURE_EL3);
+ set_feature(&cpu->env, ARM_FEATURE_PMU);
+
+ /* Ordered by B2.4 AArch64 registers by functional group */
+ cpu->clidr =3D 0x82000023;
+ cpu->ctr =3D 0x8444c004;
+ cpu->dcz_blocksize =3D 4;
+ cpu->isar.id_aa64dfr0 =3D 0x0000000110305408ull;
+ cpu->isar.id_aa64isar0 =3D 0x0000100010211120ull;
+ cpu->isar.id_aa64isar1 =3D 0x0000000000100001ull;
+ cpu->isar.id_aa64mmfr0 =3D 0x0000000000101125ull;
+ cpu->isar.id_aa64mmfr1 =3D 0x0000000010212122ull;
+ cpu->isar.id_aa64mmfr2 =3D 0x0000000000001011ull;
+ cpu->isar.id_aa64pfr0 =3D 0x1100000010111112ull; /* GIC filled in lat=
er */
+ cpu->isar.id_aa64pfr1 =3D 0x0000000000000020ull;
+ cpu->id_afr0 =3D 0x00000000;
+ cpu->isar.id_dfr0 =3D 0x04010088;
+ cpu->isar.id_isar0 =3D 0x02101110;
+ cpu->isar.id_isar1 =3D 0x13112111;
+ cpu->isar.id_isar2 =3D 0x21232042;
+ cpu->isar.id_isar3 =3D 0x01112131;
+ cpu->isar.id_isar4 =3D 0x00010142;
+ cpu->isar.id_isar5 =3D 0x01011121;
+ cpu->isar.id_isar6 =3D 0x00000010;
+ cpu->isar.id_mmfr0 =3D 0x10201105;
+ cpu->isar.id_mmfr1 =3D 0x40000000;
+ cpu->isar.id_mmfr2 =3D 0x01260000;
+ cpu->isar.id_mmfr3 =3D 0x02122211;
+ cpu->isar.id_mmfr4 =3D 0x00021110;
+ cpu->isar.id_pfr0 =3D 0x10010131;
+ cpu->isar.id_pfr1 =3D 0x00010000; /* GIC filled in later */
+ cpu->isar.id_pfr2 =3D 0x00000011;
+ cpu->midr =3D 0x414fd0c1; /* r4p1 */
+ cpu->revidr =3D 0;
+
+ /* From B2.23 CCSIDR_EL1 */
+ cpu->ccsidr[0] =3D 0x701fe01a; /* 64KB L1 dcache */
+ cpu->ccsidr[1] =3D 0x201fe01a; /* 64KB L1 icache */
+ cpu->ccsidr[2] =3D 0x70ffe03a; /* 1MB L2 cache */
+
+ /* From B2.98 SCTLR_EL3 */
+ cpu->reset_sctlr =3D 0x30c50838;
+
+ /* From B4.23 ICH_VTR_EL2 */
+ cpu->gic_num_lrs =3D 4;
+ cpu->gic_vpribits =3D 5;
+ cpu->gic_vprebits =3D 5;
+
+ /* From B5.1 AdvSIMD AArch64 register summary */
+ cpu->isar.mvfr0 =3D 0x10110222;
+ cpu->isar.mvfr1 =3D 0x13211111;
+ cpu->isar.mvfr2 =3D 0x00000043;
+}
+
void arm_cpu_sve_finalize(ARMCPU *cpu, Error **errp)
{
/*
@@ -948,6 +1013,7 @@ static const ARMCPUInfo aarch64_cpus[] =3D {
{ .name =3D "cortex-a72", .initfn =3D aarch64_a72_initfn },
{ .name =3D "cortex-a76", .initfn =3D aarch64_a76_initfn },
{ .name =3D "a64fx", .initfn =3D aarch64_a64fx_initfn },
+ { .name =3D "neoverse-n1", .initfn =3D aarch64_neoverse_n1_init=
fn },
{ .name =3D "max", .initfn =3D aarch64_max_initfn },
#if defined(CONFIG_KVM) || defined(CONFIG_HVF)
{ .name =3D "host", .initfn =3D aarch64_host_initfn },
--=20
2.25.1