From nobody Wed May 1 08:57:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 ARC-Seal: i=1; a=rsa-sha256; t=1620205820; cv=none; d=zohomail.com; s=zohoarc; b=CLtB8eHvV995jdgHNPYhMin8oBRW4KF2uNmIv2NAMC6zF4KiyGfMgJiHw8db9KN2kLXeD1PKiHdDiqedDiXywdrGqPP8bsRHI4ZtRbCqBAehrozlwKYiACWLHdMkKX3yfLDH+gaapwPgS9Ce/B/50PhAUNiM8SQHioGrSOguKB0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620205820; h=Content-Type:Content-Transfer-Encoding:Cc: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=6/zax2zguYSXRdTW0Ppg2ZeocYY3iyVX/lZy3hFdDzI=; b=kKrE87qZnTHU0QwJX8lg19NUnXPqtEMWfmATYrljFJos7HxFllgRPKTn2hTq/mQNvtUoqL5VIJwx2jWzR4AZL2dqOZ79/NpciB68DLNNz/HdZ9n0yfrLU17KiKsIhrgPozsIR63J4EXB5WIoAV8/nFnJHRc7qhdg9GfUE8IF7fE= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1620205820665441.62287707682174; Wed, 5 May 2021 02:10:20 -0700 (PDT) Received: from localhost ([::1]:43588 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1leDXv-0001LO-F4 for importer@patchew.org; Wed, 05 May 2021 05:10:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43286) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1leDUI-0005y9-8j; Wed, 05 May 2021 05:06:34 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:2004) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1leDUG-0003gU-Gd; Wed, 05 May 2021 05:06:34 -0400 Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 14592rci129961; Wed, 5 May 2021 05:06:17 -0400 Received: from ppma02fra.de.ibm.com (47.49.7a9f.ip4.static.sl-reverse.com [159.122.73.71]) by mx0a-001b2d01.pphosted.com with ESMTP id 38bqnp99g4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 05 May 2021 05:06:17 -0400 Received: from pps.filterd (ppma02fra.de.ibm.com [127.0.0.1]) by ppma02fra.de.ibm.com (8.16.0.43/8.16.0.43) with SMTP id 145936VA027423; Wed, 5 May 2021 09:06:15 GMT Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by ppma02fra.de.ibm.com with ESMTP id 38bee2g3v5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 05 May 2021 09:06:15 +0000 Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com [9.149.105.232]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 14596DmA16580906 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 5 May 2021 09:06:13 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 36D315204E; Wed, 5 May 2021 09:06:13 +0000 (GMT) Received: from smtp.tlslab.ibm.com (unknown [9.101.4.1]) by d06av21.portsmouth.uk.ibm.com (Postfix) with SMTP id 027A152050; Wed, 5 May 2021 09:06:12 +0000 (GMT) Received: from yukon.ibmuc.com (unknown [9.171.33.156]) by smtp.tlslab.ibm.com (Postfix) with ESMTP id 4ACA822019C; Wed, 5 May 2021 11:06:12 +0200 (CEST) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Subject: [PATCH 1/2] ppc: Add a POWER10 DD2 CPU Date: Wed, 5 May 2021 11:06:08 +0200 Message-Id: <20210505090609.593194-2-clg@kaod.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210505090609.593194-1-clg@kaod.org> References: <20210505090609.593194-1-clg@kaod.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: Sa-DovEDGV9dzyrRgTKB4IaUo6Wwh5Zx X-Proofpoint-GUID: Sa-DovEDGV9dzyrRgTKB4IaUo6Wwh5Zx X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391, 18.0.761 definitions=2021-05-05_03:2021-05-05, 2021-05-05 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1034 bulkscore=0 mlxlogscore=961 mlxscore=0 malwarescore=0 spamscore=0 suspectscore=0 lowpriorityscore=0 priorityscore=1501 phishscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104060000 definitions=main-2105050067 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: softfail client-ip=148.163.158.5; envelope-from=clg@kaod.org; helo=mx0b-001b2d01.pphosted.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_SOFTFAIL=0.665 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , qemu-ppc@nongnu.org, Greg Kurz , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The POWER10 DD2 CPU adds an extra LPCR[HAIL] bit. The required change of the LPCR mask impacts all the POWER10 family. It is incorrect for DD1 but it does not break the modeling. Setting the HAIL bit is a requirement to support the scv instruction on PowerNV POWER10 platforms since glibc-2.33. Signed-off-by: C=C3=A9dric Le Goater --- target/ppc/cpu-models.h | 1 + target/ppc/cpu-models.c | 4 +++- target/ppc/translate_init.c.inc | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/target/ppc/cpu-models.h b/target/ppc/cpu-models.h index fc5e21728d7e..095259275941 100644 --- a/target/ppc/cpu-models.h +++ b/target/ppc/cpu-models.h @@ -375,6 +375,7 @@ enum { CPU_POWERPC_POWER9_DD20 =3D 0x004E1200, CPU_POWERPC_POWER10_BASE =3D 0x00800000, CPU_POWERPC_POWER10_DD1 =3D 0x00800100, + CPU_POWERPC_POWER10_DD20 =3D 0x00800200, CPU_POWERPC_970_v22 =3D 0x00390202, CPU_POWERPC_970FX_v10 =3D 0x00391100, CPU_POWERPC_970FX_v20 =3D 0x003C0200, diff --git a/target/ppc/cpu-models.c b/target/ppc/cpu-models.c index 87e4228614b0..4baa111713b0 100644 --- a/target/ppc/cpu-models.c +++ b/target/ppc/cpu-models.c @@ -776,6 +776,8 @@ "POWER9 v2.0") 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, + "POWER10 v2.0") #endif /* defined (TARGET_PPC64) */ =20 /*************************************************************************= **/ @@ -952,7 +954,7 @@ PowerPCCPUAlias ppc_cpu_aliases[] =3D { { "power8", "power8_v2.0" }, { "power8nvl", "power8nvl_v1.0" }, { "power9", "power9_v2.0" }, - { "power10", "power10_v1.0" }, + { "power10", "power10_v2.0" }, #endif =20 /* Generic PowerPCs */ diff --git a/target/ppc/translate_init.c.inc b/target/ppc/translate_init.c.= inc index 76d82cc2f6bf..3cb0478df993 100644 --- a/target/ppc/translate_init.c.inc +++ b/target/ppc/translate_init.c.inc @@ -9302,7 +9302,7 @@ POWERPC_FAMILY(POWER10)(ObjectClass *oc, void *data) (1ull << MSR_RI) | (1ull << MSR_LE); pcc->lpcr_mask =3D LPCR_VPM1 | LPCR_ISL | LPCR_KBV | LPCR_DPFD | - (LPCR_PECE_U_MASK & LPCR_HVEE) | LPCR_ILE | LPCR_AIL | + (LPCR_PECE_U_MASK & LPCR_HVEE) | LPCR_ILE | LPCR_HAIL | LPCR_AIL | LPCR_UPRT | LPCR_EVIRT | LPCR_ONL | LPCR_HR | LPCR_LD | (LPCR_PECE_L_MASK & (LPCR_PDEE | LPCR_HDEE | LPCR_EEE | LPCR_DEE | LPCR_OEE)) --=20 2.26.3 From nobody Wed May 1 08:57:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 ARC-Seal: i=1; a=rsa-sha256; t=1620205710; cv=none; d=zohomail.com; s=zohoarc; b=MNZamgOUI01h3su/2GiONXWmOHAHMDyk+fJLiSD5Z7loFKbazIqBpKLCAYAXXJB918AARhf4BVOureWSjQqGXxmBbLZ+UcrQFoFvmcwS7sceMJPwwraSyau76Nlg1aen1UvwjwXG0OqxoBlmZrtVHYfWdT1N9gXUAhn3Z4dnyEc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620205710; h=Content-Type:Content-Transfer-Encoding:Cc: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=eDr0ljIj6GbF9H4huosZn35K016wQ/zUCAus1J1r+Mg=; b=DDBPh0G8CrLpenz2z+nPlFPou2kaF4fhF3vyOKHHPCZjW4nU8fsNJPyuARNNDp1P7akw6DUnuP43iUU6+su7XMscRYc0ifVLgTFJ6UfKjRKDtfMEdLXZb6bXlOAF0eOh9RQPD1j3a7psps5RHKtSpLSpiw4KMzZdsqvvae7JDms= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1620205710743425.36893663178523; Wed, 5 May 2021 02:08:30 -0700 (PDT) Received: from localhost ([::1]:39412 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1leDW9-00081Z-Kl for importer@patchew.org; Wed, 05 May 2021 05:08:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43306) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1leDUM-00069p-UX; Wed, 05 May 2021 05:06:39 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:38266) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1leDUH-0003gt-Kv; Wed, 05 May 2021 05:06:38 -0400 Received: from pps.filterd (m0098396.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 145932Lc079780; Wed, 5 May 2021 05:06:18 -0400 Received: from ppma06ams.nl.ibm.com (66.31.33a9.ip4.static.sl-reverse.com [169.51.49.102]) by mx0a-001b2d01.pphosted.com with ESMTP id 38br9k07sd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 05 May 2021 05:06:18 -0400 Received: from pps.filterd (ppma06ams.nl.ibm.com [127.0.0.1]) by ppma06ams.nl.ibm.com (8.16.0.43/8.16.0.43) with SMTP id 14592gQ1029831; Wed, 5 May 2021 09:06:16 GMT Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by ppma06ams.nl.ibm.com with ESMTP id 38bee586sw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 05 May 2021 09:06:16 +0000 Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com [9.149.105.232]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 14596Evj64881134 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 5 May 2021 09:06:14 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id EF2ED5204E; Wed, 5 May 2021 09:06:13 +0000 (GMT) Received: from smtp.tlslab.ibm.com (unknown [9.101.4.1]) by d06av21.portsmouth.uk.ibm.com (Postfix) with SMTP id BB39B5204F; Wed, 5 May 2021 09:06:13 +0000 (GMT) Received: from yukon.ibmuc.com (unknown [9.171.33.156]) by smtp.tlslab.ibm.com (Postfix) with ESMTP id F39D5220117; Wed, 5 May 2021 11:06:12 +0200 (CEST) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Subject: [PATCH 2/2] ppc/pnv: Add support for the POWER10 DD2 CPU Date: Wed, 5 May 2021 11:06:09 +0200 Message-Id: <20210505090609.593194-3-clg@kaod.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210505090609.593194-1-clg@kaod.org> References: <20210505090609.593194-1-clg@kaod.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: DxEjphSQhc_FSS_PFRA--dm0J_Fjk5ZE X-Proofpoint-GUID: DxEjphSQhc_FSS_PFRA--dm0J_Fjk5ZE X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391, 18.0.761 definitions=2021-05-05_03:2021-05-05, 2021-05-05 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 phishscore=0 impostorscore=0 suspectscore=0 lowpriorityscore=0 bulkscore=0 malwarescore=0 clxscore=1034 spamscore=0 priorityscore=1501 mlxscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104060000 definitions=main-2105050067 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: softfail client-ip=148.163.156.1; envelope-from=clg@kaod.org; helo=mx0a-001b2d01.pphosted.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_SOFTFAIL=0.665 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , qemu-ppc@nongnu.org, Greg Kurz , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The chip model of the powernv10 machine now uses the latest POWER10 DD2 CPU. The DD1 chip model is undefined and considered invalid. Signed-off-by: C=C3=A9dric Le Goater --- include/hw/ppc/pnv.h | 2 +- hw/ppc/pnv.c | 2 +- hw/ppc/pnv_core.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/hw/ppc/pnv.h b/include/hw/ppc/pnv.h index d69cee17b232..3fec7c87d82d 100644 --- a/include/hw/ppc/pnv.h +++ b/include/hw/ppc/pnv.h @@ -170,7 +170,7 @@ DECLARE_INSTANCE_CHECKER(PnvChip, PNV_CHIP_POWER8NVL, DECLARE_INSTANCE_CHECKER(PnvChip, PNV_CHIP_POWER9, TYPE_PNV_CHIP_POWER9) =20 -#define TYPE_PNV_CHIP_POWER10 PNV_CHIP_TYPE_NAME("power10_v1.0") +#define TYPE_PNV_CHIP_POWER10 PNV_CHIP_TYPE_NAME("power10_v2.0") DECLARE_INSTANCE_CHECKER(PnvChip, PNV_CHIP_POWER10, TYPE_PNV_CHIP_POWER10) =20 diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index 77af846cdfea..0a1a518844f8 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -1919,7 +1919,7 @@ static void pnv_machine_power10_class_init(ObjectClas= s *oc, void *data) static const char compat[] =3D "qemu,powernv10\0ibm,powernv"; =20 mc->desc =3D "IBM PowerNV (Non-Virtualized) POWER10"; - mc->default_cpu_type =3D POWERPC_CPU_TYPE_NAME("power10_v1.0"); + mc->default_cpu_type =3D POWERPC_CPU_TYPE_NAME("power10_v2.0"); =20 pmc->compat =3D compat; pmc->compat_size =3D sizeof(compat); diff --git a/hw/ppc/pnv_core.c b/hw/ppc/pnv_core.c index bd2bf2e04472..5896b97e33f4 100644 --- a/hw/ppc/pnv_core.c +++ b/hw/ppc/pnv_core.c @@ -346,7 +346,7 @@ static const TypeInfo pnv_core_infos[] =3D { 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(power10, "power10_v1.0"), + DEFINE_PNV_CORE_TYPE(power10, "power10_v2.0"), }; =20 DEFINE_TYPES(pnv_core_infos) --=20 2.26.3