ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ppc/spapr-caps: Convert cap-sbbc to custom spapr-cap 

Convert cap-sbbc (speculation barrier bounds checking) to a custom
spapr-cap type.

Signed-off-by: Suraj Jitindar Singh <sjitindarsingh@gmail.com>
[dwg: Removed trailing whitespace]
[dwg: Don't explicitly list "?"/help option, trust convention]
[dwg: Fix some minor style problems]
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Suraj Jitindar Singh 2018-03-01 17:38:01 +11:00 committed by David Gibson
parent f27aa81e72
commit aaf265ffde
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hw/ppc/spapr_caps.c
View File

@ -271,14 +271,26 @@ 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, static void cap_safe_bounds_check_apply(sPAPRMachineState *spapr, uint8_t val,
Error **errp) Error **errp)
{ {
uint8_t kvm_val = kvmppc_get_cap_safe_bounds_check();
if (tcg_enabled() && val) { if (tcg_enabled() && val) {
/* TODO - for now only allow broken for TCG */ /* 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"); error_setg(errp,
} else if (kvm_enabled() && (val > kvmppc_get_cap_safe_bounds_check())) { "Requested safe bounds check capability level not supported by tcg, try a different value for cap-sbbc");
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]);
} }
} }
@ -339,9 +351,10 @@ sPAPRCapabilityInfo capability_table[SPAPR_CAP_NUM] = {
.name = "sbbc", .name = "sbbc",
.description = "Speculation Barrier Bounds Checking" VALUE_DESC_TRISTATE, .description = "Speculation Barrier Bounds Checking" VALUE_DESC_TRISTATE,
.index = SPAPR_CAP_SBBC, .index = SPAPR_CAP_SBBC,
.get = spapr_cap_get_tristate, .get = spapr_cap_get_string,
.set = spapr_cap_set_tristate, .set = spapr_cap_set_string,
.type = "string", .type = "string",
.possible = &cap_sbbc_possible,
.apply = cap_safe_bounds_check_apply, .apply = cap_safe_bounds_check_apply,
}, },
[SPAPR_CAP_IBS] = { [SPAPR_CAP_IBS] = {