|
 |
ae23c9 |
From c2c11da318c64a43bb0ed7d07f329d2f1816eb3f Mon Sep 17 00:00:00 2001
|
|
|
ae23c9 |
From: Thomas Huth <thuth@redhat.com>
|
|
|
ae23c9 |
Date: Fri, 29 Mar 2019 11:13:37 +0000
|
|
|
ae23c9 |
Subject: [PATCH 3/7] redhat: s390x/cpumodel: enable mepoch by default for z14
|
|
|
ae23c9 |
GA2
|
|
|
ae23c9 |
|
|
|
ae23c9 |
RH-Author: Thomas Huth <thuth@redhat.com>
|
|
|
ae23c9 |
Message-id: <1553858017-376-4-git-send-email-thuth@redhat.com>
|
|
|
ae23c9 |
Patchwork-id: 85240
|
|
|
ae23c9 |
O-Subject: [RHEL-8.1.0 qemu-kvm PATCH 3/3] redhat: s390x/cpumodel: enable mepoch by default for z14 GA2
|
|
|
ae23c9 |
Bugzilla: 1664371
|
|
|
ae23c9 |
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
|
|
ae23c9 |
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
ae23c9 |
RH-Acked-by: Jens Freimann <jfreimann@redhat.com>
|
|
|
ae23c9 |
|
|
|
ae23c9 |
Upstream-status: n/a (downstream only)
|
|
|
ae23c9 |
|
|
|
ae23c9 |
Enable the mepoch feature for the new z14 GA2 CPU model. In upstream
|
|
|
ae23c9 |
QEMU, this feature has already been enabled by default for the GA1
|
|
|
ae23c9 |
CPU model in new machine types, too:
|
|
|
ae23c9 |
|
|
|
ae23c9 |
84176c7906ffaf59457bd7dff25a3ea32e00c3d8
|
|
|
ae23c9 |
"s390x/cpumodel: default enable mepoch for z14 and later"
|
|
|
ae23c9 |
|
|
|
ae23c9 |
But since we do not have new machine types in RHEL8 qemu-kvm yet,
|
|
|
ae23c9 |
we can not play the trick with the machine type here and thus can
|
|
|
ae23c9 |
only enable mepoch for the new z14 GA2 CPU. Users of the z14 GA1
|
|
|
ae23c9 |
CPU will have to enable this feature manually.
|
|
|
ae23c9 |
|
|
|
ae23c9 |
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
|
|
ae23c9 |
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
|
ae23c9 |
---
|
|
|
ae23c9 |
target/s390x/gen-features.c | 10 +++++++++-
|
|
|
ae23c9 |
1 file changed, 9 insertions(+), 1 deletion(-)
|
|
|
ae23c9 |
|
|
|
ae23c9 |
diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
|
|
|
ae23c9 |
index dee8375..739d5f1 100644
|
|
|
ae23c9 |
--- a/target/s390x/gen-features.c
|
|
|
ae23c9 |
+++ b/target/s390x/gen-features.c
|
|
|
ae23c9 |
@@ -556,7 +556,15 @@ static uint16_t default_GEN14_GA1[] = {
|
|
|
ae23c9 |
S390_FEAT_GROUP_MSA_EXT_8,
|
|
|
ae23c9 |
};
|
|
|
ae23c9 |
|
|
|
ae23c9 |
-#define default_GEN14_GA2 EmptyFeat
|
|
|
ae23c9 |
+/*
|
|
|
ae23c9 |
+ * Red Hat only: We enable the MULTIPLE_EPOCH features only for z14 GA2 and
|
|
|
ae23c9 |
+ * not for GA1 already, since we do not have a new s390-ccw-virtio-rhel8.y.0
|
|
|
ae23c9 |
+ * machine type for applying upstream commit 84176c7906ffaf59457bd7 correctly.
|
|
|
ae23c9 |
+ */
|
|
|
ae23c9 |
+static uint16_t default_GEN14_GA2[] = {
|
|
|
ae23c9 |
+ S390_FEAT_MULTIPLE_EPOCH,
|
|
|
ae23c9 |
+ S390_FEAT_GROUP_MULTIPLE_EPOCH_PTFF,
|
|
|
ae23c9 |
+};
|
|
|
ae23c9 |
|
|
|
ae23c9 |
/* QEMU (CPU model) features */
|
|
|
ae23c9 |
|
|
|
ae23c9 |
--
|
|
|
ae23c9 |
1.8.3.1
|
|
|
ae23c9 |
|