From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:55326) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtV0y-0003ty-Cd for qemu-devel@nongnu.org; Tue, 12 Feb 2019 05:10:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtV0o-0000to-I2 for qemu-devel@nongnu.org; Tue, 12 Feb 2019 05:10:01 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:43140) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gtV0l-0000eZ-Ut for qemu-devel@nongnu.org; Tue, 12 Feb 2019 05:09:56 -0500 Received: from pps.filterd (m0098393.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x1CA9KcR023985 for ; Tue, 12 Feb 2019 05:09:38 -0500 Received: from e06smtp02.uk.ibm.com (e06smtp02.uk.ibm.com [195.75.94.98]) by mx0a-001b2d01.pphosted.com with ESMTP id 2qksg9y1a9-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 12 Feb 2019 05:09:37 -0500 Received: from localhost by e06smtp02.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 12 Feb 2019 10:09:35 -0000 References: <20190212011657.18324-1-walling@linux.ibm.com> From: Christian Borntraeger Date: Tue, 12 Feb 2019 11:09:29 +0100 MIME-Version: 1.0 In-Reply-To: <20190212011657.18324-1-walling@linux.ibm.com> Content-Language: en-US Message-Id: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH v2 1/3] s390x/cpumodel: mepochptff: warn when no mepoch and re-align group init List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Collin Walling , qemu-devel@nongnu.org, qemu-s390x@nongnu.org Cc: david@redhat.com, cohuck@redhat.com, pasic@linux.ibm.com, rth@twiddle.net On 12.02.2019 02:16, Collin Walling wrote: > The extended PTFF features (qsie, qtoue, stoe, stoue) are dependent > on the multiple-epoch facility (mepoch). Let's print a warning if these > features are enabled without mepoch. > > While we're at it, let's move the FEAT_GROUP_INIT for mepochptff down > the s390_feature_groups list so it can be properly indexed with its > generated S390FeatGroup enum. > > Signed-off-by: Collin Walling Looks sane. Reviewed-by: Christian Borntraeger > --- > target/s390x/cpu_features.c | 2 +- > target/s390x/cpu_models.c | 4 ++++ > 2 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/target/s390x/cpu_features.c b/target/s390x/cpu_features.c > index 60cfeba48f..1843c84aaa 100644 > --- a/target/s390x/cpu_features.c > +++ b/target/s390x/cpu_features.c > @@ -456,7 +456,6 @@ static S390FeatGroupDef s390_feature_groups[] = { > FEAT_GROUP_INIT("plo", PLO, "Perform-locked-operation facility"), > FEAT_GROUP_INIT("tods", TOD_CLOCK_STEERING, "Tod-clock-steering facility"), > FEAT_GROUP_INIT("gen13ptff", GEN13_PTFF, "PTFF enhancements introduced with z13"), > - FEAT_GROUP_INIT("mepochptff", MULTIPLE_EPOCH_PTFF, "PTFF enhancements introduced with Multiple-epoch facility"), > FEAT_GROUP_INIT("msa", MSA, "Message-security-assist facility"), > FEAT_GROUP_INIT("msa1", MSA_EXT_1, "Message-security-assist-extension 1 facility"), > FEAT_GROUP_INIT("msa2", MSA_EXT_2, "Message-security-assist-extension 2 facility"), > @@ -466,6 +465,7 @@ static S390FeatGroupDef s390_feature_groups[] = { > FEAT_GROUP_INIT("msa6", MSA_EXT_6, "Message-security-assist-extension 6 facility"), > FEAT_GROUP_INIT("msa7", MSA_EXT_7, "Message-security-assist-extension 7 facility"), > FEAT_GROUP_INIT("msa8", MSA_EXT_8, "Message-security-assist-extension 8 facility"), > + FEAT_GROUP_INIT("mepochptff", MULTIPLE_EPOCH_PTFF, "PTFF enhancements introduced with Multiple-epoch facility"), > }; > > const S390FeatGroupDef *s390_feat_group_def(S390FeatGroup group) > diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c > index 7c253ff308..b42b5fd327 100644 > --- a/target/s390x/cpu_models.c > +++ b/target/s390x/cpu_models.c > @@ -788,6 +788,10 @@ static void check_consistency(const S390CPUModel *model) > { S390_FEAT_SIE_KSS, S390_FEAT_SIE_F2 }, > { S390_FEAT_AP_QUERY_CONFIG_INFO, S390_FEAT_AP }, > { S390_FEAT_AP_FACILITIES_TEST, S390_FEAT_AP }, > + { S390_FEAT_PTFF_QSIE, S390_FEAT_MULTIPLE_EPOCH }, > + { S390_FEAT_PTFF_QTOUE, S390_FEAT_MULTIPLE_EPOCH }, > + { S390_FEAT_PTFF_STOE, S390_FEAT_MULTIPLE_EPOCH }, > + { S390_FEAT_PTFF_STOUE, S390_FEAT_MULTIPLE_EPOCH }, > }; > int i; > >