From patchwork Mon May 9 11:58:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 570983 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:66c4:0:0:0:0 with SMTP id x4csp3940295mal; Mon, 9 May 2022 05:20:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw2Ndb44euwnbHE8rQEo7qMH5wQ9ho1Qdx0Q4x/kzwKxmJ98A+nQBs7JoFrHQqgNpIc2IL/ X-Received: by 2002:ac8:4e51:0:b0:2f3:d85c:4c8e with SMTP id e17-20020ac84e51000000b002f3d85c4c8emr5020112qtw.423.1652098843999; Mon, 09 May 2022 05:20:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652098843; cv=none; d=google.com; s=arc-20160816; b=g2IsBHlWRRk3ZYQjUNIwvWekUxp32BvkDXe3x6I5OXQthpB4E/QA7MN5EdjWZzSQqy k1VyxmqdvYAFUlZ/zJ6Jmwn5Yh9M3AJ9CWpIQz8H8rhuWSTCgm2pZ968N1qWLVOtZEGX grMoz6jzWHzaUdF3fPk2/4Cdy71qRXLzWH7YDXzmdvN0DGPtMkHkaYbPVA4B+II0k9Iw PPt50B40VXiN7o2Ia1v0sEmKuCHrGB16WoA5jx3HmhYKQtMxAQ9T4mZnRu5RUR4xSVv2 ASOMAB7mSzmknFPMPuqs+w8GGbyCDwE1j5Y+QuMozzgusER83f/Q8QnidaHcy4cLGaoU aOog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=gvIVM7y/OILbDxrcgpLmhBrY6fNb+2S83OGiai4zK8Y=; b=oMSI++X9pqUt7XeCFUgYi5/g6Q76uy7LnzMWrgJh+rYx9BEth65mZHBZ1BU7lRshDU nRlmYvyr+kBEY+r2xqbT+c1Caai5hnUKIWviP1fbbSOS/Ldipdg2xCUJJb8OjTF3sy1/ JdtuigryR54hao3Ufia/deCcj6iZn1b5v2mEdEaUuNqpQQgJCq0oDKXv9OwIWt0TBxP7 H+tD88MmZn3YD6JjS6tTOXYN7PCItHGGdfWdhLA2Dbmn6ZxKPZVzIHVWQmJym1VVx4x3 U1j6AbcDx7ftTOcRC/ldxkp8SD7GQymrJ6rwrJIkaLgRrilOEC8E/yPMf6Z6a4Dz8ZLg n7jw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cQxqmszr; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ay42-20020a05620a17aa00b0069f7c7d651esi8370277qkb.678.2022.05.09.05.20.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 09 May 2022 05:20:43 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cQxqmszr; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33162 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1no2NX-0002yg-GH for patch@linaro.org; Mon, 09 May 2022 08:20:43 -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 ) 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 ) 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 ; Mon, 09 May 2022 04:59:11 -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-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) 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 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 May 2022 04:59:10 -0700 (PDT) From: Peter Maydell 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 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Enable the n1 for virt and sbsa board use. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20220506180242.216785-25-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- 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) 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[] = { 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"), }; 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[] = { 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 = 0x00000043; } +static void aarch64_neoverse_n1_initfn(Object *obj) +{ + ARMCPU *cpu = ARM_CPU(obj); + + cpu->dtb_compatible = "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 = 0x82000023; + cpu->ctr = 0x8444c004; + cpu->dcz_blocksize = 4; + cpu->isar.id_aa64dfr0 = 0x0000000110305408ull; + cpu->isar.id_aa64isar0 = 0x0000100010211120ull; + cpu->isar.id_aa64isar1 = 0x0000000000100001ull; + cpu->isar.id_aa64mmfr0 = 0x0000000000101125ull; + cpu->isar.id_aa64mmfr1 = 0x0000000010212122ull; + cpu->isar.id_aa64mmfr2 = 0x0000000000001011ull; + cpu->isar.id_aa64pfr0 = 0x1100000010111112ull; /* GIC filled in later */ + cpu->isar.id_aa64pfr1 = 0x0000000000000020ull; + cpu->id_afr0 = 0x00000000; + cpu->isar.id_dfr0 = 0x04010088; + cpu->isar.id_isar0 = 0x02101110; + cpu->isar.id_isar1 = 0x13112111; + cpu->isar.id_isar2 = 0x21232042; + cpu->isar.id_isar3 = 0x01112131; + cpu->isar.id_isar4 = 0x00010142; + cpu->isar.id_isar5 = 0x01011121; + cpu->isar.id_isar6 = 0x00000010; + cpu->isar.id_mmfr0 = 0x10201105; + cpu->isar.id_mmfr1 = 0x40000000; + cpu->isar.id_mmfr2 = 0x01260000; + cpu->isar.id_mmfr3 = 0x02122211; + cpu->isar.id_mmfr4 = 0x00021110; + cpu->isar.id_pfr0 = 0x10010131; + cpu->isar.id_pfr1 = 0x00010000; /* GIC filled in later */ + cpu->isar.id_pfr2 = 0x00000011; + cpu->midr = 0x414fd0c1; /* r4p1 */ + cpu->revidr = 0; + + /* From B2.23 CCSIDR_EL1 */ + cpu->ccsidr[0] = 0x701fe01a; /* 64KB L1 dcache */ + cpu->ccsidr[1] = 0x201fe01a; /* 64KB L1 icache */ + cpu->ccsidr[2] = 0x70ffe03a; /* 1MB L2 cache */ + + /* From B2.98 SCTLR_EL3 */ + cpu->reset_sctlr = 0x30c50838; + + /* From B4.23 ICH_VTR_EL2 */ + cpu->gic_num_lrs = 4; + cpu->gic_vpribits = 5; + cpu->gic_vprebits = 5; + + /* From B5.1 AdvSIMD AArch64 register summary */ + cpu->isar.mvfr0 = 0x10110222; + cpu->isar.mvfr1 = 0x13211111; + cpu->isar.mvfr2 = 0x00000043; +} + void arm_cpu_sve_finalize(ARMCPU *cpu, Error **errp) { /* @@ -948,6 +1013,7 @@ static const ARMCPUInfo aarch64_cpus[] = { { .name = "cortex-a72", .initfn = aarch64_a72_initfn }, { .name = "cortex-a76", .initfn = aarch64_a76_initfn }, { .name = "a64fx", .initfn = aarch64_a64fx_initfn }, + { .name = "neoverse-n1", .initfn = aarch64_neoverse_n1_initfn }, { .name = "max", .initfn = aarch64_max_initfn }, #if defined(CONFIG_KVM) || defined(CONFIG_HVF) { .name = "host", .initfn = aarch64_host_initfn },