87 lines
3.1 KiB
Diff
87 lines
3.1 KiB
Diff
|
From a74dac6606968b164d38aaec5bd8bc1abef4100d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thomas Huth <thuth@redhat.com>
|
||
|
|
Date: Fri, 29 Mar 2019 11:13:36 +0000
|
||
|
|
Subject: [PATCH 2/7] s390x/cpumodel: add z14 GA2 model
|
||
|
|
|
||
|
|
RH-Author: Thomas Huth <thuth@redhat.com>
|
||
|
|
Message-id: <1553858017-376-3-git-send-email-thuth@redhat.com>
|
||
|
|
Patchwork-id: 85239
|
||
|
|
O-Subject: [RHEL-8.1.0 qemu-kvm PATCH 2/3] s390x/cpumodel: add z14 GA2 model
|
||
|
|
Bugzilla: 1664371
|
||
|
|
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
||
|
|
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
||
|
|
RH-Acked-by: Jens Freimann <jfreimann@redhat.com>
|
||
|
|
|
||
|
|
From: Collin Walling <walling@linux.ibm.com>
|
||
|
|
|
||
|
|
Introduce the z14 GA2 cpu model for QEMU. There are no new features
|
||
|
|
introduced with this model, and will inherit the same feature set as
|
||
|
|
z14 GA1.
|
||
|
|
|
||
|
|
Signed-off-by: Collin Walling <walling@linux.ibm.com>
|
||
|
|
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
|
||
|
|
Reviewed-by: David Hildenbrand <david@redhat.com>
|
||
|
|
Message-Id: <20190212011657.18324-3-walling@linux.ibm.com>
|
||
|
|
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
|
||
|
|
(cherry picked from commit f2a7d1577115bda770d619ff5bc45db1f656edc3)
|
||
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||
|
|
---
|
||
|
|
target/s390x/cpu_models.c | 1 +
|
||
|
|
target/s390x/gen-features.c | 7 +++++++
|
||
|
|
2 files changed, 8 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
|
||
|
|
index 43f16a7..5e9b716 100644
|
||
|
|
--- a/target/s390x/cpu_models.c
|
||
|
|
+++ b/target/s390x/cpu_models.c
|
||
|
|
@@ -79,6 +79,7 @@ static S390CPUDef s390_cpu_defs[] = {
|
||
|
|
CPUDEF_INIT(0x2964, 13, 2, 47, 0x08000000U, "z13.2", "IBM z13 GA2"),
|
||
|
|
CPUDEF_INIT(0x2965, 13, 2, 47, 0x08000000U, "z13s", "IBM z13s GA1"),
|
||
|
|
CPUDEF_INIT(0x3906, 14, 1, 47, 0x08000000U, "z14", "IBM z14 GA1"),
|
||
|
|
+ CPUDEF_INIT(0x3906, 14, 2, 47, 0x08000000U, "z14.2", "IBM z14 GA2"),
|
||
|
|
CPUDEF_INIT(0x3907, 14, 1, 47, 0x08000000U, "z14ZR1", "IBM z14 Model ZR1 GA1"),
|
||
|
|
};
|
||
|
|
|
||
|
|
diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
|
||
|
|
index 7302269..dee8375 100644
|
||
|
|
--- a/target/s390x/gen-features.c
|
||
|
|
+++ b/target/s390x/gen-features.c
|
||
|
|
@@ -353,6 +353,8 @@ static uint16_t base_GEN14_GA1[] = {
|
||
|
|
S390_FEAT_ORDER_PRESERVING_COMPRESSION,
|
||
|
|
};
|
||
|
|
|
||
|
|
+#define base_GEN14_GA2 EmptyFeat
|
||
|
|
+
|
||
|
|
/* Full features (in order of release)
|
||
|
|
* Automatically includes corresponding base features.
|
||
|
|
* Full features are all features this hardware supports even if kvm/QEMU do not
|
||
|
|
@@ -480,6 +482,8 @@ static uint16_t full_GEN14_GA1[] = {
|
||
|
|
S390_FEAT_GROUP_MULTIPLE_EPOCH_PTFF,
|
||
|
|
};
|
||
|
|
|
||
|
|
+#define full_GEN14_GA2 EmptyFeat
|
||
|
|
+
|
||
|
|
/* Default features (in order of release)
|
||
|
|
* Automatically includes corresponding base features.
|
||
|
|
* Default features are all features this version of QEMU supports for this
|
||
|
|
@@ -552,6 +556,8 @@ static uint16_t default_GEN14_GA1[] = {
|
||
|
|
S390_FEAT_GROUP_MSA_EXT_8,
|
||
|
|
};
|
||
|
|
|
||
|
|
+#define default_GEN14_GA2 EmptyFeat
|
||
|
|
+
|
||
|
|
/* QEMU (CPU model) features */
|
||
|
|
|
||
|
|
static uint16_t qemu_V2_11[] = {
|
||
|
|
@@ -660,6 +666,7 @@ static CpuFeatDefSpec CpuFeatDef[] = {
|
||
|
|
CPU_FEAT_INITIALIZER(GEN13_GA1),
|
||
|
|
CPU_FEAT_INITIALIZER(GEN13_GA2),
|
||
|
|
CPU_FEAT_INITIALIZER(GEN14_GA1),
|
||
|
|
+ CPU_FEAT_INITIALIZER(GEN14_GA2),
|
||
|
|
};
|
||
|
|
|
||
|
|
#define FEAT_GROUP_INITIALIZER(_name) \
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|