From 7d9350b6ad9f0b5dcdd098092eb3760bdbcf9d54 Mon Sep 17 00:00:00 2001

From: Thomas Huth <thuth@redhat.com>

Date: Wed, 18 Sep 2019 14:35:48 +0100

Subject: [PATCH 09/22] s390x/cpumodel: Rework CPU feature definition

RH-Author: Thomas Huth <thuth@redhat.com>

Message-id: <20190918143549.16340-2-thuth@redhat.com>

Patchwork-id: 90759

O-Subject: [RHEL-8.2.0 qemu-kvm PATCH 1/2] s390x/cpumodel: Rework CPU feature definition

Bugzilla: 1660909

RH-Acked-by: David Hildenbrand <david@redhat.com>

RH-Acked-by: Cornelia Huck <cohuck@redhat.com>

RH-Acked-by: Jens Freimann <jfreimann@redhat.com>

Let's define features at a single spot and make it less error prone to

define new features.

Acked-by: Janosch Frank <frankja@linux.ibm.com>

Acked-by: Cornelia Huck <cohuck@redhat.com>

Signed-off-by: David Hildenbrand <david@redhat.com>

(cherry picked from commit 220ae9002f33480fa30050140c852847677b3c06)

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

Conflicts:

    The "vxpdeh" line needed adaption due to out-of-order backported commits:

    d05be57ddc2e1722f527aa4c20d84dfd15c840ec

    s390: cpumodel: fix description for the new vector facility

    0d4cb295db7503fbac2f5bb3e878a56630231fed

    s390x/cpumodel: also change name of vxbeh

    5d8866c89817998a3d9c3055d5dc2b5a8e78658a

    s390x/cpumodel: change internal name of vxpdeh to match description

Signed-off-by: Thomas Huth <thuth@redhat.com>

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 target/s390x/cpu_features.c         | 352 ++--------------------------------

 target/s390x/cpu_features_def.h     | 352 +---------------------------------

 target/s390x/cpu_features_def.inc.h | 369 ++++++++++++++++++++++++++++++++++++

 3 files changed, 386 insertions(+), 687 deletions(-)

 create mode 100644 target/s390x/cpu_features_def.inc.h

diff --git a/target/s390x/cpu_features.c b/target/s390x/cpu_features.c

index 065db76..9f817e3 100644

--- a/target/s390x/cpu_features.c

+++ b/target/s390x/cpu_features.c

@@ -2,8 +2,9 @@

  * CPU features/facilities for s390x

  *

  * Copyright IBM Corp. 2016, 2018

+ * Copyright Red Hat, Inc. 2019

  *

- * Author(s): David Hildenbrand <dahi@linux.vnet.ibm.com>

+ * Author(s): David Hildenbrand <david@redhat.com>

  *

  * This work is licensed under the terms of the GNU GPL, version 2 or (at

  * your option) any later version. See the COPYING file in the top-level

@@ -14,346 +15,17 @@

 #include "qemu/module.h"

 #include "cpu_features.h"

-#define FEAT_INIT(_name, _type, _bit, _desc) \

-    {                                                \

-        .name = _name,                               \

-        .type = _type,                               \

-        .bit = _bit,                                 \

-        .desc = _desc,                               \

-    }

-

-/* S390FeatDef.bit is not applicable as there is no feature block. */

-#define FEAT_INIT_MISC(_name, _desc)                 \

-            FEAT_INIT(_name, S390_FEAT_TYPE_MISC, 0, _desc)

-

-/* indexed by feature number for easy lookup */

-static const S390FeatDef s390_features[] = {

-    FEAT_INIT("esan3", S390_FEAT_TYPE_STFL, 0, "Instructions marked as n3"),

-    FEAT_INIT("zarch", S390_FEAT_TYPE_STFL, 1, "z/Architecture architectural mode"),

-    FEAT_INIT("dateh", S390_FEAT_TYPE_STFL, 3, "DAT-enhancement facility"),

-    FEAT_INIT("idtes", S390_FEAT_TYPE_STFL, 4, "IDTE selective TLB segment-table clearing"),

-    FEAT_INIT("idter", S390_FEAT_TYPE_STFL, 5, "IDTE selective TLB region-table clearing"),

-    FEAT_INIT("asnlxr", S390_FEAT_TYPE_STFL, 6, "ASN-and-LX reuse facility"),

-    FEAT_INIT("stfle", S390_FEAT_TYPE_STFL, 7, "Store-facility-list-extended facility"),

-    FEAT_INIT("edat", S390_FEAT_TYPE_STFL, 8, "Enhanced-DAT facility"),

-    FEAT_INIT("srs", S390_FEAT_TYPE_STFL, 9, "Sense-running-status facility"),

-    FEAT_INIT("csske", S390_FEAT_TYPE_STFL, 10, "Conditional-SSKE facility"),

-    FEAT_INIT("ctop", S390_FEAT_TYPE_STFL, 11, "Configuration-topology facility"),

-    FEAT_INIT("apqci", S390_FEAT_TYPE_STFL, 12, "Query AP Configuration Information facility"),

-    FEAT_INIT("ipter", S390_FEAT_TYPE_STFL, 13, "IPTE-range facility"),

-    FEAT_INIT("nonqks", S390_FEAT_TYPE_STFL, 14, "Nonquiescing key-setting facility"),

-    FEAT_INIT("apft", S390_FEAT_TYPE_STFL, 15, "AP Facilities Test facility"),

-    FEAT_INIT("etf2", S390_FEAT_TYPE_STFL, 16, "Extended-translation facility 2"),

-    FEAT_INIT("msa-base", S390_FEAT_TYPE_STFL, 17, "Message-security-assist facility (excluding subfunctions)"),

-    FEAT_INIT("ldisp", S390_FEAT_TYPE_STFL, 18, "Long-displacement facility"),

-    FEAT_INIT("ldisphp", S390_FEAT_TYPE_STFL, 19, "Long-displacement facility has high performance"),

-    FEAT_INIT("hfpm", S390_FEAT_TYPE_STFL, 20, "HFP-multiply-add/subtract facility"),

-    FEAT_INIT("eimm", S390_FEAT_TYPE_STFL, 21, "Extended-immediate facility"),

-    FEAT_INIT("etf3", S390_FEAT_TYPE_STFL, 22, "Extended-translation facility 3"),

-    FEAT_INIT("hfpue", S390_FEAT_TYPE_STFL, 23, "HFP-unnormalized-extension facility"),

-    FEAT_INIT("etf2eh", S390_FEAT_TYPE_STFL, 24, "ETF2-enhancement facility"),

-    FEAT_INIT("stckf", S390_FEAT_TYPE_STFL, 25, "Store-clock-fast facility"),

-    FEAT_INIT("parseh", S390_FEAT_TYPE_STFL, 26, "Parsing-enhancement facility"),

-    FEAT_INIT("mvcos", S390_FEAT_TYPE_STFL, 27, "Move-with-optional-specification facility"),

-    FEAT_INIT("tods-base", S390_FEAT_TYPE_STFL, 28, "TOD-clock-steering facility (excluding subfunctions)"),

-    FEAT_INIT("etf3eh", S390_FEAT_TYPE_STFL, 30, "ETF3-enhancement facility"),

-    FEAT_INIT("ectg", S390_FEAT_TYPE_STFL, 31, "Extract-CPU-time facility"),

-    FEAT_INIT("csst", S390_FEAT_TYPE_STFL, 32, "Compare-and-swap-and-store facility"),

-    FEAT_INIT("csst2", S390_FEAT_TYPE_STFL, 33, "Compare-and-swap-and-store facility 2"),

-    FEAT_INIT("ginste", S390_FEAT_TYPE_STFL, 34, "General-instructions-extension facility"),

-    FEAT_INIT("exrl", S390_FEAT_TYPE_STFL, 35, "Execute-extensions facility"),

-    FEAT_INIT("emon", S390_FEAT_TYPE_STFL, 36, "Enhanced-monitor facility"),

-    FEAT_INIT("fpe", S390_FEAT_TYPE_STFL, 37, "Floating-point extension facility"),

-    FEAT_INIT("opc", S390_FEAT_TYPE_STFL, 38, "Order Preserving Compression facility"),

-    FEAT_INIT("sprogp", S390_FEAT_TYPE_STFL, 40, "Set-program-parameters facility"),

-    FEAT_INIT("fpseh", S390_FEAT_TYPE_STFL, 41, "Floating-point-support-enhancement facilities"),

-    FEAT_INIT("dfp", S390_FEAT_TYPE_STFL, 42, "DFP (decimal-floating-point) facility"),

-    FEAT_INIT("dfphp", S390_FEAT_TYPE_STFL, 43, "DFP (decimal-floating-point) facility has high performance"),

-    FEAT_INIT("pfpo", S390_FEAT_TYPE_STFL, 44, "PFPO instruction"),

-    FEAT_INIT("stfle45", S390_FEAT_TYPE_STFL, 45, "Various facilities introduced with z196"),

-    FEAT_INIT("cmpsceh", S390_FEAT_TYPE_STFL, 47, "CMPSC-enhancement facility"),

-    FEAT_INIT("dfpzc", S390_FEAT_TYPE_STFL, 48, "Decimal-floating-point zoned-conversion facility"),

-    FEAT_INIT("stfle49", S390_FEAT_TYPE_STFL, 49, "Various facilities introduced with zEC12"),

-    FEAT_INIT("cte", S390_FEAT_TYPE_STFL, 50, "Constrained transactional-execution facility"),

-    FEAT_INIT("ltlbc", S390_FEAT_TYPE_STFL, 51, "Local-TLB-clearing facility"),

-    FEAT_INIT("iacc2", S390_FEAT_TYPE_STFL, 52, "Interlocked-access facility 2"),

-    FEAT_INIT("stfle53", S390_FEAT_TYPE_STFL, 53, "Various facilities introduced with z13"),

-    FEAT_INIT("eec", S390_FEAT_TYPE_STFL, 54, "Entropy encoding compression facility"),

-    FEAT_INIT("msa5-base", S390_FEAT_TYPE_STFL, 57, "Message-security-assist-extension-5 facility (excluding subfunctions)"),

-    FEAT_INIT("minste2", S390_FEAT_TYPE_STFL, 58, "Miscellaneous-instruction-extensions facility 2"),

-    FEAT_INIT("sema", S390_FEAT_TYPE_STFL, 59, "Semaphore-assist facility"),

-    FEAT_INIT("tsi", S390_FEAT_TYPE_STFL, 60, "Time-slice Instrumentation facility"),

-    FEAT_INIT("minste3", S390_FEAT_TYPE_STFL, 61, "Miscellaneous-Instruction-Extensions Facility 3"),

-    FEAT_INIT("ri", S390_FEAT_TYPE_STFL, 64, "CPU runtime-instrumentation facility"),

-    FEAT_INIT("zpci", S390_FEAT_TYPE_STFL, 69, "z/PCI facility"),

-    FEAT_INIT("aen", S390_FEAT_TYPE_STFL, 71, "General-purpose-adapter-event-notification facility"),

-    FEAT_INIT("ais", S390_FEAT_TYPE_STFL, 72, "General-purpose-adapter-interruption-suppression facility"),

-    FEAT_INIT("te", S390_FEAT_TYPE_STFL, 73, "Transactional-execution facility"),

-    FEAT_INIT("sthyi", S390_FEAT_TYPE_STFL, 74, "Store-hypervisor-information facility"),

-    FEAT_INIT("aefsi", S390_FEAT_TYPE_STFL, 75, "Access-exception-fetch/store-indication facility"),

-    FEAT_INIT("msa3-base", S390_FEAT_TYPE_STFL, 76, "Message-security-assist-extension-3 facility (excluding subfunctions)"),

-    FEAT_INIT("msa4-base", S390_FEAT_TYPE_STFL, 77, "Message-security-assist-extension-4 facility (excluding subfunctions)"),

-    FEAT_INIT("edat2", S390_FEAT_TYPE_STFL, 78, "Enhanced-DAT facility 2"),

-    FEAT_INIT("dfppc", S390_FEAT_TYPE_STFL, 80, "Decimal-floating-point packed-conversion facility"),

-    FEAT_INIT("ppa15", S390_FEAT_TYPE_STFL, 81, "PPA15 is installed"),

-    FEAT_INIT("bpb", S390_FEAT_TYPE_STFL, 82, "Branch prediction blocking"),

-    FEAT_INIT("vx", S390_FEAT_TYPE_STFL, 129, "Vector facility"),

-    FEAT_INIT("iep", S390_FEAT_TYPE_STFL, 130, "Instruction-execution-protection facility"),

-    FEAT_INIT("sea_esop2", S390_FEAT_TYPE_STFL, 131, "Side-effect-access facility and Enhanced-suppression-on-protection facility 2"),

-    FEAT_INIT("gs", S390_FEAT_TYPE_STFL, 133, "Guarded-storage facility"),

-    FEAT_INIT("vxpd", S390_FEAT_TYPE_STFL, 134, "Vector packed decimal facility"),

-    FEAT_INIT("vxeh", S390_FEAT_TYPE_STFL, 135, "Vector enhancements facility"),

-    FEAT_INIT("mepoch", S390_FEAT_TYPE_STFL, 139, "Multiple-epoch facility"),

-    FEAT_INIT("tpei", S390_FEAT_TYPE_STFL, 144, "Test-pending-external-interruption facility"),

-    FEAT_INIT("irbm", S390_FEAT_TYPE_STFL, 145, "Insert-reference-bits-multiple facility"),

-    FEAT_INIT("msa8-base", S390_FEAT_TYPE_STFL, 146, "Message-security-assist-extension-8 facility (excluding subfunctions)"),

-    FEAT_INIT("cmmnt", S390_FEAT_TYPE_STFL, 147, "CMM: ESSA-enhancement (no translate) facility"),

-    FEAT_INIT("vxeh2", S390_FEAT_TYPE_STFL, 148, "Vector Enhancements facility 2"),

-    FEAT_INIT("esort-base", S390_FEAT_TYPE_STFL, 150, "Enhanced-sort facility (excluding subfunctions)"),

-    FEAT_INIT("deflate-base", S390_FEAT_TYPE_STFL, 151, "Deflate-conversion facility (excluding subfunctions)"),

-    FEAT_INIT("vxpdeh", S390_FEAT_TYPE_STFL, 152, "Vector-Packed-Decimal-Enhancement Facility"),

-    FEAT_INIT("msa9-base", S390_FEAT_TYPE_STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)"),

-    FEAT_INIT("etoken", S390_FEAT_TYPE_STFL, 156, "Etoken facility"),

-

-    /* SCLP SCCB Byte 80 - 98  (bit numbers relative to byte-80) */

-    FEAT_INIT("gsls", S390_FEAT_TYPE_SCLP_CONF_CHAR, 40, "SIE: Guest-storage-limit-suppression facility"),

-    FEAT_INIT("esop", S390_FEAT_TYPE_SCLP_CONF_CHAR, 46, "Enhanced-suppression-on-protection facility"),

-    FEAT_INIT("hpma2", S390_FEAT_TYPE_SCLP_CONF_CHAR, 90, "Host page management assist 2 Facility"), /* 91-2 */

-    FEAT_INIT("kss", S390_FEAT_TYPE_SCLP_CONF_CHAR, 151, "SIE: Keyless-subset facility"),  /* 98-7 */

-

-    /* SCLP SCCB Byte 116 - 119 (bit numbers relative to byte-116) */

-    FEAT_INIT("64bscao", S390_FEAT_TYPE_SCLP_CONF_CHAR_EXT, 0, "SIE: 64-bit-SCAO facility"),

-    FEAT_INIT("cmma", S390_FEAT_TYPE_SCLP_CONF_CHAR_EXT, 1, "SIE: Collaborative-memory-management assist"),

-    FEAT_INIT("pfmfi", S390_FEAT_TYPE_SCLP_CONF_CHAR_EXT, 9, "SIE: PFMF interpretation facility"),

-    FEAT_INIT("ibs", S390_FEAT_TYPE_SCLP_CONF_CHAR_EXT, 10, "SIE: Interlock-and-broadcast-suppression facility"),

-

-    FEAT_INIT("sief2", S390_FEAT_TYPE_SCLP_CPU, 4, "SIE: interception format 2 (Virtual SIE)"),

-    FEAT_INIT("skey", S390_FEAT_TYPE_SCLP_CPU, 5, "SIE: Storage-key facility"),

-    FEAT_INIT("gpereh", S390_FEAT_TYPE_SCLP_CPU, 10, "SIE: Guest-PER enhancement facility"),

-    FEAT_INIT("siif", S390_FEAT_TYPE_SCLP_CPU, 11, "SIE: Shared IPTE-interlock facility"),

-    FEAT_INIT("sigpif", S390_FEAT_TYPE_SCLP_CPU, 12, "SIE: SIGP interpretation facility"),

-    FEAT_INIT("ib", S390_FEAT_TYPE_SCLP_CPU, 42, "SIE: Intervention bypass facility"),

-    FEAT_INIT("cei", S390_FEAT_TYPE_SCLP_CPU, 43, "SIE: Conditional-external-interception facility"),

-

-    FEAT_INIT_MISC("dateh2", "DAT-enhancement facility 2"),

-    FEAT_INIT_MISC("cmm", "Collaborative-memory-management facility"),

-    FEAT_INIT_MISC("ap", "AP instructions installed"),

-

-    FEAT_INIT("plo-cl", S390_FEAT_TYPE_PLO, 0, "PLO Compare and load (32 bit in general registers)"),

-    FEAT_INIT("plo-clg", S390_FEAT_TYPE_PLO, 1, "PLO Compare and load (64 bit in parameter list)"),

-    FEAT_INIT("plo-clgr", S390_FEAT_TYPE_PLO, 2, "PLO Compare and load (32 bit in general registers)"),

-    FEAT_INIT("plo-clx", S390_FEAT_TYPE_PLO, 3, "PLO Compare and load (128 bit in parameter list)"),

-    FEAT_INIT("plo-cs", S390_FEAT_TYPE_PLO, 4, "PLO Compare and swap (32 bit in general registers)"),

-    FEAT_INIT("plo-csg", S390_FEAT_TYPE_PLO, 5, "PLO Compare and swap (64 bit in parameter list)"),

-    FEAT_INIT("plo-csgr", S390_FEAT_TYPE_PLO, 6, "PLO Compare and swap (32 bit in general registers)"),

-    FEAT_INIT("plo-csx", S390_FEAT_TYPE_PLO, 7, "PLO Compare and swap (128 bit in parameter list)"),

-    FEAT_INIT("plo-dcs", S390_FEAT_TYPE_PLO, 8, "PLO Double compare and swap (32 bit in general registers)"),

-    FEAT_INIT("plo-dcsg", S390_FEAT_TYPE_PLO, 9, "PLO Double compare and swap (64 bit in parameter list)"),

-    FEAT_INIT("plo-dcsgr", S390_FEAT_TYPE_PLO, 10, "PLO Double compare and swap (32 bit in general registers)"),

-    FEAT_INIT("plo-dcsx", S390_FEAT_TYPE_PLO, 11, "PLO Double compare and swap (128 bit in parameter list)"),

-    FEAT_INIT("plo-csst", S390_FEAT_TYPE_PLO, 12, "PLO Compare and swap and store (32 bit in general registers)"),

-    FEAT_INIT("plo-csstg", S390_FEAT_TYPE_PLO, 13, "PLO Compare and swap and store (64 bit in parameter list)"),

-    FEAT_INIT("plo-csstgr", S390_FEAT_TYPE_PLO, 14, "PLO Compare and swap and store (32 bit in general registers)"),

-    FEAT_INIT("plo-csstx", S390_FEAT_TYPE_PLO, 15, "PLO Compare and swap and store (128 bit in parameter list)"),

-    FEAT_INIT("plo-csdst", S390_FEAT_TYPE_PLO, 16, "PLO Compare and swap and double store (32 bit in general registers)"),

-    FEAT_INIT("plo-csdstg", S390_FEAT_TYPE_PLO, 17, "PLO Compare and swap and double store (64 bit in parameter list)"),

-    FEAT_INIT("plo-csdstgr", S390_FEAT_TYPE_PLO, 18, "PLO Compare and swap and double store (32 bit in general registers)"),

-    FEAT_INIT("plo-csdstx", S390_FEAT_TYPE_PLO, 19, "PLO Compare and swap and double store (128 bit in parameter list)"),

-    FEAT_INIT("plo-cstst", S390_FEAT_TYPE_PLO, 20, "PLO Compare and swap and triple store (32 bit in general registers)"),

-    FEAT_INIT("plo-cststg", S390_FEAT_TYPE_PLO, 21, "PLO Compare and swap and triple store (64 bit in parameter list)"),

-    FEAT_INIT("plo-cststgr", S390_FEAT_TYPE_PLO, 22, "PLO Compare and swap and triple store (32 bit in general registers)"),

-    FEAT_INIT("plo-cststx", S390_FEAT_TYPE_PLO, 23, "PLO Compare and swap and triple store (128 bit in parameter list)"),

-

-    FEAT_INIT("ptff-qto", S390_FEAT_TYPE_PTFF, 1, "PTFF Query TOD Offset"),

-    FEAT_INIT("ptff-qsi", S390_FEAT_TYPE_PTFF, 2, "PTFF Query Steering Information"),

-    FEAT_INIT("ptff-qpc", S390_FEAT_TYPE_PTFF, 3, "PTFF Query Physical Clock"),

-    FEAT_INIT("ptff-qui", S390_FEAT_TYPE_PTFF, 4, "PTFF Query UTC Information"),

-    FEAT_INIT("ptff-qtou", S390_FEAT_TYPE_PTFF, 5, "PTFF Query TOD Offset User"),

-    FEAT_INIT("ptff-qsie", S390_FEAT_TYPE_PTFF, 10, "PTFF Query Steering Information Extended"),

-    FEAT_INIT("ptff-qtoue", S390_FEAT_TYPE_PTFF, 13, "PTFF Query TOD Offset User Extended"),

-    FEAT_INIT("ptff-sto", S390_FEAT_TYPE_PTFF, 65, "PTFF Set TOD Offset"),

-    FEAT_INIT("ptff-stou", S390_FEAT_TYPE_PTFF, 69, "PTFF Set TOD Offset User"),

-    FEAT_INIT("ptff-stoe", S390_FEAT_TYPE_PTFF, 73, "PTFF Set TOD Offset Extended"),

-    FEAT_INIT("ptff-stoue", S390_FEAT_TYPE_PTFF, 77, "PTFF Set TOD Offset User Extended"),

-

-    FEAT_INIT("kmac-dea", S390_FEAT_TYPE_KMAC, 1, "KMAC DEA"),

-    FEAT_INIT("kmac-tdea-128", S390_FEAT_TYPE_KMAC, 2, "KMAC TDEA-128"),

-    FEAT_INIT("kmac-tdea-192", S390_FEAT_TYPE_KMAC, 3, "KMAC TDEA-192"),

-    FEAT_INIT("kmac-edea", S390_FEAT_TYPE_KMAC, 9, "KMAC Encrypted-DEA"),

-    FEAT_INIT("kmac-etdea-128", S390_FEAT_TYPE_KMAC, 10, "KMAC Encrypted-TDEA-128"),

-    FEAT_INIT("kmac-etdea-192", S390_FEAT_TYPE_KMAC, 11, "KMAC Encrypted-TDEA-192"),

-    FEAT_INIT("kmac-aes-128", S390_FEAT_TYPE_KMAC, 18, "KMAC AES-128"),

-    FEAT_INIT("kmac-aes-192", S390_FEAT_TYPE_KMAC, 19, "KMAC AES-192"),

-    FEAT_INIT("kmac-aes-256", S390_FEAT_TYPE_KMAC, 20, "KMAC AES-256"),

-    FEAT_INIT("kmac-eaes-128", S390_FEAT_TYPE_KMAC, 26, "KMAC Encrypted-AES-128"),

-    FEAT_INIT("kmac-eaes-192", S390_FEAT_TYPE_KMAC, 27, "KMAC Encrypted-AES-192"),

-    FEAT_INIT("kmac-eaes-256", S390_FEAT_TYPE_KMAC, 28, "KMAC Encrypted-AES-256"),

-

-    FEAT_INIT("kmc-dea", S390_FEAT_TYPE_KMC, 1, "KMC DEA"),

-    FEAT_INIT("kmc-tdea-128", S390_FEAT_TYPE_KMC, 2, "KMC TDEA-128"),

-    FEAT_INIT("kmc-tdea-192", S390_FEAT_TYPE_KMC, 3, "KMC TDEA-192"),

-    FEAT_INIT("kmc-edea", S390_FEAT_TYPE_KMC, 9, "KMC Encrypted-DEA"),

-    FEAT_INIT("kmc-etdea-128", S390_FEAT_TYPE_KMC, 10, "KMC Encrypted-TDEA-128"),

-    FEAT_INIT("kmc-etdea-192", S390_FEAT_TYPE_KMC, 11, "KMC Encrypted-TDEA-192"),

-    FEAT_INIT("kmc-aes-128", S390_FEAT_TYPE_KMC, 18, "KMC AES-128"),

-    FEAT_INIT("kmc-aes-192", S390_FEAT_TYPE_KMC, 19, "KMC AES-192"),

-    FEAT_INIT("kmc-aes-256", S390_FEAT_TYPE_KMC, 20, "KMC AES-256"),

-    FEAT_INIT("kmc-eaes-128", S390_FEAT_TYPE_KMC, 26, "KMC Encrypted-AES-128"),

-    FEAT_INIT("kmc-eaes-192", S390_FEAT_TYPE_KMC, 27, "KMC Encrypted-AES-192"),

-    FEAT_INIT("kmc-eaes-256", S390_FEAT_TYPE_KMC, 28, "KMC Encrypted-AES-256"),

-    FEAT_INIT("kmc-prng", S390_FEAT_TYPE_KMC, 67, "KMC PRNG"),

-

-    FEAT_INIT("km-dea", S390_FEAT_TYPE_KM, 1, "KM DEA"),

-    FEAT_INIT("km-tdea-128", S390_FEAT_TYPE_KM, 2, "KM TDEA-128"),

-    FEAT_INIT("km-tdea-192", S390_FEAT_TYPE_KM, 3, "KM TDEA-192"),

-    FEAT_INIT("km-edea", S390_FEAT_TYPE_KM, 9, "KM Encrypted-DEA"),

-    FEAT_INIT("km-etdea-128", S390_FEAT_TYPE_KM, 10, "KM Encrypted-TDEA-128"),

-    FEAT_INIT("km-etdea-192", S390_FEAT_TYPE_KM, 11, "KM Encrypted-TDEA-192"),

-    FEAT_INIT("km-aes-128", S390_FEAT_TYPE_KM, 18, "KM AES-128"),

-    FEAT_INIT("km-aes-192", S390_FEAT_TYPE_KM, 19, "KM AES-192"),

-    FEAT_INIT("km-aes-256", S390_FEAT_TYPE_KM, 20, "KM AES-256"),

-    FEAT_INIT("km-eaes-128", S390_FEAT_TYPE_KM, 26, "KM Encrypted-AES-128"),

-    FEAT_INIT("km-eaes-192", S390_FEAT_TYPE_KM, 27, "KM Encrypted-AES-192"),

-    FEAT_INIT("km-eaes-256", S390_FEAT_TYPE_KM, 28, "KM Encrypted-AES-256"),

-    FEAT_INIT("km-xts-aes-128", S390_FEAT_TYPE_KM, 50, "KM XTS-AES-128"),

-    FEAT_INIT("km-xts-aes-256", S390_FEAT_TYPE_KM, 52, "KM XTS-AES-256"),

-    FEAT_INIT("km-xts-eaes-128", S390_FEAT_TYPE_KM, 58, "KM XTS-Encrypted-AES-128"),

-    FEAT_INIT("km-xts-eaes-256", S390_FEAT_TYPE_KM, 60, "KM XTS-Encrypted-AES-256"),

-

-    FEAT_INIT("kimd-sha-1", S390_FEAT_TYPE_KIMD, 1, "KIMD SHA-1"),

-    FEAT_INIT("kimd-sha-256", S390_FEAT_TYPE_KIMD, 2, "KIMD SHA-256"),

-    FEAT_INIT("kimd-sha-512", S390_FEAT_TYPE_KIMD, 3, "KIMD SHA-512"),

-    FEAT_INIT("kimd-sha3-224", S390_FEAT_TYPE_KIMD, 32, "KIMD SHA3-224"),

-    FEAT_INIT("kimd-sha3-256", S390_FEAT_TYPE_KIMD, 33, "KIMD SHA3-256"),

-    FEAT_INIT("kimd-sha3-384", S390_FEAT_TYPE_KIMD, 34, "KIMD SHA3-384"),

-    FEAT_INIT("kimd-sha3-512", S390_FEAT_TYPE_KIMD, 35, "KIMD SHA3-512"),

-    FEAT_INIT("kimd-shake-128", S390_FEAT_TYPE_KIMD, 36, "KIMD SHAKE-128"),

-    FEAT_INIT("kimd-shake-256", S390_FEAT_TYPE_KIMD, 37, "KIMD SHAKE-256"),

-    FEAT_INIT("kimd-ghash", S390_FEAT_TYPE_KIMD, 65, "KIMD GHASH"),

-

-    FEAT_INIT("klmd-sha-1", S390_FEAT_TYPE_KLMD, 1, "KLMD SHA-1"),

-    FEAT_INIT("klmd-sha-256", S390_FEAT_TYPE_KLMD, 2, "KLMD SHA-256"),

-    FEAT_INIT("klmd-sha-512", S390_FEAT_TYPE_KLMD, 3, "KLMD SHA-512"),

-    FEAT_INIT("klmd-sha3-224", S390_FEAT_TYPE_KLMD, 32, "KLMD SHA3-224"),

-    FEAT_INIT("klmd-sha3-256", S390_FEAT_TYPE_KLMD, 33, "KLMD SHA3-256"),

-    FEAT_INIT("klmd-sha3-384", S390_FEAT_TYPE_KLMD, 34, "KLMD SHA3-384"),

-    FEAT_INIT("klmd-sha3-512", S390_FEAT_TYPE_KLMD, 35, "KLMD SHA3-512"),

-    FEAT_INIT("klmd-shake-128", S390_FEAT_TYPE_KLMD, 36, "KLMD SHAKE-128"),

-    FEAT_INIT("klmd-shake-256", S390_FEAT_TYPE_KLMD, 37, "KLMD SHAKE-256"),

-

-    FEAT_INIT("pckmo-edea", S390_FEAT_TYPE_PCKMO, 1, "PCKMO Encrypted-DEA-Key"),

-    FEAT_INIT("pckmo-etdea-128", S390_FEAT_TYPE_PCKMO, 2, "PCKMO Encrypted-TDEA-128-Key"),

-    FEAT_INIT("pckmo-etdea-192", S390_FEAT_TYPE_PCKMO, 3, "PCKMO Encrypted-TDEA-192-Key"),

-    FEAT_INIT("pckmo-aes-128", S390_FEAT_TYPE_PCKMO, 18, "PCKMO Encrypted-AES-128-Key"),

-    FEAT_INIT("pckmo-aes-192", S390_FEAT_TYPE_PCKMO, 19, "PCKMO Encrypted-AES-192-Key"),

-    FEAT_INIT("pckmo-aes-256", S390_FEAT_TYPE_PCKMO, 20, "PCKMO Encrypted-AES-256-Key"),

-    FEAT_INIT("pckmo-ecc-p256", S390_FEAT_TYPE_PCKMO, 32, "PCKMO Encrypt-ECC-P256-Key"),

-    FEAT_INIT("pckmo-ecc-p384", S390_FEAT_TYPE_PCKMO, 33, "PCKMO Encrypt-ECC-P384-Key"),

-    FEAT_INIT("pckmo-ecc-p521", S390_FEAT_TYPE_PCKMO, 34, "PCKMO Encrypt-ECC-P521-Key"),

-    FEAT_INIT("pckmo-ecc-ed25519", S390_FEAT_TYPE_PCKMO, 40 , "PCKMO Encrypt-ECC-Ed25519-Key"),

-    FEAT_INIT("pckmo-ecc-ed448", S390_FEAT_TYPE_PCKMO, 41 , "PCKMO Encrypt-ECC-Ed448-Key"),

-

-    FEAT_INIT("kmctr-dea", S390_FEAT_TYPE_KMCTR, 1, "KMCTR DEA"),

-    FEAT_INIT("kmctr-tdea-128", S390_FEAT_TYPE_KMCTR, 2, "KMCTR TDEA-128"),

-    FEAT_INIT("kmctr-tdea-192", S390_FEAT_TYPE_KMCTR, 3, "KMCTR TDEA-192"),

-    FEAT_INIT("kmctr-edea", S390_FEAT_TYPE_KMCTR, 9, "KMCTR Encrypted-DEA"),

-    FEAT_INIT("kmctr-etdea-128", S390_FEAT_TYPE_KMCTR, 10, "KMCTR Encrypted-TDEA-128"),

-    FEAT_INIT("kmctr-etdea-192", S390_FEAT_TYPE_KMCTR, 11, "KMCTR Encrypted-TDEA-192"),

-    FEAT_INIT("kmctr-aes-128", S390_FEAT_TYPE_KMCTR, 18, "KMCTR AES-128"),

-    FEAT_INIT("kmctr-aes-192", S390_FEAT_TYPE_KMCTR, 19, "KMCTR AES-192"),

-    FEAT_INIT("kmctr-aes-256", S390_FEAT_TYPE_KMCTR, 20, "KMCTR AES-256"),

-    FEAT_INIT("kmctr-eaes-128", S390_FEAT_TYPE_KMCTR, 26, "KMCTR Encrypted-AES-128"),

-    FEAT_INIT("kmctr-eaes-192", S390_FEAT_TYPE_KMCTR, 27, "KMCTR Encrypted-AES-192"),

-    FEAT_INIT("kmctr-eaes-256", S390_FEAT_TYPE_KMCTR, 28, "KMCTR Encrypted-AES-256"),

-

-    FEAT_INIT("kmf-dea", S390_FEAT_TYPE_KMF, 1, "KMF DEA"),

-    FEAT_INIT("kmf-tdea-128", S390_FEAT_TYPE_KMF, 2, "KMF TDEA-128"),

-    FEAT_INIT("kmf-tdea-192", S390_FEAT_TYPE_KMF, 3, "KMF TDEA-192"),

-    FEAT_INIT("kmf-edea", S390_FEAT_TYPE_KMF, 9, "KMF Encrypted-DEA"),

-    FEAT_INIT("kmf-etdea-128", S390_FEAT_TYPE_KMF, 10, "KMF Encrypted-TDEA-128"),

-    FEAT_INIT("kmf-etdea-192", S390_FEAT_TYPE_KMF, 11, "KMF Encrypted-TDEA-192"),

-    FEAT_INIT("kmf-aes-128", S390_FEAT_TYPE_KMF, 18, "KMF AES-128"),

-    FEAT_INIT("kmf-aes-192", S390_FEAT_TYPE_KMF, 19, "KMF AES-192"),

-    FEAT_INIT("kmf-aes-256", S390_FEAT_TYPE_KMF, 20, "KMF AES-256"),

-    FEAT_INIT("kmf-eaes-128", S390_FEAT_TYPE_KMF, 26, "KMF Encrypted-AES-128"),

-    FEAT_INIT("kmf-eaes-192", S390_FEAT_TYPE_KMF, 27, "KMF Encrypted-AES-192"),

-    FEAT_INIT("kmf-eaes-256", S390_FEAT_TYPE_KMF, 28, "KMF Encrypted-AES-256"),

-

-    FEAT_INIT("kmo-dea", S390_FEAT_TYPE_KMO, 1, "KMO DEA"),

-    FEAT_INIT("kmo-tdea-128", S390_FEAT_TYPE_KMO, 2, "KMO TDEA-128"),

-    FEAT_INIT("kmo-tdea-192", S390_FEAT_TYPE_KMO, 3, "KMO TDEA-192"),

-    FEAT_INIT("kmo-edea", S390_FEAT_TYPE_KMO, 9, "KMO Encrypted-DEA"),

-    FEAT_INIT("kmo-etdea-128", S390_FEAT_TYPE_KMO, 10, "KMO Encrypted-TDEA-128"),

-    FEAT_INIT("kmo-etdea-192", S390_FEAT_TYPE_KMO, 11, "KMO Encrypted-TDEA-192"),

-    FEAT_INIT("kmo-aes-128", S390_FEAT_TYPE_KMO, 18, "KMO AES-128"),

-    FEAT_INIT("kmo-aes-192", S390_FEAT_TYPE_KMO, 19, "KMO AES-192"),

-    FEAT_INIT("kmo-aes-256", S390_FEAT_TYPE_KMO, 20, "KMO AES-256"),

-    FEAT_INIT("kmo-eaes-128", S390_FEAT_TYPE_KMO, 26, "KMO Encrypted-AES-128"),

-    FEAT_INIT("kmo-eaes-192", S390_FEAT_TYPE_KMO, 27, "KMO Encrypted-AES-192"),

-    FEAT_INIT("kmo-eaes-256", S390_FEAT_TYPE_KMO, 28, "KMO Encrypted-AES-256"),

-

-    FEAT_INIT("pcc-cmac-dea", S390_FEAT_TYPE_PCC, 1, "PCC Compute-Last-Block-CMAC-Using-DEA"),

-    FEAT_INIT("pcc-cmac-tdea-128", S390_FEAT_TYPE_PCC, 2, "PCC Compute-Last-Block-CMAC-Using-TDEA-128"),

-    FEAT_INIT("pcc-cmac-tdea-192", S390_FEAT_TYPE_PCC, 3, "PCC Compute-Last-Block-CMAC-Using-TDEA-192"),

-    FEAT_INIT("pcc-cmac-edea", S390_FEAT_TYPE_PCC, 9, "PCC Compute-Last-Block-CMAC-Using-Encrypted-DEA"),

-    FEAT_INIT("pcc-cmac-etdea-128", S390_FEAT_TYPE_PCC, 10, "PCC Compute-Last-Block-CMAC-Using-Encrypted-TDEA-128"),

-    FEAT_INIT("pcc-cmac-etdea-192", S390_FEAT_TYPE_PCC, 11, "PCC Compute-Last-Block-CMAC-Using-EncryptedTDEA-192"),

-    FEAT_INIT("pcc-cmac-aes-128", S390_FEAT_TYPE_PCC, 18, "PCC Compute-Last-Block-CMAC-Using-AES-128"),

-    FEAT_INIT("pcc-cmac-aes-192", S390_FEAT_TYPE_PCC, 19, "PCC Compute-Last-Block-CMAC-Using-AES-192"),

-    FEAT_INIT("pcc-cmac-eaes-256", S390_FEAT_TYPE_PCC, 20, "PCC Compute-Last-Block-CMAC-Using-AES-256"),

-    FEAT_INIT("pcc-cmac-eaes-128", S390_FEAT_TYPE_PCC, 26, "PCC Compute-Last-Block-CMAC-Using-Encrypted-AES-128"),

-    FEAT_INIT("pcc-cmac-eaes-192", S390_FEAT_TYPE_PCC, 27, "PCC Compute-Last-Block-CMAC-Using-Encrypted-AES-192"),

-    FEAT_INIT("pcc-cmac-eaes-256", S390_FEAT_TYPE_PCC, 28, "PCC Compute-Last-Block-CMAC-Using-Encrypted-AES-256"),

-    FEAT_INIT("pcc-xts-aes-128", S390_FEAT_TYPE_PCC, 50, "PCC Compute-XTS-Parameter-Using-AES-128"),

-    FEAT_INIT("pcc-xts-aes-256", S390_FEAT_TYPE_PCC, 52, "PCC Compute-XTS-Parameter-Using-AES-256"),

-    FEAT_INIT("pcc-xts-eaes-128", S390_FEAT_TYPE_PCC, 58, "PCC Compute-XTS-Parameter-Using-Encrypted-AES-128"),

-    FEAT_INIT("pcc-xts-eaes-256", S390_FEAT_TYPE_PCC, 60, "PCC Compute-XTS-Parameter-Using-Encrypted-AES-256"),

-    FEAT_INIT("pcc-scalar-mult-p256", S390_FEAT_TYPE_PCC, 64, "PCC Scalar-Multiply-P256"),

-    FEAT_INIT("pcc-scalar-mult-p384", S390_FEAT_TYPE_PCC, 65, "PCC Scalar-Multiply-P384"),

-    FEAT_INIT("pcc-scalar-mult-p521", S390_FEAT_TYPE_PCC, 66, "PCC Scalar-Multiply-P521"),

-    FEAT_INIT("pcc-scalar-mult-ed25519", S390_FEAT_TYPE_PCC, 72, "PCC Scalar-Multiply-Ed25519"),

-    FEAT_INIT("pcc-scalar-mult-ed448", S390_FEAT_TYPE_PCC, 73, "PCC Scalar-Multiply-Ed448"),

-    FEAT_INIT("pcc-scalar-mult-x25519", S390_FEAT_TYPE_PCC, 80, "PCC Scalar-Multiply-X25519"),

-    FEAT_INIT("pcc-scalar-mult-x448", S390_FEAT_TYPE_PCC, 81, "PCC Scalar-Multiply-X448"),

-

-    FEAT_INIT("ppno-sha-512-drng", S390_FEAT_TYPE_PPNO, 3, "PPNO SHA-512-DRNG"),

-    FEAT_INIT("prno-trng-qrtcr", S390_FEAT_TYPE_PPNO, 112, "PRNO TRNG-Query-Raw-to-Conditioned-Ratio"),

-    FEAT_INIT("prno-trng", S390_FEAT_TYPE_PPNO, 114, "PRNO TRNG"),

-

-    FEAT_INIT("kma-gcm-aes-128", S390_FEAT_TYPE_KMA, 18, "KMA GCM-AES-128"),

-    FEAT_INIT("kma-gcm-aes-192", S390_FEAT_TYPE_KMA, 19, "KMA GCM-AES-192"),

-    FEAT_INIT("kma-gcm-aes-256", S390_FEAT_TYPE_KMA, 20, "KMA GCM-AES-256"),

-    FEAT_INIT("kma-gcm-eaes-128", S390_FEAT_TYPE_KMA, 26, "KMA GCM-Encrypted-AES-128"),

-    FEAT_INIT("kma-gcm-eaes-192", S390_FEAT_TYPE_KMA, 27, "KMA GCM-Encrypted-AES-192"),

-    FEAT_INIT("kma-gcm-eaes-256", S390_FEAT_TYPE_KMA, 28, "KMA GCM-Encrypted-AES-256"),

-

-    FEAT_INIT("kdsa-ecdsa-verify-p256", S390_FEAT_TYPE_KDSA, 1, "KDSA ECDSA-Verify-P256"),

-    FEAT_INIT("kdsa-ecdsa-verify-p384", S390_FEAT_TYPE_KDSA, 2, "KDSA ECDSA-Verify-P384"),

-    FEAT_INIT("kdsa-ecdsa-verify-p521", S390_FEAT_TYPE_KDSA, 3, "KDSA ECDSA-Verify-P521"),

-    FEAT_INIT("kdsa-ecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 9, "KDSA ECDSA-Sign-P256"),

-    FEAT_INIT("kdsa-ecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 10, "KDSA ECDSA-Sign-P384"),

-    FEAT_INIT("kdsa-ecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 11, "KDSA ECDSA-Sign-P521"),

-    FEAT_INIT("kdsa-eecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 17, "KDSA Encrypted-ECDSA-Sign-P256"),

-    FEAT_INIT("kdsa-eecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 18, "KDSA Encrypted-ECDSA-Sign-P384"),

-    FEAT_INIT("kdsa-eecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 19, "KDSA Encrypted-ECDSA-Sign-P521"),

-    FEAT_INIT("kdsa-eddsa-verify-ed25519", S390_FEAT_TYPE_KDSA, 32, "KDSA EdDSA-Verify-Ed25519"),

-    FEAT_INIT("kdsa-eddsa-verify-ed448", S390_FEAT_TYPE_KDSA, 36, "KDSA EdDSA-Verify-Ed448"),

-    FEAT_INIT("kdsa-eddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 40, "KDSA EdDSA-Sign-Ed25519"),

-    FEAT_INIT("kdsa-eddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 44, "KDSA EdDSA-Sign-Ed448"),

-    FEAT_INIT("kdsa-eeddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 48, "KDSA Encrypted-EdDSA-Sign-Ed25519"),

-    FEAT_INIT("kdsa-eeddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 52, "KDSA Encrypted-EdDSA-Sign-Ed448"),

-

-    FEAT_INIT("sortl-sflr", S390_FEAT_TYPE_SORTL, 1, "SORTL SFLR"),

-    FEAT_INIT("sortl-svlr", S390_FEAT_TYPE_SORTL, 2, "SORTL SVLR"),

-    FEAT_INIT("sortl-32", S390_FEAT_TYPE_SORTL, 130, "SORTL 32 input lists"),

-    FEAT_INIT("sortl-128", S390_FEAT_TYPE_SORTL, 132, "SORTL 128 input lists"),

-    FEAT_INIT("sortl-f0", S390_FEAT_TYPE_SORTL, 192, "SORTL format 0 parameter-block"),

-

-    FEAT_INIT("dfltcc-gdht", S390_FEAT_TYPE_DFLTCC, 1, "DFLTCC GDHT"),

-    FEAT_INIT("dfltcc-cmpr", S390_FEAT_TYPE_DFLTCC, 2, "DFLTCC CMPR"),

-    FEAT_INIT("dfltcc-xpnd", S390_FEAT_TYPE_DFLTCC, 4, "DFLTCC XPND"),

-    FEAT_INIT("dfltcc-f0", S390_FEAT_TYPE_DFLTCC, 192, "DFLTCC format 0 parameter-block"),

+#define DEF_FEAT(_FEAT, _NAME, _TYPE, _BIT, _DESC) \

+    [S390_FEAT_##_FEAT] = {                        \

+        .name = _NAME,                             \

+        .type = S390_FEAT_TYPE_##_TYPE,            \

+        .bit = _BIT,                               \

+        .desc = _DESC,                             \

+    },

+static const S390FeatDef s390_features[S390_FEAT_MAX] = {

+    #include "cpu_features_def.inc.h"

 };

+#undef DEF_FEAT

 const S390FeatDef *s390_feat_def(S390Feat feat)

 {

diff --git a/target/s390x/cpu_features_def.h b/target/s390x/cpu_features_def.h

index a7abe4d..412d356 100644

--- a/target/s390x/cpu_features_def.h

+++ b/target/s390x/cpu_features_def.h

@@ -2,9 +2,10 @@

  * CPU features/facilities for s390

  *

  * Copyright IBM Corp. 2016, 2018

+ * Copyright Red Hat, Inc. 2019

  *

  * Author(s): Michael Mueller <mimu@linux.vnet.ibm.com>

- *            David Hildenbrand <dahi@linux.vnet.ibm.com>

+ *            David Hildenbrand <david@redhat.com>

  *

  * This work is licensed under the terms of the GNU GPL, version 2 or (at

  * your option) any later version. See the COPYING file in the top-level

@@ -14,354 +15,11 @@

 #ifndef TARGET_S390X_CPU_FEATURES_DEF_H

 #define TARGET_S390X_CPU_FEATURES_DEF_H

+#define DEF_FEAT(_FEAT, ...) S390_FEAT_##_FEAT,

 typedef enum {

-    /* Stfle */

-    S390_FEAT_ESAN3 = 0,

-    S390_FEAT_ZARCH,

-    S390_FEAT_DAT_ENH,

-    S390_FEAT_IDTE_SEGMENT,

-    S390_FEAT_IDTE_REGION,

-    S390_FEAT_ASN_LX_REUSE,

-    S390_FEAT_STFLE,

-    S390_FEAT_EDAT,

-    S390_FEAT_SENSE_RUNNING_STATUS,

-    S390_FEAT_CONDITIONAL_SSKE,

-    S390_FEAT_CONFIGURATION_TOPOLOGY,

-    S390_FEAT_AP_QUERY_CONFIG_INFO,

-    S390_FEAT_IPTE_RANGE,

-    S390_FEAT_NONQ_KEY_SETTING,

-    S390_FEAT_AP_FACILITIES_TEST,

-    S390_FEAT_EXTENDED_TRANSLATION_2,

-    S390_FEAT_MSA,

-    S390_FEAT_LONG_DISPLACEMENT,

-    S390_FEAT_LONG_DISPLACEMENT_FAST,

-    S390_FEAT_HFP_MADDSUB,

-    S390_FEAT_EXTENDED_IMMEDIATE,

-    S390_FEAT_EXTENDED_TRANSLATION_3,

-    S390_FEAT_HFP_UNNORMALIZED_EXT,

-    S390_FEAT_ETF2_ENH,

-    S390_FEAT_STORE_CLOCK_FAST,

-    S390_FEAT_PARSING_ENH,

-    S390_FEAT_MOVE_WITH_OPTIONAL_SPEC,

-    S390_FEAT_TOD_CLOCK_STEERING,

-    S390_FEAT_ETF3_ENH,

-    S390_FEAT_EXTRACT_CPU_TIME,

-    S390_FEAT_COMPARE_AND_SWAP_AND_STORE,

-    S390_FEAT_COMPARE_AND_SWAP_AND_STORE_2,

-    S390_FEAT_GENERAL_INSTRUCTIONS_EXT,

-    S390_FEAT_EXECUTE_EXT,

-    S390_FEAT_ENHANCED_MONITOR,

-    S390_FEAT_FLOATING_POINT_EXT,

-    S390_FEAT_ORDER_PRESERVING_COMPRESSION,

-    S390_FEAT_SET_PROGRAM_PARAMETERS,

-    S390_FEAT_FLOATING_POINT_SUPPPORT_ENH,

-    S390_FEAT_DFP,

-    S390_FEAT_DFP_FAST,

-    S390_FEAT_PFPO,

-    S390_FEAT_STFLE_45,

-    S390_FEAT_CMPSC_ENH,

-    S390_FEAT_DFP_ZONED_CONVERSION,

-    S390_FEAT_STFLE_49,

-    S390_FEAT_CONSTRAINT_TRANSACTIONAL_EXE,

-    S390_FEAT_LOCAL_TLB_CLEARING,

-    S390_FEAT_INTERLOCKED_ACCESS_2,

-    S390_FEAT_STFLE_53,

-    S390_FEAT_ENTROPY_ENC_COMP,

-    S390_FEAT_MSA_EXT_5,

-    S390_FEAT_MISC_INSTRUCTION_EXT,

-    S390_FEAT_SEMAPHORE_ASSIST,

-    S390_FEAT_TIME_SLICE_INSTRUMENTATION,

-    S390_FEAT_MISC_INSTRUCTION_EXT3,

-    S390_FEAT_RUNTIME_INSTRUMENTATION,

-    S390_FEAT_ZPCI,

-    S390_FEAT_ADAPTER_EVENT_NOTIFICATION,

-    S390_FEAT_ADAPTER_INT_SUPPRESSION,

-    S390_FEAT_TRANSACTIONAL_EXE,

-    S390_FEAT_STORE_HYPERVISOR_INFO,

-    S390_FEAT_ACCESS_EXCEPTION_FS_INDICATION,

-    S390_FEAT_MSA_EXT_3,

-    S390_FEAT_MSA_EXT_4,

-    S390_FEAT_EDAT_2,

-    S390_FEAT_DFP_PACKED_CONVERSION,

-    S390_FEAT_PPA15,

-    S390_FEAT_BPB,

-    S390_FEAT_VECTOR,

-    S390_FEAT_INSTRUCTION_EXEC_PROT,

-    S390_FEAT_SIDE_EFFECT_ACCESS_ESOP2,

-    S390_FEAT_GUARDED_STORAGE,

-    S390_FEAT_VECTOR_PACKED_DECIMAL,

-    S390_FEAT_VECTOR_ENH,

-    S390_FEAT_MULTIPLE_EPOCH,

-    S390_FEAT_TEST_PENDING_EXT_INTERRUPTION,

-    S390_FEAT_INSERT_REFERENCE_BITS_MULT,

-    S390_FEAT_MSA_EXT_8,

-    S390_FEAT_CMM_NT,

-    S390_FEAT_VECTOR_ENH2,

-    S390_FEAT_ESORT_BASE,

-    S390_FEAT_DEFLATE_BASE,

-    S390_FEAT_VECTOR_PACKED_DECIMAL_ENH,

-    S390_FEAT_MSA_EXT_9,

-    S390_FEAT_ETOKEN,

-

-    /* Sclp Conf Char */

-    S390_FEAT_SIE_GSLS,

-    S390_FEAT_ESOP,

-    S390_FEAT_HPMA2,

-    S390_FEAT_SIE_KSS,

-

-    /* Sclp Conf Char Ext */

-    S390_FEAT_SIE_64BSCAO,

-    S390_FEAT_SIE_CMMA,

-    S390_FEAT_SIE_PFMFI,

-    S390_FEAT_SIE_IBS,

-

-    /* Sclp Cpu */

-    S390_FEAT_SIE_F2,

-    S390_FEAT_SIE_SKEY,

-    S390_FEAT_SIE_GPERE,

-    S390_FEAT_SIE_SIIF,

-    S390_FEAT_SIE_SIGPIF,

-    S390_FEAT_SIE_IB,

-    S390_FEAT_SIE_CEI,

-

-    /* Misc */

-    S390_FEAT_DAT_ENH_2,

-    S390_FEAT_CMM,

-    S390_FEAT_AP,

-

-    /* PLO */

-    S390_FEAT_PLO_CL,

-    S390_FEAT_PLO_CLG,

-    S390_FEAT_PLO_CLGR,

-    S390_FEAT_PLO_CLX,

-    S390_FEAT_PLO_CS,

-    S390_FEAT_PLO_CSG,

-    S390_FEAT_PLO_CSGR,

-    S390_FEAT_PLO_CSX,

-    S390_FEAT_PLO_DCS,

-    S390_FEAT_PLO_DCSG,

-    S390_FEAT_PLO_DCSGR,

-    S390_FEAT_PLO_DCSX,

-    S390_FEAT_PLO_CSST,

-    S390_FEAT_PLO_CSSTG,

-    S390_FEAT_PLO_CSSTGR,

-    S390_FEAT_PLO_CSSTX,

-    S390_FEAT_PLO_CSDST,

-    S390_FEAT_PLO_CSDSTG,

-    S390_FEAT_PLO_CSDSTGR,

-    S390_FEAT_PLO_CSDSTX,

-    S390_FEAT_PLO_CSTST,

-    S390_FEAT_PLO_CSTSTG,

-    S390_FEAT_PLO_CSTSTGR,

-    S390_FEAT_PLO_CSTSTX,

-

-    /* PTFF */

-    S390_FEAT_PTFF_QTO,

-    S390_FEAT_PTFF_QSI,

-    S390_FEAT_PTFF_QPT,

-    S390_FEAT_PTFF_QUI,

-    S390_FEAT_PTFF_QTOU,

-    S390_FEAT_PTFF_QSIE,

-    S390_FEAT_PTFF_QTOUE,

-    S390_FEAT_PTFF_STO,

-    S390_FEAT_PTFF_STOU,

-    S390_FEAT_PTFF_STOE,

-    S390_FEAT_PTFF_STOUE,

-

-    /* KMAC */

-    S390_FEAT_KMAC_DEA,

-    S390_FEAT_KMAC_TDEA_128,

-    S390_FEAT_KMAC_TDEA_192,

-    S390_FEAT_KMAC_EDEA,

-    S390_FEAT_KMAC_ETDEA_128,

-    S390_FEAT_KMAC_ETDEA_192,

-    S390_FEAT_KMAC_AES_128,

-    S390_FEAT_KMAC_AES_192,

-    S390_FEAT_KMAC_AES_256,

-    S390_FEAT_KMAC_EAES_128,

-    S390_FEAT_KMAC_EAES_192,

-    S390_FEAT_KMAC_EAES_256,

-

-    /* KMC */

-    S390_FEAT_KMC_DEA,

-    S390_FEAT_KMC_TDEA_128,

-    S390_FEAT_KMC_TDEA_192,

-    S390_FEAT_KMC_EDEA,

-    S390_FEAT_KMC_ETDEA_128,

-    S390_FEAT_KMC_ETDEA_192,

-    S390_FEAT_KMC_AES_128,

-    S390_FEAT_KMC_AES_192,

-    S390_FEAT_KMC_AES_256,

-    S390_FEAT_KMC_EAES_128,

-    S390_FEAT_KMC_EAES_192,

-    S390_FEAT_KMC_EAES_256,

-    S390_FEAT_KMC_PRNG,

-

-    /* KM */

-    S390_FEAT_KM_DEA,

-    S390_FEAT_KM_TDEA_128,

-    S390_FEAT_KM_TDEA_192,

-    S390_FEAT_KM_EDEA,

-    S390_FEAT_KM_ETDEA_128,

-    S390_FEAT_KM_ETDEA_192,

-    S390_FEAT_KM_AES_128,

-    S390_FEAT_KM_AES_192,

-    S390_FEAT_KM_AES_256,

-    S390_FEAT_KM_EAES_128,

-    S390_FEAT_KM_EAES_192,

-    S390_FEAT_KM_EAES_256,

-    S390_FEAT_KM_XTS_AES_128,

-    S390_FEAT_KM_XTS_AES_256,

-    S390_FEAT_KM_XTS_EAES_128,

-    S390_FEAT_KM_XTS_EAES_256,

-

-    /* KIMD */

-    S390_FEAT_KIMD_SHA_1,

-    S390_FEAT_KIMD_SHA_256,

-    S390_FEAT_KIMD_SHA_512,

-    S390_FEAT_KIMD_SHA3_224,

-    S390_FEAT_KIMD_SHA3_256,

-    S390_FEAT_KIMD_SHA3_384,

-    S390_FEAT_KIMD_SHA3_512,

-    S390_FEAT_KIMD_SHAKE_128,

-    S390_FEAT_KIMD_SHAKE_256,

-    S390_FEAT_KIMD_GHASH,

-

-    /* KLMD */

-    S390_FEAT_KLMD_SHA_1,

-    S390_FEAT_KLMD_SHA_256,

-    S390_FEAT_KLMD_SHA_512,

-    S390_FEAT_KLMD_SHA3_224,

-    S390_FEAT_KLMD_SHA3_256,

-    S390_FEAT_KLMD_SHA3_384,

-    S390_FEAT_KLMD_SHA3_512,

-    S390_FEAT_KLMD_SHAKE_128,

-    S390_FEAT_KLMD_SHAKE_256,

-

-    /* PCKMO */

-    S390_FEAT_PCKMO_EDEA,

-    S390_FEAT_PCKMO_ETDEA_128,

-    S390_FEAT_PCKMO_ETDEA_256,

-    S390_FEAT_PCKMO_AES_128,

-    S390_FEAT_PCKMO_AES_192,

-    S390_FEAT_PCKMO_AES_256,

-    S390_FEAT_PCKMO_ECC_P256,

-    S390_FEAT_PCKMO_ECC_P384,

-    S390_FEAT_PCKMO_ECC_P521,

-    S390_FEAT_PCKMO_ECC_ED25519,

-    S390_FEAT_PCKMO_ECC_ED448,

-

-    /* KMCTR */

-    S390_FEAT_KMCTR_DEA,

-    S390_FEAT_KMCTR_TDEA_128,

-    S390_FEAT_KMCTR_TDEA_192,

-    S390_FEAT_KMCTR_EDEA,

-    S390_FEAT_KMCTR_ETDEA_128,

-    S390_FEAT_KMCTR_ETDEA_192,

-    S390_FEAT_KMCTR_AES_128,

-    S390_FEAT_KMCTR_AES_192,

-    S390_FEAT_KMCTR_AES_256,

-    S390_FEAT_KMCTR_EAES_128,

-    S390_FEAT_KMCTR_EAES_192,

-    S390_FEAT_KMCTR_EAES_256,

-

-    /* KMF */

-    S390_FEAT_KMF_DEA,

-    S390_FEAT_KMF_TDEA_128,

-    S390_FEAT_KMF_TDEA_192,

-    S390_FEAT_KMF_EDEA,

-    S390_FEAT_KMF_ETDEA_128,

-    S390_FEAT_KMF_ETDEA_192,

-    S390_FEAT_KMF_AES_128,

-    S390_FEAT_KMF_AES_192,

-    S390_FEAT_KMF_AES_256,

-    S390_FEAT_KMF_EAES_128,

-    S390_FEAT_KMF_EAES_192,

-    S390_FEAT_KMF_EAES_256,

-

-    /* KMO */

-    S390_FEAT_KMO_DEA,

-    S390_FEAT_KMO_TDEA_128,

-    S390_FEAT_KMO_TDEA_192,

-    S390_FEAT_KMO_EDEA,

-    S390_FEAT_KMO_ETDEA_128,

-    S390_FEAT_KMO_ETDEA_192,

-    S390_FEAT_KMO_AES_128,

-    S390_FEAT_KMO_AES_192,

-    S390_FEAT_KMO_AES_256,

-    S390_FEAT_KMO_EAES_128,

-    S390_FEAT_KMO_EAES_192,

-    S390_FEAT_KMO_EAES_256,

-

-    /* PCC */

-    S390_FEAT_PCC_CMAC_DEA,

-    S390_FEAT_PCC_CMAC_TDEA_128,

-    S390_FEAT_PCC_CMAC_TDEA_192,

-    S390_FEAT_PCC_CMAC_ETDEA_128,

-    S390_FEAT_PCC_CMAC_ETDEA_192,

-    S390_FEAT_PCC_CMAC_TDEA,

-    S390_FEAT_PCC_CMAC_AES_128,

-    S390_FEAT_PCC_CMAC_AES_192,

-    S390_FEAT_PCC_CMAC_AES_256,

-    S390_FEAT_PCC_CMAC_EAES_128,

-    S390_FEAT_PCC_CMAC_EAES_192,

-    S390_FEAT_PCC_CMAC_EAES_256,

-    S390_FEAT_PCC_XTS_AES_128,

-    S390_FEAT_PCC_XTS_AES_256,

-    S390_FEAT_PCC_XTS_EAES_128,

-    S390_FEAT_PCC_XTS_EAES_256,

-    S390_FEAT_PCC_SCALAR_MULT_P256,

-    S390_FEAT_PCC_SCALAR_MULT_P384,

-    S390_FEAT_PCC_SCALAR_MULT_P512,

-    S390_FEAT_PCC_SCALAR_MULT_ED25519,

-    S390_FEAT_PCC_SCALAR_MULT_ED448,

-    S390_FEAT_PCC_SCALAR_MULT_X25519,

-    S390_FEAT_PCC_SCALAR_MULT_X448,

-

-    /* PPNO/PRNO */

-    S390_FEAT_PPNO_SHA_512_DRNG,

-    S390_FEAT_PRNO_TRNG_QRTCR,

-    S390_FEAT_PRNO_TRNG,

-

-    /* KMA */

-    S390_FEAT_KMA_GCM_AES_128,

-    S390_FEAT_KMA_GCM_AES_192,

-    S390_FEAT_KMA_GCM_AES_256 ,

-    S390_FEAT_KMA_GCM_EAES_128,

-    S390_FEAT_KMA_GCM_EAES_192,

-    S390_FEAT_KMA_GCM_EAES_256,

-

-    /* KDSA */

-    S390_FEAT_ECDSA_VERIFY_P256,

-    S390_FEAT_ECDSA_VERIFY_P384,

-    S390_FEAT_ECDSA_VERIFY_P512,

-    S390_FEAT_ECDSA_SIGN_P256,

-    S390_FEAT_ECDSA_SIGN_P384,

-    S390_FEAT_ECDSA_SIGN_P512,

-    S390_FEAT_EECDSA_SIGN_P256,

-    S390_FEAT_EECDSA_SIGN_P384,

-    S390_FEAT_EECDSA_SIGN_P512,

-    S390_FEAT_EDDSA_VERIFY_ED25519,

-    S390_FEAT_EDDSA_VERIFY_ED448,

-    S390_FEAT_EDDSA_SIGN_ED25519,

-    S390_FEAT_EDDSA_SIGN_ED448,

-    S390_FEAT_EEDDSA_SIGN_ED25519,

-    S390_FEAT_EEDDSA_SIGN_ED448,

-

-    /* SORTL */

-    S390_FEAT_SORTL_SFLR,

-    S390_FEAT_SORTL_SVLR,

-    S390_FEAT_SORTL_32,

-    S390_FEAT_SORTL_128,

-    S390_FEAT_SORTL_F0,

-

-    /* DEFLATE */

-    S390_FEAT_DEFLATE_GHDT,

-    S390_FEAT_DEFLATE_CMPR,

-    S390_FEAT_DEFLATE_XPND,

-    S390_FEAT_DEFLATE_F0,

-

+    #include "cpu_features_def.inc.h"

     S390_FEAT_MAX,

 } S390Feat;

+#undef DEF_FEAT

 #endif /* TARGET_S390X_CPU_FEATURES_DEF_H */

diff --git a/target/s390x/cpu_features_def.inc.h b/target/s390x/cpu_features_def.inc.h

new file mode 100644

index 0000000..011ce4d

--- /dev/null

+++ b/target/s390x/cpu_features_def.inc.h

@@ -0,0 +1,369 @@

+/*

+ * RAW s390x CPU feature definitions:

+ *

+ * DEF_FEAT(_FEAT, _NAME, _TYPE, _BIT, _DESC):

+ * - _FEAT: Feature (enum) name used internally (S390_FEAT_##_FEAT)

+ * - _NAME: Feature name exposed to the user.

+ * - _TYPE: Feature type (S390_FEAT_TYPE_##_TYPE).

+ * - _BIT: Feature bit number within feature type block (unused for MISC).

+ * - _DESC: Feature description, exposed to the user.

+ *

+ * Copyright IBM Corp. 2016, 2018

+ * Copyright Red Hat, Inc. 2019

+ *

+ * Author(s): Michael Mueller <mimu@linux.vnet.ibm.com>

+ *            David Hildenbrand <david@redhat.com>

+ *

+ * This work is licensed under the terms of the GNU GPL, version 2 or (at

+ * your option) any later version. See the COPYING file in the top-level

+ * directory.

+ */

+

+/* Features exposed via the STFL(E) instruction. */

+DEF_FEAT(ESAN3, "esan3", STFL, 0, "Instructions marked as n3")

+DEF_FEAT(ZARCH, "zarch", STFL, 1, "z/Architecture architectural mode")

+DEF_FEAT(DAT_ENH, "dateh", STFL, 3, "DAT-enhancement facility")

+DEF_FEAT(IDTE_SEGMENT, "idtes", STFL, 4, "IDTE selective TLB segment-table clearing")

+DEF_FEAT(IDTE_REGION, "idter", STFL, 5, "IDTE selective TLB region-table clearing")

+DEF_FEAT(ASN_LX_REUSE, "asnlxr", STFL, 6, "ASN-and-LX reuse facility")

+DEF_FEAT(STFLE, "stfle", STFL, 7, "Store-facility-list-extended facility")

+DEF_FEAT(EDAT, "edat", STFL, 8, "Enhanced-DAT facility")

+DEF_FEAT(SENSE_RUNNING_STATUS, "srs", STFL, 9, "Sense-running-status facility")

+DEF_FEAT(CONDITIONAL_SSKE, "csske", STFL, 10, "Conditional-SSKE facility")

+DEF_FEAT(CONFIGURATION_TOPOLOGY, "ctop", STFL, 11, "Configuration-topology facility")

+DEF_FEAT(AP_QUERY_CONFIG_INFO, "apqci", STFL, 12, "Query AP Configuration Information facility")

+DEF_FEAT(IPTE_RANGE, "ipter", STFL, 13, "IPTE-range facility")

+DEF_FEAT(NONQ_KEY_SETTING, "nonqks", STFL, 14, "Nonquiescing key-setting facility")

+DEF_FEAT(AP_FACILITIES_TEST, "apft", STFL, 15, "AP Facilities Test facility")

+DEF_FEAT(EXTENDED_TRANSLATION_2, "etf2", STFL, 16, "Extended-translation facility 2")

+DEF_FEAT(MSA, "msa-base", STFL, 17, "Message-security-assist facility (excluding subfunctions)")

+DEF_FEAT(LONG_DISPLACEMENT, "ldisp", STFL, 18, "Long-displacement facility")

+DEF_FEAT(LONG_DISPLACEMENT_FAST, "ldisphp", STFL, 19, "Long-displacement facility has high performance")

+DEF_FEAT(HFP_MADDSUB, "hfpm", STFL, 20, "HFP-multiply-add/subtract facility")

+DEF_FEAT(EXTENDED_IMMEDIATE, "eimm", STFL, 21, "Extended-immediate facility")

+DEF_FEAT(EXTENDED_TRANSLATION_3, "etf3", STFL, 22, "Extended-translation facility 3")

+DEF_FEAT(HFP_UNNORMALIZED_EXT, "hfpue", STFL, 23, "HFP-unnormalized-extension facility")

+DEF_FEAT(ETF2_ENH, "etf2eh", STFL, 24, "ETF2-enhancement facility")

+DEF_FEAT(STORE_CLOCK_FAST, "stckf", STFL, 25, "Store-clock-fast facility")

+DEF_FEAT(PARSING_ENH, "parseh", STFL, 26, "Parsing-enhancement facility")

+DEF_FEAT(MOVE_WITH_OPTIONAL_SPEC, "mvcos", STFL, 27, "Move-with-optional-specification facility")

+DEF_FEAT(TOD_CLOCK_STEERING, "tods-base", STFL, 28, "TOD-clock-steering facility (excluding subfunctions)")

+DEF_FEAT(ETF3_ENH, "etf3eh", STFL, 30, "ETF3-enhancement facility")

+DEF_FEAT(EXTRACT_CPU_TIME, "ectg", STFL, 31, "Extract-CPU-time facility")

+DEF_FEAT(COMPARE_AND_SWAP_AND_STORE, "csst", STFL, 32, "Compare-and-swap-and-store facility")

+DEF_FEAT(COMPARE_AND_SWAP_AND_STORE_2, "csst2", STFL, 33, "Compare-and-swap-and-store facility 2")

+DEF_FEAT(GENERAL_INSTRUCTIONS_EXT, "ginste", STFL, 34, "General-instructions-extension facility")

+DEF_FEAT(EXECUTE_EXT, "exrl", STFL, 35, "Execute-extensions facility")

+DEF_FEAT(ENHANCED_MONITOR, "emon", STFL, 36, "Enhanced-monitor facility")

+DEF_FEAT(FLOATING_POINT_EXT, "fpe", STFL, 37, "Floating-point extension facility")

+DEF_FEAT(ORDER_PRESERVING_COMPRESSION, "opc", STFL, 38, "Order Preserving Compression facility")

+DEF_FEAT(SET_PROGRAM_PARAMETERS, "sprogp", STFL, 40, "Set-program-parameters facility")

+DEF_FEAT(FLOATING_POINT_SUPPPORT_ENH, "fpseh", STFL, 41, "Floating-point-support-enhancement facilities")

+DEF_FEAT(DFP, "dfp", STFL, 42, "DFP (decimal-floating-point) facility")

+DEF_FEAT(DFP_FAST, "dfphp", STFL, 43, "DFP (decimal-floating-point) facility has high performance")

+DEF_FEAT(PFPO, "pfpo", STFL, 44, "PFPO instruction")

+DEF_FEAT(STFLE_45, "stfle45", STFL, 45, "Various facilities introduced with z196")

+DEF_FEAT(CMPSC_ENH, "cmpsceh", STFL, 47, "CMPSC-enhancement facility")

+DEF_FEAT(DFP_ZONED_CONVERSION, "dfpzc", STFL, 48, "Decimal-floating-point zoned-conversion facility")

+DEF_FEAT(STFLE_49, "stfle49", STFL, 49, "Various facilities introduced with zEC12")

+DEF_FEAT(CONSTRAINT_TRANSACTIONAL_EXE, "cte", STFL, 50, "Constrained transactional-execution facility")

+DEF_FEAT(LOCAL_TLB_CLEARING, "ltlbc", STFL, 51, "Local-TLB-clearing facility")

+DEF_FEAT(INTERLOCKED_ACCESS_2, "iacc2", STFL, 52, "Interlocked-access facility 2")

+DEF_FEAT(STFLE_53, "stfle53", STFL, 53, "Various facilities introduced with z13")

+DEF_FEAT(ENTROPY_ENC_COMP, "eec", STFL, 54, "Entropy encoding compression facility")

+DEF_FEAT(MSA_EXT_5, "msa5-base", STFL, 57, "Message-security-assist-extension-5 facility (excluding subfunctions)")

+DEF_FEAT(MISC_INSTRUCTION_EXT, "minste2", STFL, 58, "Miscellaneous-instruction-extensions facility 2")

+DEF_FEAT(SEMAPHORE_ASSIST, "sema", STFL, 59, "Semaphore-assist facility")

+DEF_FEAT(TIME_SLICE_INSTRUMENTATION, "tsi", STFL, 60, "Time-slice Instrumentation facility")

+DEF_FEAT(MISC_INSTRUCTION_EXT3, "minste3", STFL, 61, "Miscellaneous-Instruction-Extensions Facility 3")

+DEF_FEAT(RUNTIME_INSTRUMENTATION, "ri", STFL, 64, "CPU runtime-instrumentation facility")

+DEF_FEAT(ZPCI, "zpci", STFL, 69, "z/PCI facility")

+DEF_FEAT(ADAPTER_EVENT_NOTIFICATION, "aen", STFL, 71, "General-purpose-adapter-event-notification facility")

+DEF_FEAT(ADAPTER_INT_SUPPRESSION, "ais", STFL, 72, "General-purpose-adapter-interruption-suppression facility")

+DEF_FEAT(TRANSACTIONAL_EXE, "te", STFL, 73, "Transactional-execution facility")