From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35256) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dXNj0-0001KD-Ar for qemu-devel@nongnu.org; Tue, 18 Jul 2017 04:19:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dXNix-0002c3-75 for qemu-devel@nongnu.org; Tue, 18 Jul 2017 04:19:22 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:38572 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 1dXNix-0002bq-1Q for qemu-devel@nongnu.org; Tue, 18 Jul 2017 04:19:19 -0400 Received: from pps.filterd (m0098421.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id v6I8J2QQ089133 for ; Tue, 18 Jul 2017 04:19:18 -0400 Received: from e36.co.us.ibm.com (e36.co.us.ibm.com [32.97.110.154]) by mx0a-001b2d01.pphosted.com with ESMTP id 2bs3d49g7g-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Tue, 18 Jul 2017 04:19:18 -0400 Received: from localhost by e36.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 18 Jul 2017 02:19:17 -0600 References: <1500310706-36211-1-git-send-email-borntraeger@de.ibm.com> <1500310706-36211-3-git-send-email-borntraeger@de.ibm.com> From: Christian Borntraeger Date: Tue, 18 Jul 2017 10:19:11 +0200 MIME-Version: 1.0 In-Reply-To: <1500310706-36211-3-git-send-email-borntraeger@de.ibm.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-IE Content-Transfer-Encoding: 7bit Message-Id: Subject: Re: [Qemu-devel] [PATCH 2/2] s390x/cpumodel: z14 cpu models List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel Cc: Alexander Graf , Richard Henderson , Cornelia Huck , Thomas Huth , "Jason J. Herne" On 07/17/2017 06:58 PM, Christian Borntraeger wrote: > From: "Jason J. Herne" > > This patch introduces the CPU model for z14, along with all base and > optional features. > > Signed-off-by: Jason J. Herne > Acked-by: Christian Borntraeger > Signed-off-by: Christian Borntraeger > --- > target/s390x/cpu_models.c | 1 + > target/s390x/gen-features.c | 38 ++++++++++++++++++++++++++++++++++++++ > 2 files changed, 39 insertions(+) > > diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c > index c654279..e2ccc32 100644 > --- a/target/s390x/cpu_models.c > +++ b/target/s390x/cpu_models.c > @@ -75,6 +75,7 @@ static S390CPUDef s390_cpu_defs[] = { > CPUDEF_INIT(0x2964, 13, 1, 47, 0x08000000U, "z13", "IBM z13 GA1"), > 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"), > }; > > void s390_cpudef_featoff(uint8_t gen, uint8_t ec_ga, S390Feat feat) > diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c > index af14b11..118a95e 100644 > --- a/target/s390x/gen-features.c > +++ b/target/s390x/gen-features.c > @@ -338,6 +338,14 @@ static uint16_t base_GEN13_GA1[] = { > > #define base_GEN13_GA2 EmptyFeat > > +static uint16_t base_GEN14_GA1[] = { > + S390_FEAT_ENTROPY_ENC_COMP, > + S390_FEAT_MISC_INSTRUCTION_EXT, > + S390_FEAT_SEMAPHORE_ASSIST, > + S390_FEAT_TIME_SLICE_INSTRUMENTATION, > + S390_FEAT_ORDER_PRESERVING_COMPRESSION, > +}; > + > /* 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 > @@ -442,6 +450,23 @@ static uint16_t full_GEN13_GA1[] = { > > #define full_GEN13_GA2 EmptyFeat > > +static uint16_t full_GEN14_GA1[] = { > + S390_FEAT_INSTRUCTION_EXEC_PROT, > + S390_FEAT_GUARDED_STORAGE, > + S390_FEAT_VECTOR_PACKED_DECIMAL, > + S390_FEAT_VECTOR_ENH, > + S390_FEAT_MULTIPLE_EPOCH, > + S390_FEAT_TEST_PENDING_EXT_INTERRUPTION, > + S390_FEAT_INSERT_REFERENCE_BITS_MULT, > + S390_FEAT_GROUP_MSA_EXT_6, > + S390_FEAT_GROUP_MSA_EXT_7, > + S390_FEAT_GROUP_MSA_EXT_8, > + S390_FEAT_CMM_NT, > + S390_FEAT_HPMA2, > + S390_FEAT_SIE_KSS, > + S390_FEAT_ORDER_PRESERVING_COMPRESSION, Just realized that this is redundant. since ORDER_PRESERVING is also part of the base model, I will remove it here in my pull request.