From nobody Fri May 3 20:12:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563285990; cv=none; d=zoho.com; s=zohoarc; b=GPeA826naljVNHAMcpkXJDiBF0iftH1XoZnLC14ogbhr2f7aqnELEyOiWKfly8WHHZiPl0Cr+OFWr+8iGJOOPgQOMfGNBTrWN5f3gG8mV43ush1ltJs9LavSRSYWU7RoeT2hI2++NyLVj7ltDwwVWewX4GYhSmytc/0zRS3NkUE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563285990; h=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:ARC-Authentication-Results; bh=5QkEZXWzdE+GHzNstKC75cGBkDEWHHTLbWmmT4PFrGg=; b=YoECstCbv6G8pCk4EkCk9eYWVyZT7DiBIM3AubVb54FhoAbMv7gDM/9fTokchRpDvpxU7ZB/8uaGl1xoAqt5maNSMNHBKNwa9KV9HQeLK8y0f88fcc4020aeLVXULomYbb85UbWUFWWWk2W4EQ8VhYWI9kbci8HEVqafU5yBGQk= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563285990967911.4085857508416; Tue, 16 Jul 2019 07:06:30 -0700 (PDT) Received: from localhost ([::1]:49400 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnO69-0003H9-Fd for importer@patchew.org; Tue, 16 Jul 2019 10:06:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35027) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnO5e-0001ZQ-1p for qemu-devel@nongnu.org; Tue, 16 Jul 2019 10:05:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnO5d-0000Fe-54 for qemu-devel@nongnu.org; Tue, 16 Jul 2019 10:05:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49337) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hnO5c-0000ES-Vo; Tue, 16 Jul 2019 10:05:57 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3F237308338E; Tue, 16 Jul 2019 14:05:56 +0000 (UTC) Received: from localhost (ovpn-117-180.ams2.redhat.com [10.36.117.180]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 86BD75DAAC; Tue, 16 Jul 2019 14:05:53 +0000 (UTC) From: Cornelia Huck To: Peter Maydell Date: Tue, 16 Jul 2019 16:05:44 +0200 Message-Id: <20190716140546.6661-2-cohuck@redhat.com> In-Reply-To: <20190716140546.6661-1-cohuck@redhat.com> References: <20190716140546.6661-1-cohuck@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Tue, 16 Jul 2019 14:05:56 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL for-4.1 1/3] s390x/cpumodel: remove esort from the default model 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: Thomas Huth , David Hildenbrand , Cornelia Huck , qemu-devel@nongnu.org, Christian Borntraeger , qemu-s390x@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Christian Borntraeger esort might not be available on all models. Fixes: caef62430fed6e73 ("s390x/cpumodel: add gen15 defintions") Signed-off-by: Christian Borntraeger Message-Id: <20190715142304.215018-2-borntraeger@de.ibm.com> Reviewed-by: David Hildenbrand Reviewed-by: Thomas Huth Signed-off-by: Cornelia Huck --- target/s390x/gen-features.c | 1 - 1 file changed, 1 deletion(-) diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c index 9f216219ff53..6debfc1d217e 100644 --- a/target/s390x/gen-features.c +++ b/target/s390x/gen-features.c @@ -642,7 +642,6 @@ static uint16_t default_GEN14_GA1[] =3D { =20 static uint16_t default_GEN15_GA1[] =3D { S390_FEAT_VECTOR_ENH2, - S390_FEAT_GROUP_ENH_SORT, S390_FEAT_GROUP_DEFLATE_CONVERSION, S390_FEAT_VECTOR_BCD_ENH, S390_FEAT_GROUP_MSA_EXT_9, --=20 2.20.1 From nobody Fri May 3 20:12:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563285993; cv=none; d=zoho.com; s=zohoarc; b=dmQUSfm6DXASwgqAxavQ/c2OmgG/dvfRb6X/oiedgKWnRy1AUQI0kekhQv6TijOwpPsuq053KEHeyiAJc0em+H3sOwOZDxcv/aXI2cuy1bSPY3nUz1VNHILgI2a4rdwUsNs1FmT9sx5mQ/W9QeY1S58UNm+HhPRlEqTkJWmfck8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563285993; h=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:ARC-Authentication-Results; bh=45bb3oKm1HNkEyAKT5IUxHYG0cMf77YRintaL9QLZHw=; b=RzjUizK7Ax2GzwXH7R9Vfi0FH9hqkI+0RspKsNlWXhVhagtEXYaHaNiURYAlwv3z+b4oGMfscpJm/5OYG+B4jN8jdttdmXfYxFYUBjYRo2KknsmE++RLBkpKPN28ySMlQmj0m0n2WdhgAT+gvNrHox3jX4yrLISWkMVzovE1P9U= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563285993317950.3154741509175; Tue, 16 Jul 2019 07:06:33 -0700 (PDT) Received: from localhost ([::1]:49402 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnO6C-0003Qx-4J for importer@patchew.org; Tue, 16 Jul 2019 10:06:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35137) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnO5n-0002D8-Ev for qemu-devel@nongnu.org; Tue, 16 Jul 2019 10:06:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnO5h-0000Iz-NR for qemu-devel@nongnu.org; Tue, 16 Jul 2019 10:06:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51356) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hnO5h-0000Ic-GS; Tue, 16 Jul 2019 10:06:01 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CD74AC06511D; Tue, 16 Jul 2019 14:06:00 +0000 (UTC) Received: from localhost (ovpn-117-180.ams2.redhat.com [10.36.117.180]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2E3AA60A9F; Tue, 16 Jul 2019 14:05:58 +0000 (UTC) From: Cornelia Huck To: Peter Maydell Date: Tue, 16 Jul 2019 16:05:45 +0200 Message-Id: <20190716140546.6661-3-cohuck@redhat.com> In-Reply-To: <20190716140546.6661-1-cohuck@redhat.com> References: <20190716140546.6661-1-cohuck@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 16 Jul 2019 14:06:00 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL for-4.1 2/3] s390x/cpumodel: also change name of vxbeh 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: Thomas Huth , David Hildenbrand , Cornelia Huck , qemu-devel@nongnu.org, Christian Borntraeger , qemu-s390x@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Christian Borntraeger David suggested to keep everything in sync as 4.1 is not yet released. This patch fixes the name "vxbeh" into "vxpdeh". To simplify the backports this patch will not change VECTOR_BCD_ENH as this is just an internal name. That will be done by an extra patch that does not need to be backported. Suggested-by: David Hildenbrand Fixes: d05be57ddc2e ("s390: cpumodel: fix description for the new vector fa= cility") Fixes: 54d65de0b525 ("s390x/cpumodel: vector enhancements") Signed-off-by: Christian Borntraeger Message-Id: <20190715142304.215018-3-borntraeger@de.ibm.com> [CH: vxp->vxpdeh, as discussed] Reviewed-by: David Hildenbrand Reviewed-by: Thomas Huth Signed-off-by: Cornelia Huck --- target/s390x/cpu_features_def.inc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/s390x/cpu_features_def.inc.h b/target/s390x/cpu_feature= s_def.inc.h index 3118a9f89228..05b7674affe6 100644 --- a/target/s390x/cpu_features_def.inc.h +++ b/target/s390x/cpu_features_def.inc.h @@ -104,7 +104,7 @@ DEF_FEAT(CMM_NT, "cmmnt", STFL, 147, "CMM: ESSA-enhance= ment (no translate) facil DEF_FEAT(VECTOR_ENH2, "vxeh2", STFL, 148, "Vector Enhancements facility 2") DEF_FEAT(ESORT_BASE, "esort-base", STFL, 150, "Enhanced-sort facility (exc= luding subfunctions)") DEF_FEAT(DEFLATE_BASE, "deflate-base", STFL, 151, "Deflate-conversion faci= lity (excluding subfunctions)") -DEF_FEAT(VECTOR_BCD_ENH, "vxbeh", STFL, 152, "Vector-Packed-Decimal-Enhanc= ement Facility") +DEF_FEAT(VECTOR_BCD_ENH, "vxpdeh", STFL, 152, "Vector-Packed-Decimal-Enhan= cement Facility") DEF_FEAT(MSA_EXT_9, "msa9-base", STFL, 155, "Message-security-assist-exten= sion-9 facility (excluding subfunctions)") DEF_FEAT(ETOKEN, "etoken", STFL, 156, "Etoken facility") =20 --=20 2.20.1 From nobody Fri May 3 20:12:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563286014; cv=none; d=zoho.com; s=zohoarc; b=Z+tm19GMwyJ/Rj9XDwBAIihi2W17rMHvWv+elv4kiQ3NHBDlf4ITc8vJtCke4gAI5on5rypaQ36jQRnSfgwTrWLPxpJijtmM0Ngb4ocM66WQpf+p1RTRvVNmDOithFcfJSfCCPr+e4Cbh6SjmLnj/D0vEnto0xWGNsxDiRR1NZw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563286014; h=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:ARC-Authentication-Results; bh=f6SsatgVLL/nFuXs0eiyv0S9DZ9V4f6Me8MCPOe+HGk=; b=NqbHawhO1fkIuolI8yDg8duntytUG79muUUWb3LDgF0djnFqmmk7dGVRj29g0V7bPKTvIlbhiUZApmZF2zHXHk03vzG1pfY9tkA6KAeP8naCxbJnCQ7DLNpGq4kYN7aVtwR9pg4ffRqEWD1dEapvGTM8KJIWIs4QS7I5rXuW/Cg= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563286014365285.01089627163446; Tue, 16 Jul 2019 07:06:54 -0700 (PDT) Received: from localhost ([::1]:49416 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnO6X-0005JF-3W for importer@patchew.org; Tue, 16 Jul 2019 10:06:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35200) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnO5v-0002pB-W9 for qemu-devel@nongnu.org; Tue, 16 Jul 2019 10:06:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnO5r-0000Nt-4r for qemu-devel@nongnu.org; Tue, 16 Jul 2019 10:06:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46154) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hnO5n-0000Lo-Eq; Tue, 16 Jul 2019 10:06:09 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A2687300CB0B; Tue, 16 Jul 2019 14:06:06 +0000 (UTC) Received: from localhost (ovpn-117-180.ams2.redhat.com [10.36.117.180]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 18C265C221; Tue, 16 Jul 2019 14:06:02 +0000 (UTC) From: Cornelia Huck To: Peter Maydell Date: Tue, 16 Jul 2019 16:05:46 +0200 Message-Id: <20190716140546.6661-4-cohuck@redhat.com> In-Reply-To: <20190716140546.6661-1-cohuck@redhat.com> References: <20190716140546.6661-1-cohuck@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Tue, 16 Jul 2019 14:06:06 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL for-4.1 3/3] s390x/cpumodel: change internal name of vxpdeh to match description 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: Thomas Huth , David Hildenbrand , Cornelia Huck , qemu-devel@nongnu.org, Christian Borntraeger , qemu-s390x@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Christian Borntraeger The internal macro name VECTOR_BCD_ENH does not match the actual description. Fix this. Signed-off-by: Christian Borntraeger Message-Id: <20190715142304.215018-4-borntraeger@de.ibm.com> [CH: vxp->vxpdeh, as discussed] Reviewed-by: David Hildenbrand Reviewed-by: Thomas Huth Signed-off-by: Cornelia Huck --- target/s390x/cpu_features_def.inc.h | 2 +- target/s390x/gen-features.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/s390x/cpu_features_def.inc.h b/target/s390x/cpu_feature= s_def.inc.h index 05b7674affe6..31dff0d84e97 100644 --- a/target/s390x/cpu_features_def.inc.h +++ b/target/s390x/cpu_features_def.inc.h @@ -104,7 +104,7 @@ DEF_FEAT(CMM_NT, "cmmnt", STFL, 147, "CMM: ESSA-enhance= ment (no translate) facil DEF_FEAT(VECTOR_ENH2, "vxeh2", STFL, 148, "Vector Enhancements facility 2") DEF_FEAT(ESORT_BASE, "esort-base", STFL, 150, "Enhanced-sort facility (exc= luding subfunctions)") DEF_FEAT(DEFLATE_BASE, "deflate-base", STFL, 151, "Deflate-conversion faci= lity (excluding subfunctions)") -DEF_FEAT(VECTOR_BCD_ENH, "vxpdeh", STFL, 152, "Vector-Packed-Decimal-Enhan= cement Facility") +DEF_FEAT(VECTOR_PACKED_DECIMAL_ENH, "vxpdeh", STFL, 152, "Vector-Packed-De= cimal-Enhancement Facility") DEF_FEAT(MSA_EXT_9, "msa9-base", STFL, 155, "Message-security-assist-exten= sion-9 facility (excluding subfunctions)") DEF_FEAT(ETOKEN, "etoken", STFL, 156, "Etoken facility") =20 diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c index 6debfc1d217e..49a650ac52d0 100644 --- a/target/s390x/gen-features.c +++ b/target/s390x/gen-features.c @@ -558,7 +558,7 @@ static uint16_t full_GEN15_GA1[] =3D { S390_FEAT_VECTOR_ENH2, S390_FEAT_GROUP_ENH_SORT, S390_FEAT_GROUP_DEFLATE_CONVERSION, - S390_FEAT_VECTOR_BCD_ENH, + S390_FEAT_VECTOR_PACKED_DECIMAL_ENH, S390_FEAT_GROUP_MSA_EXT_9, S390_FEAT_GROUP_MSA_EXT_9_PCKMO, S390_FEAT_ETOKEN, @@ -643,7 +643,7 @@ static uint16_t default_GEN14_GA1[] =3D { static uint16_t default_GEN15_GA1[] =3D { S390_FEAT_VECTOR_ENH2, S390_FEAT_GROUP_DEFLATE_CONVERSION, - S390_FEAT_VECTOR_BCD_ENH, + S390_FEAT_VECTOR_PACKED_DECIMAL_ENH, S390_FEAT_GROUP_MSA_EXT_9, S390_FEAT_GROUP_MSA_EXT_9_PCKMO, S390_FEAT_ETOKEN, --=20 2.20.1