From patchwork Tue Apr 12 00:33: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: 559973 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6886:0:0:0:0 with SMTP id m6csp2973889map; Mon, 11 Apr 2022 17:52:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxzbzLBAd8obnLTQGkO8LH/CdNeTx98xs5qhkzFMmJlNvlb28lu7tz0r29EtBeOYq/ISaCI X-Received: by 2002:a25:d642:0:b0:641:107f:8d12 with SMTP id n63-20020a25d642000000b00641107f8d12mr12785957ybg.243.1649724746337; Mon, 11 Apr 2022 17:52:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649724746; cv=none; d=google.com; s=arc-20160816; b=vdozszElfnjMlEg8F0Ndv1NMgWkClpKHnybgnOmRmqXM9I4OsA0wPjWv4cod2MaT8g QT2RBWrXKFQVz9x3Ix1/uRH1cVHGfFUofmkJYNjn9O0NOKpUQRe1DyRG4k8rlukZJwya fKcfzXTUogKaCQN/CZ6GO3eFRoj1Bx50UVzxQjMlKAQ3qjOaNWy7QlOFVYkHyrccIjhm iAtx6odMJHvk5JnMXMZlSuKhLvF0QwzhHU1TsklMSmpBvZo+iawYN8WVWxE/V5JboeFh dijKawpgQVR9U7uSiYUOSIJEOaTVj4tX3ARB+PAorDip/PVSWakLKFl/Nuw55FloCJcZ 3l6A== 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=W7VvkB9bLVbaUbeLnPbB0Uk8wr20FyjkQ0TwGkR7VjI=; b=DAYpKm6YiYN+pHluhObpZpBwqTf2Cdy+7144oCI5Cv2lJcnuaHK7kZkCx1qKJgFKK6 tEyyO5wVFBU4aybTOhBlEsVzTtnF6UwsjPw4gik57YmVWyrYqGZvzPHzAXV+8Uv6zMKR aJQ2rn8qeYMbj9BhPgje5k1cL1/POWEOc/Fzl4JAl6fga8tpeNgYbzHR2oGtrYK8qwKI 6c3aXHDFB+9BoPJiwv8SG6cQ1EcHYM4cvgwfW0MfP14zDGlZtzUPxPppxfmqrvprIMuZ hYMgrMwBrfvEpY3VNZ462ihAr2+CRkiWPCAVoFdMOByT/NMVVq5vZmAybD0s7ceS5UQN KVOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UgFYTgsv; 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 q11-20020a815c0b000000b002ea4b76b5e3si5324613ywb.204.2022.04.11.17.52.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Apr 2022 17:52:26 -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=UgFYTgsv; 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]:53724 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ne4ld-0002uZ-OR for patch@linaro.org; Mon, 11 Apr 2022 20:52:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59032) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ne4Ti-0001zb-Qy for qemu-devel@nongnu.org; Mon, 11 Apr 2022 20:33:55 -0400 Received: from mail-pj1-x102e.google.com ([2607:f8b0:4864:20::102e]:54860) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ne4Tf-0001uC-Sb for qemu-devel@nongnu.org; Mon, 11 Apr 2022 20:33:54 -0400 Received: by mail-pj1-x102e.google.com with SMTP id md4so8487690pjb.4 for ; Mon, 11 Apr 2022 17:33:49 -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=W7VvkB9bLVbaUbeLnPbB0Uk8wr20FyjkQ0TwGkR7VjI=; b=UgFYTgsv9kPehH+ybmMxo3hYV1Pc3vPdmGFw4wIfGf4CObZecSASfRNjgap1nXtCaY RibDbOnVyf5yhgHvq3RO8qTyrV5CeCwaNORd+PZbjQjFnVYVPAKJebMMxXnuMQvsktGn wYLIP7Xo6/SakfGGGWUM+1+XoXmT1Fa2nT6oQAUC7QOfkfZwhoM8LrUBG/HzBTf8Jlq7 jyJSawAdxw2MDzF9XpmZv3wvKkpnJPbBtzCFaNKJ2fvvlPr+9OL4nra1yoDGgdOluhMx pYTpxQsrTz3oVGyFZAGl59sbMPQWYGnU7KWzN25qxFLsfVT+9W+uXYkfVUKDtXlnPEHE Rj0g== 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=W7VvkB9bLVbaUbeLnPbB0Uk8wr20FyjkQ0TwGkR7VjI=; b=lL9+X30YBR75HJ8mDzshPCGY0x/HnhyphaVClHwjuXlyAY6wVuaRosvQr9/0rY+UQ4 xSnb2Tcc54mszCWqhv2bv3sX8/2qE315he0EiszdA4ThrPJtLHtU1ZeWaUHDD6v7JaVI mGmH+tpR04Jram6IyxEBSMUT0Jss43CTfzQet/It0/Vdc8vcTZCBHGk6+9pyDImYsE9O M6jB4c6HkMc71k5zhmPNEmn7DD+a1XUw1TYrdLgfML1PNDlymnNI7VWWnx9yud/3j2iW 97yqK0np2lblP07gYMsbKdTvwjJZvyYALCYVpcE+kog8w66/02fbuvuw1vMNIyt5Lufh xaKA== X-Gm-Message-State: AOAM531BZzXXVcisfXimNmtPny8BG5aNZBpS9HFpGV5ReSC+ic2Mx03a KfpxtQfEnT4aIIruebMTuMv5zYsWqP6KSA== X-Received: by 2002:a17:902:e809:b0:158:553c:3592 with SMTP id u9-20020a170902e80900b00158553c3592mr9638100plg.151.1649723628534; Mon, 11 Apr 2022 17:33:48 -0700 (PDT) Received: from localhost.localdomain (174-21-142-130.tukw.qwest.net. [174.21.142.130]) by smtp.gmail.com with ESMTPSA id g15-20020a056a0023cf00b004e17e11cb17sm38346669pfc.111.2022.04.11.17.33.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Apr 2022 17:33:48 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 23/24] target/arm: Define cortex-a76 Date: Mon, 11 Apr 2022 17:33:25 -0700 Message-Id: <20220412003326.588530-24-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220412003326.588530-1-richard.henderson@linaro.org> References: <20220412003326.588530-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102e; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102e.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 --- 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 8934ced19a..7dbd649b0c 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)