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

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



Convert cap-cfpc (cache flush on privilege change) to a custom spapr-cap
type.

Signed-off-by: default avatarSuraj Jitindar Singh <sjitindarsingh@gmail.com>
[dwg: Don't explicitly list "?"/help option, trusting convention]
[dwg: Strip no-longer-necessary ATTRIBUTE_UNUSED back off]
[dwg: Fix some minor style problems]
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 87175d1b

hw/ppc/spapr_caps.c

+22 −11
Original line number Diff line number Diff line
@@ -149,8 +149,7 @@ out: 
    g_free(val);

}



static void ATTRIBUTE_UNUSED spapr_cap_get_string(Object *obj, Visitor *v,

                                                  const char *name,

static void  spapr_cap_get_string(Object *obj, Visitor *v, const char *name,

                                  void *opaque, Error **errp)

{

    sPAPRCapabilityInfo *cap = opaque;
@@ -169,8 +168,7 @@ static void ATTRIBUTE_UNUSED spapr_cap_get_string(Object *obj, Visitor *v, 
    g_free(val);

}



static void ATTRIBUTE_UNUSED spapr_cap_set_string(Object *obj, Visitor *v,

                                                  const char *name,

static void spapr_cap_set_string(Object *obj, Visitor *v, const char *name,

                                 void *opaque, Error **errp)

{

    sPAPRCapabilityInfo *cap = opaque;
@@ -250,14 +248,26 @@ static void cap_dfp_apply(sPAPRMachineState *spapr, uint8_t val, Error **errp) 
    }

}



sPAPRCapPossible cap_cfpc_possible = {

    .num = 3,

    .vals = {"broken", "workaround", "fixed"},

    .help = "broken - no protection, workaround - workaround available,"

            " fixed - fixed in hardware",

};



static void cap_safe_cache_apply(sPAPRMachineState *spapr, uint8_t val,

                                 Error **errp)

{

    uint8_t kvm_val =  kvmppc_get_cap_safe_cache();



    if (tcg_enabled() && val) {

        /* TODO - for now only allow broken for TCG */

        error_setg(errp, "Requested safe cache capability level not supported by tcg, try a different value for cap-cfpc");

    } else if (kvm_enabled() && (val > kvmppc_get_cap_safe_cache())) {

        error_setg(errp, "Requested safe cache capability level not supported by kvm, try a different value for cap-cfpc");

        error_setg(errp,

"Requested safe cache capability level not supported by tcg, try a different value for cap-cfpc");

    } else if (kvm_enabled() && (val > kvm_val)) {

        error_setg(errp,

"Requested safe cache capability level not supported by kvm, try cap-cfpc=%s",

                   cap_cfpc_possible.vals[kvm_val]);

    }

}
@@ -319,9 +329,10 @@ sPAPRCapabilityInfo capability_table[SPAPR_CAP_NUM] = { 
        .name = "cfpc",

        .description = "Cache Flush on Privilege Change" VALUE_DESC_TRISTATE,

        .index = SPAPR_CAP_CFPC,

        .get = spapr_cap_get_tristate,

        .set = spapr_cap_set_tristate,

        .get = spapr_cap_get_string,

        .set = spapr_cap_set_string,

        .type = "string",

        .possible = &cap_cfpc_possible,

        .apply = cap_safe_cache_apply,

    },

    [SPAPR_CAP_SBBC] = {