commit a1a4d49f60d2b899620ee2be4ebb991c4a90a026
author Peter Maydell <peter.maydell@linaro.org> Tue Jul 16 17:02:44 2019 +0100
committer Peter Maydell <peter.maydell@linaro.org> Tue Jul 16 17:02:44 2019 +0100
tree e171f34afb0e36c472fc07fc1a826e4cec5deb4d
parent 1a1c0995cd4f8fe3bfeaac4e7a42e6125d6e05e7
parent 611c749c3b86fe377c94ea301feab3d9ce3bf617

Merge remote-tracking branch 'remotes/philmd-gitlab/tags/pflash-next-20190716' into staging

pflash-next patches for v4.1.0-rc1

Trivial pflash fixes for rc1.

# gpg: Signature made Tue 16 Jul 2019 16:59:53 BST
# gpg:                using RSA key E3E32C2CDEADC0DE
# gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" [full]
# Primary key fingerprint: FAAB E75E 1291 7221 DCFD  6BB2 E3E3 2C2C DEAD C0DE

* remotes/philmd-gitlab/tags/pflash-next-20190716:
  hw/block/pflash_cfi01: Start state machine as READY to accept commands
  hw/block/pflash_cfi02: Explicit switch fallthrough for ERASE commands

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

target/s390x/cpu_features_def.inc.h

diff --git a/target/s390x/cpu_features_def.inc.h b/target/s390x/cpu_features_def.inc.h
index 3118a9f..31dff0d 100644
--- a/target/s390x/cpu_features_def.inc.h
+++ b/target/s390x/cpu_features_def.inc.h
@@ -104,7 +104,7 @@
 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

diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
index 9f21621..49a650a 100644
--- a/target/s390x/gen-features.c
+++ b/target/s390x/gen-features.c
@@ -558,7 +558,7 @@
     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_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,