From de6bb08570065eb318849dfd7f316448e51197b5 Mon Sep 17 00:00:00 2001 From: Christian Borntraeger Date: Mon, 15 Jul 2019 16:23:02 +0200 Subject: [PATCH 1/3] s390x/cpumodel: remove esort from the default model 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 9f216219ff..6debfc1d21 100644 --- a/target/s390x/gen-features.c +++ b/target/s390x/gen-features.c @@ -642,7 +642,6 @@ static uint16_t default_GEN14_GA1[] = { static uint16_t default_GEN15_GA1[] = { 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, From 0d4cb295db7503fbac2f5bb3e878a56630231fed Mon Sep 17 00:00:00 2001 From: Christian Borntraeger Date: Mon, 15 Jul 2019 16:23:03 +0200 Subject: [PATCH 2/3] s390x/cpumodel: also change name of vxbeh 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 facility") 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_features_def.inc.h index 3118a9f892..05b7674aff 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-enhancement (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 (excluding subfunctions)") DEF_FEAT(DEFLATE_BASE, "deflate-base", STFL, 151, "Deflate-conversion facility (excluding subfunctions)") -DEF_FEAT(VECTOR_BCD_ENH, "vxbeh", STFL, 152, "Vector-Packed-Decimal-Enhancement Facility") +DEF_FEAT(VECTOR_BCD_ENH, "vxpdeh", STFL, 152, "Vector-Packed-Decimal-Enhancement Facility") DEF_FEAT(MSA_EXT_9, "msa9-base", STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)") DEF_FEAT(ETOKEN, "etoken", STFL, 156, "Etoken facility") From 5d8866c89817998a3d9c3055d5dc2b5a8e78658a Mon Sep 17 00:00:00 2001 From: Christian Borntraeger Date: Mon, 15 Jul 2019 16:23:04 +0200 Subject: [PATCH 3/3] s390x/cpumodel: change internal name of vxpdeh to match description 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_features_def.inc.h index 05b7674aff..31dff0d84e 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-enhancement (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 (excluding subfunctions)") DEF_FEAT(DEFLATE_BASE, "deflate-base", STFL, 151, "Deflate-conversion facility (excluding subfunctions)") -DEF_FEAT(VECTOR_BCD_ENH, "vxpdeh", STFL, 152, "Vector-Packed-Decimal-Enhancement Facility") +DEF_FEAT(VECTOR_PACKED_DECIMAL_ENH, "vxpdeh", STFL, 152, "Vector-Packed-Decimal-Enhancement Facility") DEF_FEAT(MSA_EXT_9, "msa9-base", STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)") DEF_FEAT(ETOKEN, "etoken", STFL, 156, "Etoken facility") diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c index 6debfc1d21..49a650ac52 100644 --- a/target/s390x/gen-features.c +++ b/target/s390x/gen-features.c @@ -558,7 +558,7 @@ static uint16_t full_GEN15_GA1[] = { 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[] = { static uint16_t default_GEN15_GA1[] = { 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,