[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 26/30] ppc/spapr-caps: Define the pseries-2.12-sxxm m
From: |
David Gibson |
Subject: |
[Qemu-devel] [PULL 26/30] ppc/spapr-caps: Define the pseries-2.12-sxxm machine type |
Date: |
Tue, 6 Mar 2018 15:01:50 +1100 |
From: Suraj Jitindar Singh <address@hidden>
The sxxm (speculative execution exploit mitigation) machine type is a
variant of the 2.12 machine type with workarounds for speculative
execution vulnerabilities enabled by default.
Signed-off-by: Suraj Jitindar Singh <address@hidden>
Signed-off-by: David Gibson <address@hidden>
---
hw/ppc/spapr.c | 17 +++++++++++++++++
hw/ppc/spapr_caps.c | 11 +++++++++++
2 files changed, 28 insertions(+)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 1c2703cb6b..1b6ddd827e 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -3983,6 +3983,23 @@ static void
spapr_machine_2_12_class_options(MachineClass *mc)
DEFINE_SPAPR_MACHINE(2_12, "2.12", true);
+static void spapr_machine_2_12_sxxm_instance_options(MachineState *machine)
+{
+ spapr_machine_2_12_instance_options(machine);
+}
+
+static void spapr_machine_2_12_sxxm_class_options(MachineClass *mc)
+{
+ sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
+
+ spapr_machine_2_12_class_options(mc);
+ smc->default_caps.caps[SPAPR_CAP_CFPC] = SPAPR_CAP_WORKAROUND;
+ smc->default_caps.caps[SPAPR_CAP_SBBC] = SPAPR_CAP_WORKAROUND;
+ smc->default_caps.caps[SPAPR_CAP_IBS] = SPAPR_CAP_FIXED_CCD;
+}
+
+DEFINE_SPAPR_MACHINE(2_12_sxxm, "2.12-sxxm", false);
+
/*
* pseries-2.11
*/
diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c
index da1f519e13..531e145114 100644
--- a/hw/ppc/spapr_caps.c
+++ b/hw/ppc/spapr_caps.c
@@ -335,15 +335,26 @@ static sPAPRCapabilities
default_caps_with_cpu(sPAPRMachineState *spapr,
caps = smc->default_caps;
+ if (!ppc_check_compat(cpu, CPU_POWERPC_LOGICAL_3_00,
+ 0, spapr->max_compat_pvr)) {
+ caps.caps[SPAPR_CAP_CFPC] = SPAPR_CAP_BROKEN;
+ }
+
if (!ppc_check_compat(cpu, CPU_POWERPC_LOGICAL_2_07,
0, spapr->max_compat_pvr)) {
caps.caps[SPAPR_CAP_HTM] = SPAPR_CAP_OFF;
}
+ if (!ppc_check_compat(cpu, CPU_POWERPC_LOGICAL_2_06_PLUS,
+ 0, spapr->max_compat_pvr)) {
+ caps.caps[SPAPR_CAP_SBBC] = SPAPR_CAP_BROKEN;
+ }
+
if (!ppc_check_compat(cpu, CPU_POWERPC_LOGICAL_2_06,
0, spapr->max_compat_pvr)) {
caps.caps[SPAPR_CAP_VSX] = SPAPR_CAP_OFF;
caps.caps[SPAPR_CAP_DFP] = SPAPR_CAP_OFF;
+ caps.caps[SPAPR_CAP_IBS] = SPAPR_CAP_BROKEN;
}
return caps;
--
2.14.3
- [Qemu-devel] [PULL 07/30] spapr: register dummy ICPs later, (continued)
- [Qemu-devel] [PULL 07/30] spapr: register dummy ICPs later, David Gibson, 2018/03/05
- [Qemu-devel] [PULL 09/30] macio: embed DBDMA device directly within macio, David Gibson, 2018/03/05
- [Qemu-devel] [PULL 04/30] roms: Added git submodule for u-boot-sam460 (firmware for sam460ex), David Gibson, 2018/03/05
- [Qemu-devel] [PULL 08/30] spapr: harden code that depends on VSMT, David Gibson, 2018/03/05
- [Qemu-devel] [PULL 15/30] mac_oldworld: use object link to pass heathrow PIC object to macio, David Gibson, 2018/03/05
- [Qemu-devel] [PULL 18/30] mac_newworld: use object link to pass OpenPIC object to macio, David Gibson, 2018/03/05
- [Qemu-devel] [PULL 12/30] heathrow: convert to trace-events, David Gibson, 2018/03/05
- [Qemu-devel] [PULL 10/30] macio: move ESCC device within the macio device, David Gibson, 2018/03/05
- [Qemu-devel] [PULL 16/30] openpic: move KVM-specific declarations into separate openpic_kvm.h file, David Gibson, 2018/03/05
- [Qemu-devel] [PULL 20/30] macio: remove macio_init() function, David Gibson, 2018/03/05
- [Qemu-devel] [PULL 26/30] ppc/spapr-caps: Define the pseries-2.12-sxxm machine type,
David Gibson <=
- [Qemu-devel] [PULL 13/30] heathrow: change heathrow_pic_init() to return the heathrow device, David Gibson, 2018/03/05
- [Qemu-devel] [PULL 24/30] ppc/spapr-caps: Convert cap-sbbc to custom spapr-cap, David Gibson, 2018/03/05
- [Qemu-devel] [PULL 19/30] macio: move setting of CUDA timebase frequency to macio_common_realize(), David Gibson, 2018/03/05
- [Qemu-devel] [PULL 25/30] ppc/spapr-caps: Convert cap-ibs to custom spapr-cap, David Gibson, 2018/03/05
- [Qemu-devel] [PULL 14/30] macio: move macio related structures and defines into separate macio.h file, David Gibson, 2018/03/05
- [Qemu-devel] [PULL 23/30] ppc/spapr-caps: Convert cap-cfpc to custom spapr-cap, David Gibson, 2018/03/05
- [Qemu-devel] [PULL 22/30] ppc/spapr-caps: Add support for custom spapr_capabilities, David Gibson, 2018/03/05
- [Qemu-devel] [PULL 27/30] hw/ppc/spapr, e500: Use new property "stdout-path" for boot console, David Gibson, 2018/03/05
- [Qemu-devel] [PULL 11/30] heathrow: QOMify heathrow PIC, David Gibson, 2018/03/05
- [Qemu-devel] [PULL 17/30] openpic: move OpenPIC state and related definitions to openpic.h, David Gibson, 2018/03/05