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

ppc/spapr-caps: Define the pseries-2.12-sxxm machine type 



The sxxm (speculative execution exploit mitigation) machine type is a
variant of the 2.12 machine type with workarounds for speculative
execution vulnerabilities enabled by default.

Signed-off-by: default avatarSuraj Jitindar Singh <sjitindarsingh@gmail.com>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent c76c0d30

hw/ppc/spapr.c

+17 −0
Original line number Diff line number Diff line
@@ -3983,6 +3983,23 @@ static void spapr_machine_2_12_class_options(MachineClass *mc) 


DEFINE_SPAPR_MACHINE(2_12, "2.12", true);



static void spapr_machine_2_12_sxxm_instance_options(MachineState *machine)

{

    spapr_machine_2_12_instance_options(machine);

}



static void spapr_machine_2_12_sxxm_class_options(MachineClass *mc)

{

    sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc);



    spapr_machine_2_12_class_options(mc);

    smc->default_caps.caps[SPAPR_CAP_CFPC] = SPAPR_CAP_WORKAROUND;

    smc->default_caps.caps[SPAPR_CAP_SBBC] = SPAPR_CAP_WORKAROUND;

    smc->default_caps.caps[SPAPR_CAP_IBS] = SPAPR_CAP_FIXED_CCD;

}



DEFINE_SPAPR_MACHINE(2_12_sxxm, "2.12-sxxm", false);



/*

 * pseries-2.11

 */

hw/ppc/spapr_caps.c

+11 −0
Original line number Diff line number Diff line
@@ -335,15 +335,26 @@ static sPAPRCapabilities default_caps_with_cpu(sPAPRMachineState *spapr, 


    caps = smc->default_caps;



    if (!ppc_check_compat(cpu, CPU_POWERPC_LOGICAL_3_00,

                          0, spapr->max_compat_pvr)) {

        caps.caps[SPAPR_CAP_CFPC] = SPAPR_CAP_BROKEN;

    }



    if (!ppc_check_compat(cpu, CPU_POWERPC_LOGICAL_2_07,

                          0, spapr->max_compat_pvr)) {

        caps.caps[SPAPR_CAP_HTM] = SPAPR_CAP_OFF;

    }



    if (!ppc_check_compat(cpu, CPU_POWERPC_LOGICAL_2_06_PLUS,

                          0, spapr->max_compat_pvr)) {

        caps.caps[SPAPR_CAP_SBBC] = SPAPR_CAP_BROKEN;

    }



    if (!ppc_check_compat(cpu, CPU_POWERPC_LOGICAL_2_06,

                          0, spapr->max_compat_pvr)) {

        caps.caps[SPAPR_CAP_VSX] = SPAPR_CAP_OFF;

        caps.caps[SPAPR_CAP_DFP] = SPAPR_CAP_OFF;

        caps.caps[SPAPR_CAP_IBS] = SPAPR_CAP_BROKEN;

    }



    return caps;