Commit 4be8d4e7 authored by Suraj Jitindar Singh's avatar Suraj Jitindar Singh Committed by David Gibson
Browse files

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: default avatarSuraj Jitindar Singh <sjitindarsingh@gmail.com>
Reviewed-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 09114fd8

hw/ppc/spapr.c

+2 −0
Original line number Diff line number Diff line
@@ -1793,6 +1793,7 @@ static const VMStateDescription vmstate_spapr = { 
        &vmstate_spapr_cap_dfp,

        &vmstate_spapr_cap_cfpc,

        &vmstate_spapr_cap_sbbc,

        &vmstate_spapr_cap_ibs,

        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_CFPC] = 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);

}

hw/ppc/spapr_caps.c

+21 −0
Original line number Diff line number Diff line
@@ -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)"



sPAPRCapabilityInfo capability_table[SPAPR_CAP_NUM] = {
@@ -250,6 +261,15 @@ sPAPRCapabilityInfo capability_table[SPAPR_CAP_NUM] = { 
        .type = "string",

        .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,
@@ -357,6 +377,7 @@ SPAPR_CAP_MIG_STATE(vsx, VSX); 
SPAPR_CAP_MIG_STATE(dfp, DFP);

SPAPR_CAP_MIG_STATE(cfpc, CFPC);

SPAPR_CAP_MIG_STATE(sbbc, SBBC);

SPAPR_CAP_MIG_STATE(ibs, IBS);



void spapr_caps_reset(sPAPRMachineState *spapr)

{

include/hw/ppc/spapr.h

+4 −1
Original line number Diff line number Diff line
@@ -64,8 +64,10 @@ typedef enum { 
#define SPAPR_CAP_CFPC                  0x03

/* Speculation Barrier Bounds Checking */

#define SPAPR_CAP_SBBC                  0x04

/* Indirect Branch Serialisation */

#define SPAPR_CAP_IBS                   0x05

/* Num Caps */

#define SPAPR_CAP_NUM                   (SPAPR_CAP_SBBC + 1)

#define SPAPR_CAP_NUM                   (SPAPR_CAP_IBS + 1)



/*

 * 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_cfpc;

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)

{