From patchwork Tue Feb 12 01:16:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Collin Walling X-Patchwork-Id: 10807107 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2471B746 for ; Tue, 12 Feb 2019 01:18:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 11A772AC9C for ; Tue, 12 Feb 2019 01:18:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 04CE32AD6E; Tue, 12 Feb 2019 01:18:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9D2D42AC9C for ; Tue, 12 Feb 2019 01:18:49 +0000 (UTC) Received: from localhost ([127.0.0.1]:59253 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtMim-0000wa-CN for patchwork-qemu-devel@patchwork.kernel.org; Mon, 11 Feb 2019 20:18:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56851) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtMhX-0000tk-Ny for qemu-devel@nongnu.org; Mon, 11 Feb 2019 20:17:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtMhF-0006CH-U0 for qemu-devel@nongnu.org; Mon, 11 Feb 2019 20:17:22 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:43654 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gtMh8-00065A-Si for qemu-devel@nongnu.org; Mon, 11 Feb 2019 20:17:08 -0500 Received: from pps.filterd (m0098419.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x1C190hU117805 for ; Mon, 11 Feb 2019 20:17:05 -0500 Received: from e17.ny.us.ibm.com (e17.ny.us.ibm.com [129.33.205.207]) by mx0b-001b2d01.pphosted.com with ESMTP id 2qkknuhc8y-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 11 Feb 2019 20:17:04 -0500 Received: from localhost by e17.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 12 Feb 2019 01:17:04 -0000 Received: from b01cxnp22036.gho.pok.ibm.com (9.57.198.26) by e17.ny.us.ibm.com (146.89.104.204) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Tue, 12 Feb 2019 01:17:02 -0000 Received: from b01ledav005.gho.pok.ibm.com (b01ledav005.gho.pok.ibm.com [9.57.199.110]) by b01cxnp22036.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x1C1H1MQ25034938 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 12 Feb 2019 01:17:01 GMT Received: from b01ledav005.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DD79CAE067; Tue, 12 Feb 2019 01:17:00 +0000 (GMT) Received: from b01ledav005.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D9EC2AE062; Tue, 12 Feb 2019 01:17:00 +0000 (GMT) Received: from T470p.pok.ibm.com (unknown [9.56.58.16]) by b01ledav005.gho.pok.ibm.com (Postfix) with ESMTP; Tue, 12 Feb 2019 01:17:00 +0000 (GMT) From: Collin Walling To: qemu-devel@nongnu.org, qemu-s390x@nongnu.org Date: Mon, 11 Feb 2019 20:16:57 -0500 X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190212011657.18324-1-walling@linux.ibm.com> References: <20190212011657.18324-1-walling@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 x-cbid: 19021201-0040-0000-0000-000004C00FE2 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00010579; HX=3.00000242; KW=3.00000007; PH=3.00000004; SC=3.00000279; SDB=6.01159749; UDB=6.00604226; IPR=6.00940295; MB=3.00025535; MTD=3.00000008; XFM=3.00000015; UTC=2019-02-12 01:17:04 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19021201-0041-0000-0000-000008CB2EE4 Message-Id: <20190212011657.18324-3-walling@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-02-12_01:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1902120006 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.158.5 Subject: [Qemu-devel] [PATCH v2 3/3] s390x/cpumodel: add z14 GA2 model X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pasic@linux.ibm.com, borntraeger@de.ibm.com, rth@twiddle.net, cohuck@redhat.com, david@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Introduce the z14 GA2 cpu model for QEMU. There are no new features introduced with this model, and will inherit the same feature set as z14 GA1. Signed-off-by: Collin Walling Acked-by: Christian Borntraeger Reviewed-by: David Hildenbrand --- target/s390x/cpu_models.c | 1 + target/s390x/gen-features.c | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c index d75a20e49d..86d70a3e11 100644 --- a/target/s390x/cpu_models.c +++ b/target/s390x/cpu_models.c @@ -79,6 +79,7 @@ static S390CPUDef s390_cpu_defs[] = { CPUDEF_INIT(0x2964, 13, 2, 47, 0x08000000U, "z13.2", "IBM z13 GA2"), CPUDEF_INIT(0x2965, 13, 2, 47, 0x08000000U, "z13s", "IBM z13s GA1"), CPUDEF_INIT(0x3906, 14, 1, 47, 0x08000000U, "z14", "IBM z14 GA1"), + CPUDEF_INIT(0x3906, 14, 2, 47, 0x08000000U, "z14.2", "IBM z14 GA2"), CPUDEF_INIT(0x3907, 14, 1, 47, 0x08000000U, "z14ZR1", "IBM z14 Model ZR1 GA1"), }; diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c index 4770f00105..f6ed3f4e0d 100644 --- a/target/s390x/gen-features.c +++ b/target/s390x/gen-features.c @@ -353,6 +353,8 @@ static uint16_t base_GEN14_GA1[] = { S390_FEAT_ORDER_PRESERVING_COMPRESSION, }; +#define base_GEN14_GA2 EmptyFeat + /* Full features (in order of release) * Automatically includes corresponding base features. * Full features are all features this hardware supports even if kvm/QEMU do not @@ -480,6 +482,8 @@ static uint16_t full_GEN14_GA1[] = { S390_FEAT_GROUP_MULTIPLE_EPOCH_PTFF, }; +#define full_GEN14_GA2 EmptyFeat + /* Default features (in order of release) * Automatically includes corresponding base features. * Default features are all features this version of QEMU supports for this @@ -554,6 +558,8 @@ static uint16_t default_GEN14_GA1[] = { S390_FEAT_GROUP_MULTIPLE_EPOCH_PTFF, }; +#define default_GEN14_GA2 EmptyFeat + /* QEMU (CPU model) features */ static uint16_t qemu_V2_11[] = { @@ -662,6 +668,7 @@ static CpuFeatDefSpec CpuFeatDef[] = { CPU_FEAT_INITIALIZER(GEN13_GA1), CPU_FEAT_INITIALIZER(GEN13_GA2), CPU_FEAT_INITIALIZER(GEN14_GA1), + CPU_FEAT_INITIALIZER(GEN14_GA2), }; #define FEAT_GROUP_INITIALIZER(_name) \