From patchwork Sun Apr 17 17:44:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 562876 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6886:0:0:0:0 with SMTP id m6csp1882115map; Sun, 17 Apr 2022 11:54:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyKZxPLdavgU/4RHKo3qP88aWRV4SElhgKJ+fureopQ+xwvJVG3cM/gVLs7KRa7vED7FxAs X-Received: by 2002:a05:622a:5c9:b0:2f1:f20f:127a with SMTP id d9-20020a05622a05c900b002f1f20f127amr5093466qtb.13.1650221672215; Sun, 17 Apr 2022 11:54:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650221672; cv=none; d=google.com; s=arc-20160816; b=ENzKvpSKVKjVppTdswNuXo0L44rk6quiTZQQ5k0gm6G2USIrK7U2hPtGy3+tpuD+lp dmmCTPgf5tCWDfvQ/1aHqLhjGZFQZ/h6IBjW8PhQUaFDAh0eez3etFjESX9ZLoAsPGJc AXXu6yuj0Mn3kWdU238/AL3cCWeiEfG2WWQwDBZVHpYULk9ivM69Lqd/ZIUruYTlIA+u v2Qh1pNTLvR4QnFwA/DpRM7CtYo6H2SUGldICv8Pr5ahgBuy+YHvRk84eE/ZAmITFyhC DrzTp2IDvBSur2yqq4xy2TcJXXOqdnYOwtgUAP23r+9slwNaLFuC8lodMXYTyQqRp5f9 7uQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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=AWChTNub/svxMafWwyMDKgs1ZSDrVWcoRccpdVr6IWk=; b=giHYNC45irCxJ31DhLVEHY6FHSS7muiPTCfyq8Cfg9laW5M1Tsj0cYpAqiG03x4gf8 j1PkDxfQ0mzd3AUG6HiuqUSsm2QmLzcKpvO6G//g8VAkJmDCwcNDM+VKG1RAnmIGK91y fLY/T4hrvGgELZ9bUQhgnb4/9lAMNVTjJPSxXSttfwRK30SXnEngZZZaHQsrigECJ6tT u3hAWEZuILx1/Gf6WVXllmtaVbiux3lJn4Uc1pTgYEq4jv66h8zw5ac7Ehn4HO4lgbAS jb6JH3TGRIs5mN8S7biIvddRn4StWAPrf1nXNNi71NFiO5j7f87p4ZRRl6/R+M2jsuKv Ujpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MNvTwov8; 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 189-20020a370bc6000000b00699ee1a095asi2285970qkl.357.2022.04.17.11.54.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 17 Apr 2022 11:54:32 -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=MNvTwov8; 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]:49570 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ngA2Z-0002Aw-Ny for patch@linaro.org; Sun, 17 Apr 2022 14:54:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49934) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ng90a-0004nu-NY for qemu-devel@nongnu.org; Sun, 17 Apr 2022 13:48:24 -0400 Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]:38754) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ng90Y-00047S-5e for qemu-devel@nongnu.org; Sun, 17 Apr 2022 13:48:23 -0400 Received: by mail-pj1-x1031.google.com with SMTP id s14-20020a17090a880e00b001caaf6d3dd1so15528820pjn.3 for ; Sun, 17 Apr 2022 10:48:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AWChTNub/svxMafWwyMDKgs1ZSDrVWcoRccpdVr6IWk=; b=MNvTwov8M7uHpW448lDUcuAo0h2kyuhJjIm5LWpKDNQdrzlCVDHGMEJeb2YnyPY3Uk m6OvjlpiU0PblON0aIFv1tf4AGB6BIKBzNatt1XFL2Myw5pTQSUlVPmpe18dS3g4MDAv 3D9eQ8iZjtBIzI9hcJkvl0SUHL96aB9qUzmifDE2BNK3rak7dspxjYTGeJAiSfS6/6w0 J5xbbhI7G9c9PMb/47rqBlEH1W7+OB3l45sjmRKGjzhaPtePEVo3a1lDpU92VF8m1Y0L BrkWbXYsNM98qpBNoDnn0N318Z0LolmEsK+Q9BectnRHZYA0Q2U7WvvTj44pfCWqfA85 4+JQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AWChTNub/svxMafWwyMDKgs1ZSDrVWcoRccpdVr6IWk=; b=EnztyQsyxRoAvnljS5HUDWAVVHfaQ0Rmf3rcqt3owEhY1FzttXXDyUQLMCw2l4b7G/ L4+guERgctQnt1u/JekLOPV2DYWhVMwVm2J0Cemn23DMRv9df7fTwCVBDIJLKPWgsdaA JSe8/zghaVMqZe4zCZBf4/hcG1VYM2Pri3GquXJtz94IN9JJ0uQry6dEMjRP7I8KdPp/ p4HoOAg1DlGSZLfemZJOklC08TEn/JmjBUuUtWX5eK3BU7cXCF2h1jrBkZKzKLVl16AC Vh3LyD/7aDHRappGsPPkLwmzIP2WEPhZG+FQGrfOlEORcK+KEvBvutqaZsQS+xFX1m2R qbrg== X-Gm-Message-State: AOAM530Ov4HBfZ6T6NnpvrOZTvxrDd96WaX7M9VIGIwjWARkOlRD7MYg dmJEvPXaxq5eZPAKXDx/foiLGKIRg8ERoQ== X-Received: by 2002:a17:90a:510e:b0:1cb:b1de:27a0 with SMTP id t14-20020a17090a510e00b001cbb1de27a0mr14567096pjh.196.1650217700857; Sun, 17 Apr 2022 10:48:20 -0700 (PDT) Received: from localhost.localdomain (174-21-142-130.tukw.qwest.net. [174.21.142.130]) by smtp.gmail.com with ESMTPSA id e14-20020aa78c4e000000b00506475da4cesm9372055pfd.49.2022.04.17.10.48.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Apr 2022 10:48:20 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 59/60] target/arm: Define cortex-a76 Date: Sun, 17 Apr 2022 10:44:25 -0700 Message-Id: <20220417174426.711829-60-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220417174426.711829-1-richard.henderson@linaro.org> References: <20220417174426.711829-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1031; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1031.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: , Cc: qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Enable the a76 for virt and sbsa board use. Signed-off-by: Richard Henderson Reviewed-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 1544632b67..e9ff81aa21 100644 --- a/docs/system/arm/virt.rst +++ b/docs/system/arm/virt.rst @@ -55,6 +55,7 @@ Supported guest CPU types: - ``cortex-a53`` (64-bit) - ``cortex-a57`` (64-bit) - ``cortex-a72`` (64-bit) +- ``cortex-a76`` (64-bit) - ``a64fx`` (64-bit) - ``host`` (with KVM only) - ``max`` (same as ``host`` for KVM; best possible emulation with TCG) diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index 2387401963..2ddde88f5e 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -145,6 +145,7 @@ static const int sbsa_ref_irqmap[] = { 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("max"), }; diff --git a/hw/arm/virt.c b/hw/arm/virt.c index d2e5ecd234..ce15c36a7f 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -202,6 +202,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("cortex-a76"), 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 336a941acd..d046351991 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -194,6 +194,71 @@ static void aarch64_a72_initfn(Object *obj) define_cortex_a72_a57_a53_cp_reginfo(cpu); } +static void aarch64_a76_initfn(Object *obj) +{ + ARMCPU *cpu = ARM_CPU(obj); + + cpu->dtb_compatible = "arm,cortex-a76"; + 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 = 0x0000000010305408ull; + cpu->isar.id_aa64isar0 = 0x0000100010211120ull; + cpu->isar.id_aa64isar1 = 0x0000000000100001ull; + cpu->isar.id_aa64mmfr0 = 0x0000000000101122ull; + cpu->isar.id_aa64mmfr1 = 0x0000000010212122ull; + cpu->isar.id_aa64mmfr2 = 0x0000000000001011ull; + cpu->isar.id_aa64pfr0 = 0x1100000010111112ull; /* GIC filled in later */ + cpu->isar.id_aa64pfr1 = 0x0000000000000010ull; + 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 = 0x414fd0b1; /* r4p1 */ + cpu->revidr = 0; + + /* From B2.18 CCSIDR_EL1 */ + cpu->ccsidr[0] = 0x701fe01a; /* 64KB L1 dcache */ + cpu->ccsidr[1] = 0x201fe01a; /* 64KB L1 icache */ + cpu->ccsidr[2] = 0x707fe03a; /* 512KB L2 cache */ + + /* From B2.93 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) { /* @@ -879,6 +944,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 = "cortex-a76", .initfn = aarch64_a76_initfn }, { .name = "a64fx", .initfn = aarch64_a64fx_initfn }, { .name = "max", .initfn = aarch64_max_initfn }, #if defined(CONFIG_KVM) || defined(CONFIG_HVF)