From 2a3b4f0f979edaf74a17204565209734a2b014ef Mon Sep 17 00:00:00 2001

From: David Hildenbrand <david@redhat.com>

Date: Wed, 22 May 2019 08:03:56 +0100

Subject: [PATCH 04/12] s390x/cpumodel: Miscellaneous-Instruction-Extensions

 Facility 3

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

Message-id: <20190522080402.20173-5-david@redhat.com>

Patchwork-id: 88151

O-Subject: [RHEL8.1 qemu-kvm PATCH v2 04/10] s390x/cpumodel: Miscellaneous-Instruction-Extensions Facility 3

Bugzilla: 1660912

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

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

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

Provide the "Miscellaneous-Instruction-Extensions Facility 3" via

stfle.61.

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>

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

Message-Id: <20190429090250.7648-4-borntraeger@de.ibm.com>

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

(cherry picked from commit 2ec038836fa03103596023e4a1ad7e6eb50ee7c7)

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

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

---

 target/s390x/cpu_features.c     | 1 +

 target/s390x/cpu_features_def.h | 1 +

 2 files changed, 2 insertions(+)

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

index 1843c84..bbd8902 100644

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

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

@@ -83,6 +83,7 @@ static const S390FeatDef s390_features[] = {

     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"),

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

index 5fc7e7b..31dd678 100644

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

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

@@ -71,6 +71,7 @@ typedef enum {

     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,

-- 

1.8.3.1