falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target/ppc/spapr_caps: Add new tristate cap safe_indirect_branch 

Add new tristate cap cap-ibs to represent the indirect branch
serialisation capability.

Signed-off-by: Suraj Jitindar Singh <sjitindarsingh@gmail.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Suraj Jitindar Singh 2018-01-19 16:00:04 +11:00 committed by David Gibson
parent 09114fd817
commit 4be8d4e7d9
3 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/ppc/spapr.c
View File

@ -1793,6 +1793,7 @@ static const VMStateDescription vmstate_spapr = {
&vmstate_spapr_cap_dfp, &vmstate_spapr_cap_dfp,
&vmstate_spapr_cap_cfpc, &vmstate_spapr_cap_cfpc,
&vmstate_spapr_cap_sbbc, &vmstate_spapr_cap_sbbc,
&vmstate_spapr_cap_ibs,
NULL NULL
} }
}; };
@ -3885,6 +3886,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data)
smc->default_caps.caps[SPAPR_CAP_DFP] = SPAPR_CAP_ON; smc->default_caps.caps[SPAPR_CAP_DFP] = SPAPR_CAP_ON;
smc->default_caps.caps[SPAPR_CAP_CFPC] = SPAPR_CAP_BROKEN; smc->default_caps.caps[SPAPR_CAP_CFPC] = SPAPR_CAP_BROKEN;
smc->default_caps.caps[SPAPR_CAP_SBBC] = SPAPR_CAP_BROKEN; smc->default_caps.caps[SPAPR_CAP_SBBC] = SPAPR_CAP_BROKEN;
smc->default_caps.caps[SPAPR_CAP_IBS] = SPAPR_CAP_BROKEN;
spapr_caps_add_properties(smc, &error_abort); spapr_caps_add_properties(smc, &error_abort);
} }

21
hw/ppc/spapr_caps.c
View File

@ -202,6 +202,17 @@ static void cap_safe_bounds_check_apply(sPAPRMachineState *spapr, uint8_t val,
} }
} }
static void cap_safe_indirect_branch_apply(sPAPRMachineState *spapr,
uint8_t val, Error **errp)
{
if (tcg_enabled() && val) {
/* TODO - for now only allow broken for TCG */
error_setg(errp, "Requested safe indirect branch capability level not supported by tcg, try a different value for cap-ibs");
} else if (kvm_enabled() && (val > kvmppc_get_cap_safe_indirect_branch())) {
error_setg(errp, "Requested safe indirect branch capability level not supported by kvm, try a different value for cap-ibs");
}
}
#define VALUE_DESC_TRISTATE " (broken, workaround, fixed)" #define VALUE_DESC_TRISTATE " (broken, workaround, fixed)"
sPAPRCapabilityInfo capability_table[SPAPR_CAP_NUM] = { sPAPRCapabilityInfo capability_table[SPAPR_CAP_NUM] = {
@ -250,6 +261,15 @@ sPAPRCapabilityInfo capability_table[SPAPR_CAP_NUM] = {
.type = "string", .type = "string",
.apply = cap_safe_bounds_check_apply, .apply = cap_safe_bounds_check_apply,
}, },
[SPAPR_CAP_IBS] = {
.name = "ibs",
.description = "Indirect Branch Serialisation" VALUE_DESC_TRISTATE,
.index = SPAPR_CAP_IBS,
.get = spapr_cap_get_tristate,
.set = spapr_cap_set_tristate,
.type = "string",
.apply = cap_safe_indirect_branch_apply,
},
}; };
static sPAPRCapabilities default_caps_with_cpu(sPAPRMachineState *spapr, static sPAPRCapabilities default_caps_with_cpu(sPAPRMachineState *spapr,
@ -357,6 +377,7 @@ SPAPR_CAP_MIG_STATE(vsx, VSX);
SPAPR_CAP_MIG_STATE(dfp, DFP); SPAPR_CAP_MIG_STATE(dfp, DFP);
SPAPR_CAP_MIG_STATE(cfpc, CFPC); SPAPR_CAP_MIG_STATE(cfpc, CFPC);
SPAPR_CAP_MIG_STATE(sbbc, SBBC); SPAPR_CAP_MIG_STATE(sbbc, SBBC);
SPAPR_CAP_MIG_STATE(ibs, IBS);
void spapr_caps_reset(sPAPRMachineState *spapr) void spapr_caps_reset(sPAPRMachineState *spapr)
{ {

5
include/hw/ppc/spapr.h
View File

@ -64,8 +64,10 @@ typedef enum {
#define SPAPR_CAP_CFPC 0x03 #define SPAPR_CAP_CFPC 0x03
/* Speculation Barrier Bounds Checking */ /* Speculation Barrier Bounds Checking */
#define SPAPR_CAP_SBBC 0x04 #define SPAPR_CAP_SBBC 0x04
/* Indirect Branch Serialisation */
#define SPAPR_CAP_IBS 0x05
/* Num Caps */ /* Num Caps */
#define SPAPR_CAP_NUM (SPAPR_CAP_SBBC + 1) #define SPAPR_CAP_NUM (SPAPR_CAP_IBS + 1)
/* /*
* Capability Values * Capability Values
@ -785,6 +787,7 @@ extern const VMStateDescription vmstate_spapr_cap_vsx;
extern const VMStateDescription vmstate_spapr_cap_dfp; extern const VMStateDescription vmstate_spapr_cap_dfp;
extern const VMStateDescription vmstate_spapr_cap_cfpc; extern const VMStateDescription vmstate_spapr_cap_cfpc;
extern const VMStateDescription vmstate_spapr_cap_sbbc; extern const VMStateDescription vmstate_spapr_cap_sbbc;
extern const VMStateDescription vmstate_spapr_cap_ibs;
static inline uint8_t spapr_get_cap(sPAPRMachineState *spapr, int cap) static inline uint8_t spapr_get_cap(sPAPRMachineState *spapr, int cap)
{ {