From nobody Thu May 16 15:53:34 2024 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1684166590; cv=none; d=zohomail.com; s=zohoarc; b=Kh5J1bbhOA1dx4DvjeQ1IZpTt1xQOJUfao0DsOjVtrmu/Pp2q7IyVIOB6PXmg7aT8Qjk182UAOhvRd4EMb96G8pJRd3lf0mYq82tu04JO3fX0yq1V344pYom5mYsyIMrnkJ7wfBrQUZupvbpWlX/EtCdF05eapC1bFsr2PKlTOo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684166590; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=WapfmPlF2rnyB+U6YxQgIOlT9S7COA3n3ERcEoAiUvw=; b=FY2FTvhJS4GNJ/mZyj2qy5w20uqPfs7QqdGpeOVOebgZgRm3F9WAj+6BsnXqZ+kOmLJmU+kTtE1bFSDdwnM+JEmWcHXnoGkbKZS+h6m8OsJpJbdUfA+Bo7QDKNMGcKgtiDNs/x1vboH5pibHEx51C6xF8H5LHBgrdBFZyxaWBxE= 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= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1684166590735650.5243003746565; Mon, 15 May 2023 09:03:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pyaeq-0008JR-LO; Mon, 15 May 2023 12:02:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pyaec-0007jI-PV; Mon, 15 May 2023 12:02:31 -0400 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pyaea-0001Du-IV; Mon, 15 May 2023 12:02:30 -0400 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-1aafa03f541so125588065ad.0; Mon, 15 May 2023 09:02:11 -0700 (PDT) Received: from wheely.local0.net ([202.168.30.146]) by smtp.gmail.com with ESMTPSA id 17-20020a170902ee5100b001a63ba28052sm13691565plo.69.2023.05.15.09.02.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 May 2023 09:02:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684166529; x=1686758529; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=WapfmPlF2rnyB+U6YxQgIOlT9S7COA3n3ERcEoAiUvw=; b=r3el2jiPML4oPp2FPWqvtzqX9ABWIk3ctUbXgg6vEqbslBaCcOk4x9pDbdyLJIV9Rq zzltqyqq/u6imrEmuiBV0D8vOCpMnst+1xv0wGCvHa5comoyCuN94xYG8pEeKcG+Dtdx K2UDs/xTCCcpuFTpND2t9ta5dDVw9/CpCyuNuiUrbnRANZQvOCxdmPXVfdW5qD4zC4vL 8a9KLKv56I3AR6db0Kwvp1E0ih3uNqikXifZLHQbr6lckzIEusTC8iJSufDc33s2eXWc q09iuGet5EH3xNlaMXKaIjVUiHbqBknsT9K4mN0rIGJtnMWW94iZ36MggrgehlGPn8HU O9wQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684166529; x=1686758529; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=WapfmPlF2rnyB+U6YxQgIOlT9S7COA3n3ERcEoAiUvw=; b=kr61MSzUOrItQM2dPD3BvEdNnxM+IqtVCnVuoafwubwOOTj+hB6krEw8HYx/JXBCOl CAfb/d+OILCAAE7eKt2hZOsTqNanlMtCTcWFIcosmtkV9Q/MN+xZykWYRvvBuVGp467H kxJpIgB+knIcZE296ibesAifzqhnVtlhEjSu/ZDwL5Ot9VWGyGkK7knfvHqVfUWw70ut MyHMco5ghZNtFZwUhe6UUqekDHyU1Tzr9/6gk/mxjHZt4dSLD3nZE2hj/IZyZzdiIakt KvDWk+jX7B6ri9YABd1yll36x+WO7WdlV8GZExR4F6q03Vzmr7mvd/f/Kw799LeHWit2 5yBQ== X-Gm-Message-State: AC+VfDyLOMQWUvGjolJPgNgcR2jf0X10NNLcVj8CiyWIvmX8fwdkMO4T 00ANiXADG0ASZO875fXj4aZayRjMjdE= X-Google-Smtp-Source: ACHHUZ6sGaYZgXo3Jstwyt4GoIZIQQuwhj1uZvvE75fqZNmq0IRl39BqJtu1IRQkC6EKTzIfajPZ1Q== X-Received: by 2002:a17:903:244c:b0:1a1:bf22:2b6e with SMTP id l12-20020a170903244c00b001a1bf222b6emr45907938pls.43.1684166528861; Mon, 15 May 2023 09:02:08 -0700 (PDT) From: Nicholas Piggin To: qemu-ppc@nongnu.org Cc: Nicholas Piggin , qemu-devel@nongnu.org, Harsh Prateek Bora Subject: [PATCH v4] target/ppc: Add POWER9 DD2.2 model Date: Tue, 16 May 2023 02:02:01 +1000 Message-Id: <20230515160201.394587-1-npiggin@gmail.com> X-Mailer: git-send-email 2.40.1 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=2607:f8b0:4864:20::636; envelope-from=npiggin@gmail.com; helo=mail-pl1-x636.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, FREEMAIL_FROM=0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1684166623979100001 Content-Type: text/plain; charset="utf-8" POWER9 DD2.1 and earlier had significant limitations when running KVM, including lack of "mixed mode" MMU support (ability to run HPT and RPT mode on threads of the same core), and a translation prefetch issue which is worked around by disabling "AIL" mode for the guest. These processors are not widely available, and it's difficult to deal with all these quirks in qemu +/- KVM, so create a POWER9 DD2.2 CPU and make it the default POWER9 CPU. Signed-off-by: Nicholas Piggin Reviewed-by: Frederic Barrat Reviewed-by: Harsh Prateek Bora --- This is unchanged since v3, just reposting. Thanks, Nick hw/ppc/pnv.c | 2 +- hw/ppc/pnv_core.c | 2 +- hw/ppc/spapr.c | 2 +- hw/ppc/spapr_cpu_core.c | 1 + include/hw/ppc/pnv.h | 2 +- target/ppc/cpu-models.c | 4 +++- target/ppc/cpu-models.h | 1 + target/ppc/cpu_init.c | 21 +++++++++++++++++++-- tests/qtest/device-plug-test.c | 4 ++-- 9 files changed, 30 insertions(+), 9 deletions(-) diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index 11cb48af2f..590fc64b32 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -2171,7 +2171,7 @@ static void pnv_machine_power9_class_init(ObjectClass= *oc, void *data) }; =20 mc->desc =3D "IBM PowerNV (Non-Virtualized) POWER9"; - mc->default_cpu_type =3D POWERPC_CPU_TYPE_NAME("power9_v2.0"); + mc->default_cpu_type =3D POWERPC_CPU_TYPE_NAME("power9_v2.2"); compat_props_add(mc->compat_props, phb_compat, G_N_ELEMENTS(phb_compat= )); =20 xfc->match_nvt =3D pnv_match_nvt; diff --git a/hw/ppc/pnv_core.c b/hw/ppc/pnv_core.c index 410f31bdf8..0bc3ad41c8 100644 --- a/hw/ppc/pnv_core.c +++ b/hw/ppc/pnv_core.c @@ -348,7 +348,7 @@ static const TypeInfo pnv_core_infos[] =3D { DEFINE_PNV_CORE_TYPE(power8, "power8e_v2.1"), DEFINE_PNV_CORE_TYPE(power8, "power8_v2.0"), DEFINE_PNV_CORE_TYPE(power8, "power8nvl_v1.0"), - DEFINE_PNV_CORE_TYPE(power9, "power9_v2.0"), + DEFINE_PNV_CORE_TYPE(power9, "power9_v2.2"), DEFINE_PNV_CORE_TYPE(power10, "power10_v2.0"), }; =20 diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index ddc9c7b1a1..b58e69afd7 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4631,7 +4631,7 @@ static void spapr_machine_class_init(ObjectClass *oc,= void *data) =20 smc->dr_lmb_enabled =3D true; smc->update_dt_enabled =3D true; - mc->default_cpu_type =3D POWERPC_CPU_TYPE_NAME("power9_v2.0"); + mc->default_cpu_type =3D POWERPC_CPU_TYPE_NAME("power9_v2.2"); mc->has_hotpluggable_cpus =3D true; mc->nvdimm_supported =3D true; smc->resize_hpt_default =3D SPAPR_RESIZE_HPT_ENABLED; diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c index 8a4861f45a..9b88dd549a 100644 --- a/hw/ppc/spapr_cpu_core.c +++ b/hw/ppc/spapr_cpu_core.c @@ -390,6 +390,7 @@ static const TypeInfo spapr_cpu_core_type_infos[] =3D { DEFINE_SPAPR_CPU_CORE_TYPE("power8nvl_v1.0"), DEFINE_SPAPR_CPU_CORE_TYPE("power9_v1.0"), DEFINE_SPAPR_CPU_CORE_TYPE("power9_v2.0"), + DEFINE_SPAPR_CPU_CORE_TYPE("power9_v2.2"), DEFINE_SPAPR_CPU_CORE_TYPE("power10_v1.0"), DEFINE_SPAPR_CPU_CORE_TYPE("power10_v2.0"), #ifdef CONFIG_KVM diff --git a/include/hw/ppc/pnv.h b/include/hw/ppc/pnv.h index 409f3bf763..7e5fef7c43 100644 --- a/include/hw/ppc/pnv.h +++ b/include/hw/ppc/pnv.h @@ -48,7 +48,7 @@ DECLARE_INSTANCE_CHECKER(PnvChip, PNV_CHIP_POWER8, DECLARE_INSTANCE_CHECKER(PnvChip, PNV_CHIP_POWER8NVL, TYPE_PNV_CHIP_POWER8NVL) =20 -#define TYPE_PNV_CHIP_POWER9 PNV_CHIP_TYPE_NAME("power9_v2.0") +#define TYPE_PNV_CHIP_POWER9 PNV_CHIP_TYPE_NAME("power9_v2.2") DECLARE_INSTANCE_CHECKER(PnvChip, PNV_CHIP_POWER9, TYPE_PNV_CHIP_POWER9) =20 diff --git a/target/ppc/cpu-models.c b/target/ppc/cpu-models.c index 912b037c63..7dbb47de64 100644 --- a/target/ppc/cpu-models.c +++ b/target/ppc/cpu-models.c @@ -732,6 +732,8 @@ "POWER9 v1.0") POWERPC_DEF("power9_v2.0", CPU_POWERPC_POWER9_DD20, POWER= 9, "POWER9 v2.0") + POWERPC_DEF("power9_v2.2", CPU_POWERPC_POWER9_DD22, POWER= 9, + "POWER9 v2.2") POWERPC_DEF("power10_v1.0", CPU_POWERPC_POWER10_DD1, POWER= 10, "POWER10 v1.0") POWERPC_DEF("power10_v2.0", CPU_POWERPC_POWER10_DD20, POWER= 10, @@ -907,7 +909,7 @@ PowerPCCPUAlias ppc_cpu_aliases[] =3D { { "power8e", "power8e_v2.1" }, { "power8", "power8_v2.0" }, { "power8nvl", "power8nvl_v1.0" }, - { "power9", "power9_v2.0" }, + { "power9", "power9_v2.2" }, { "power10", "power10_v2.0" }, #endif =20 diff --git a/target/ppc/cpu-models.h b/target/ppc/cpu-models.h index a77e036b3a..572b5e553a 100644 --- a/target/ppc/cpu-models.h +++ b/target/ppc/cpu-models.h @@ -350,6 +350,7 @@ enum { CPU_POWERPC_POWER9_BASE =3D 0x004E0000, CPU_POWERPC_POWER9_DD1 =3D 0x004E1100, CPU_POWERPC_POWER9_DD20 =3D 0x004E1200, + CPU_POWERPC_POWER9_DD22 =3D 0x004E1202, CPU_POWERPC_POWER10_BASE =3D 0x00800000, CPU_POWERPC_POWER10_DD1 =3D 0x00801100, CPU_POWERPC_POWER10_DD20 =3D 0x00801200, diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c index 0ce2e3c91d..6775828dfc 100644 --- a/target/ppc/cpu_init.c +++ b/target/ppc/cpu_init.c @@ -6284,9 +6284,26 @@ static bool ppc_pvr_match_power9(PowerPCCPUClass *pc= c, uint32_t pvr, bool best) return false; } =20 - if ((pvr & 0x0f00) =3D=3D (pcc->pvr & 0x0f00)) { - /* Major DD version matches to power9_v1.0 and power9_v2.0 */ + if ((pvr & 0x0f00) !=3D (pcc->pvr & 0x0f00)) { + /* Major DD version does not match */ + return false; + } + + if ((pvr & 0x0f00) =3D=3D 0x100) { + /* DD1.x always matches power9_v1.0 */ return true; + } else if ((pvr & 0x0f00) =3D=3D 0x200) { + if ((pvr & 0xf) < 2) { + /* DD2.0, DD2.1 match power9_v2.0 */ + if ((pcc->pvr & 0xf) =3D=3D 0) { + return true; + } + } else { + /* DD2.2, DD2.3 match power9_v2.2 */ + if ((pcc->pvr & 0xf) =3D=3D 2) { + return true; + } + } } =20 return false; diff --git a/tests/qtest/device-plug-test.c b/tests/qtest/device-plug-test.c index 01cecd6e20..165ca13f8c 100644 --- a/tests/qtest/device-plug-test.c +++ b/tests/qtest/device-plug-test.c @@ -168,8 +168,8 @@ static void test_spapr_cpu_unplug_request(void) { QTestState *qtest; =20 - qtest =3D qtest_initf("-cpu power9_v2.0 -smp 1,maxcpus=3D2 " - "-device power9_v2.0-spapr-cpu-core,core-id=3D1,id= =3Ddev0"); + qtest =3D qtest_initf("-cpu power9_v2.2 -smp 1,maxcpus=3D2 " + "-device power9_v2.2-spapr-cpu-core,core-id=3D1,id= =3Ddev0"); =20 /* similar to test_pci_unplug_request */ process_device_remove(qtest, "dev0"); --=20 2.40.1