cryptospore / rpms / qemu-kvm

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