[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 21/24] ppc/spapr-caps: Convert cap-sbbc to custom spa
From: |
David Gibson |
Subject: |
[Qemu-devel] [PULL 21/24] ppc/spapr-caps: Convert cap-sbbc to custom spapr-cap |
Date: |
Fri, 2 Mar 2018 17:03:47 +1100 |
From: Suraj Jitindar Singh <address@hidden>
Convert cap-sbbc (speculation barrier bounds checking) to a custom
spapr-cap type.
Signed-off-by: Suraj Jitindar Singh <address@hidden>
[dwg: Removed trailing whitespace]
[dwg: Don't explicitly list "?"/help option, trust convention]
Signed-off-by: David Gibson <address@hidden>
---
hw/ppc/spapr_caps.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c
index 4a93a3b4de..f75d6ff211 100644
--- a/hw/ppc/spapr_caps.c
+++ b/hw/ppc/spapr_caps.c
@@ -267,14 +267,22 @@ static void cap_safe_cache_apply(sPAPRMachineState
*spapr, uint8_t val,
}
}
+sPAPRCapPossible cap_sbbc_possible = {
+ .num = 3,
+ .vals = {"broken", "workaround", "fixed"},
+ .help = "broken - no protection, workaround - workaround available, fixed
- fixed in hardware",
+};
+
static void cap_safe_bounds_check_apply(sPAPRMachineState *spapr, uint8_t val,
Error **errp)
{
+ uint8_t kvm_val = kvmppc_get_cap_safe_bounds_check();
+
if (tcg_enabled() && val) {
/* TODO - for now only allow broken for TCG */
error_setg(errp, "Requested safe bounds check capability level not
supported by tcg, try a different value for cap-sbbc");
- } else if (kvm_enabled() && (val > kvmppc_get_cap_safe_bounds_check())) {
- error_setg(errp, "Requested safe bounds check capability level not
supported by kvm, try a different value for cap-sbbc");
+ } else if (kvm_enabled() && (val > kvm_val)) {
+ error_setg(errp, "Requested safe bounds check capability level not
supported by kvm, try cap-sbbc=%s", cap_sbbc_possible.vals[kvm_val]);
}
}
@@ -335,9 +343,10 @@ sPAPRCapabilityInfo capability_table[SPAPR_CAP_NUM] = {
.name = "sbbc",
.description = "Speculation Barrier Bounds Checking"
VALUE_DESC_TRISTATE,
.index = SPAPR_CAP_SBBC,
- .get = spapr_cap_get_tristate,
- .set = spapr_cap_set_tristate,
+ .get = spapr_cap_get_string,
+ .set = spapr_cap_set_string,
.type = "string",
+ .possible = &cap_sbbc_possible,
.apply = cap_safe_bounds_check_apply,
},
[SPAPR_CAP_IBS] = {
--
2.14.3
- [Qemu-devel] [PULL 16/24] macio: move setting of CUDA timebase frequency to macio_common_realize(), (continued)
- [Qemu-devel] [PULL 16/24] macio: move setting of CUDA timebase frequency to macio_common_realize(), David Gibson, 2018/03/02
- [Qemu-devel] [PULL 18/24] target/ppc: Check mask when setting cap_ppc_safe_indirect_branch, David Gibson, 2018/03/02
- [Qemu-devel] [PULL 02/24] ppc440: Add emulation of plb-pcix controller found in some 440 SoCs, David Gibson, 2018/03/02
- [Qemu-devel] [PULL 17/24] macio: remove macio_init() function, David Gibson, 2018/03/02
- [Qemu-devel] [PULL 15/24] mac_newworld: use object link to pass OpenPIC object to macio, David Gibson, 2018/03/02
- [Qemu-devel] [PULL 14/24] openpic: move OpenPIC state and related definitions to openpic.h, David Gibson, 2018/03/02
- [Qemu-devel] [PULL 22/24] ppc/spapr-caps: Convert cap-ibs to custom spapr-cap, David Gibson, 2018/03/02
- [Qemu-devel] [PULL 19/24] ppc/spapr-caps: Add support for custom spapr_capabilities, David Gibson, 2018/03/02
- [Qemu-devel] [PULL 03/24] ppc: Add aCube Sam460ex board, David Gibson, 2018/03/02
- [Qemu-devel] [PULL 20/24] ppc/spapr-caps: Convert cap-cfpc to custom spapr-cap, David Gibson, 2018/03/02
- [Qemu-devel] [PULL 21/24] ppc/spapr-caps: Convert cap-sbbc to custom spapr-cap,
David Gibson <=
- [Qemu-devel] [PULL 23/24] ppc/spapr-caps: Define the pseries-2.12-sxxm machine type, David Gibson, 2018/03/02
- Re: [Qemu-devel] [PULL 00/24] ppc-for-2.12 queue 20180302, no-reply, 2018/03/02
- Re: [Qemu-devel] [PULL 00/24] ppc-for-2.12 queue 20180302, Peter Maydell, 2018/03/02