diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-07-16 16:05:42 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-07-16 16:05:42 +0100 |
| commit | 1a1c0995cd4f8fe3bfeaac4e7a42e6125d6e05e7 (patch) | |
| tree | 0615516e4363405a3297d441d5d9998756bba824 | |
| parent | 697f59243f5a28b8a243ff5ad59e34bbecffcae1 (diff) | |
| parent | 5d8866c89817998a3d9c3055d5dc2b5a8e78658a (diff) | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20190716' into staging
straighten out some things in the gen15 cpu model
# gpg: Signature made Tue 16 Jul 2019 14:50:34 BST
# gpg: using RSA key C3D0D66DC3624FF6A8C018CEDECF6B93C6F02FAF
# gpg: issuer "cohuck@redhat.com"
# gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>" [unknown]
# gpg: aka "Cornelia Huck <huckc@linux.vnet.ibm.com>" [full]
# gpg: aka "Cornelia Huck <cornelia.huck@de.ibm.com>" [full]
# gpg: aka "Cornelia Huck <cohuck@kernel.org>" [unknown]
# gpg: aka "Cornelia Huck <cohuck@redhat.com>" [unknown]
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0 18CE DECF 6B93 C6F0 2FAF
* remotes/cohuck/tags/s390x-20190716:
s390x/cpumodel: change internal name of vxpdeh to match description
s390x/cpumodel: also change name of vxbeh
s390x/cpumodel: remove esort from the default model
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | target/s390x/cpu_features_def.inc.h | 2 | ||||
| -rw-r--r-- | target/s390x/gen-features.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/target/s390x/cpu_features_def.inc.h b/target/s390x/cpu_features_def.inc.h index 3118a9f892..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, "vxbeh", 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 9f216219ff..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, @@ -642,9 +642,8 @@ 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_VECTOR_PACKED_DECIMAL_ENH, S390_FEAT_GROUP_MSA_EXT_9, S390_FEAT_GROUP_MSA_EXT_9_PCKMO, S390_FEAT_ETOKEN, |