Commit 1a1c0995 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 697f5924 5d8866c8

target/s390x/cpu_features_def.inc.h

+1 −1
Original line number Diff line number Diff line
@@ -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")

target/s390x/gen-features.c

+2 −3
Original line number Diff line number Diff line
@@ -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,