|
 |
26ba25 |
From 6c2f10596f53c29687a64aa78f339e3043850936 Mon Sep 17 00:00:00 2001
|
|
|
26ba25 |
From: David Gibson <dgibson@redhat.com>
|
|
|
26ba25 |
Date: Wed, 25 Jul 2018 08:36:42 +0100
|
|
|
26ba25 |
Subject: [PATCH 03/14] RHEL-8.0: Add pseries-rhel7.6.0-sxxm machine type
|
|
|
26ba25 |
|
|
|
26ba25 |
RH-Author: David Gibson <dgibson@redhat.com>
|
|
|
26ba25 |
Message-id: <20180725083642.11004-1-dgibson@redhat.com>
|
|
|
26ba25 |
Patchwork-id: 81501
|
|
|
26ba25 |
O-Subject: [RHEL-8.0 qemu-kvm PATCH] RHEL-8.0: Add pseries-rhel7.6.0-sxxm machine type
|
|
|
26ba25 |
Bugzilla: 1595501
|
|
|
26ba25 |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
26ba25 |
RH-Acked-by: Serhii Popovych <spopovyc@redhat.com>
|
|
|
26ba25 |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
26ba25 |
|
|
|
26ba25 |
For the pseries-rhel7.3.0 .. pseries-rhel7.5.0 machine types we have -sxxm
|
|
|
26ba25 |
variants, the only difference being that the -sxxm variants have the
|
|
|
26ba25 |
Spectre and Meltdown mitigations available to guests by default.
|
|
|
26ba25 |
|
|
|
26ba25 |
We'd delayed on adding a similar variant for RHEL 7.6, in the hope that we
|
|
|
26ba25 |
might be able to enable the mitigations by default for the ordinary 7.6
|
|
|
26ba25 |
machine type. This requires that updated POWER8 firmware (FW860.51 or
|
|
|
26ba25 |
newer) be installed on the host.
|
|
|
26ba25 |
|
|
|
26ba25 |
The updated firmware was only released late May, and it's not clear how
|
|
|
26ba25 |
quickly and widely it will be deployed. For that reason, plus for
|
|
|
26ba25 |
consistency in how things need to be configured across rhel-7.y, we're now
|
|
|
26ba25 |
adding a pseries-rhel7.6.0-sxxm machine type.
|
|
|
26ba25 |
|
|
|
26ba25 |
Upstream status: downstream only
|
|
|
26ba25 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1595501
|
|
|
26ba25 |
|
|
|
26ba25 |
Signed-off-by: David Gibson <dgibson@redhat.com>
|
|
|
26ba25 |
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
|
26ba25 |
---
|
|
|
26ba25 |
hw/ppc/spapr.c | 22 ++++++++++++++++++++++
|
|
|
26ba25 |
1 file changed, 22 insertions(+)
|
|
|
26ba25 |
|
|
|
26ba25 |
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
|
|
|
26ba25 |
index 7de3f07..a61dafd 100644
|
|
|
26ba25 |
--- a/hw/ppc/spapr.c
|
|
|
26ba25 |
+++ b/hw/ppc/spapr.c
|
|
|
26ba25 |
@@ -4355,6 +4355,28 @@ static void spapr_machine_rhel760_class_options(MachineClass *mc)
|
|
|
26ba25 |
DEFINE_SPAPR_MACHINE(rhel760, "rhel7.6.0", true);
|
|
|
26ba25 |
|
|
|
26ba25 |
/*
|
|
|
26ba25 |
+ * pseries-rhel7.6.0-sxxm
|
|
|
26ba25 |
+ *
|
|
|
26ba25 |
+ * pseries-rhel7.6.0 with speculative execution exploit mitigations enabled by default
|
|
|
26ba25 |
+ */
|
|
|
26ba25 |
+static void spapr_machine_rhel760sxxm_instance_options(MachineState *machine)
|
|
|
26ba25 |
+{
|
|
|
26ba25 |
+ spapr_machine_rhel760_instance_options(machine);
|
|
|
26ba25 |
+}
|
|
|
26ba25 |
+
|
|
|
26ba25 |
+static void spapr_machine_rhel760sxxm_class_options(MachineClass *mc)
|
|
|
26ba25 |
+{
|
|
|
26ba25 |
+ sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
|
|
|
26ba25 |
+
|
|
|
26ba25 |
+ spapr_machine_rhel760_class_options(mc);
|
|
|
26ba25 |
+ smc->default_caps.caps[SPAPR_CAP_CFPC] = SPAPR_CAP_WORKAROUND;
|
|
|
26ba25 |
+ smc->default_caps.caps[SPAPR_CAP_SBBC] = SPAPR_CAP_WORKAROUND;
|
|
|
26ba25 |
+ smc->default_caps.caps[SPAPR_CAP_IBS] = SPAPR_CAP_FIXED_CCD;
|
|
|
26ba25 |
+}
|
|
|
26ba25 |
+
|
|
|
26ba25 |
+DEFINE_SPAPR_MACHINE(rhel760sxxm, "rhel7.6.0-sxxm", false);
|
|
|
26ba25 |
+
|
|
|
26ba25 |
+/*
|
|
|
26ba25 |
* pseries-rhel7.5.0
|
|
|
26ba25 |
* like SPAPR_COMPAT_2_11 and SPAPR_COMPAT_2_10
|
|
|
26ba25 |
* SPAPR_CAP_HTM already enabled in 7.4
|
|
|
26ba25 |
--
|
|
|
26ba25 |
1.8.3.1
|
|
|
26ba25 |
|