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

target/ppc/spapr: Enable mitigations by default for pseries-4.0 machine type 



There are currently 3 mitigations the availability of which is controlled
by the spapr-caps mechanism, cap-cfpc, cap-sbbc, and cap-ibs. Enable these
mitigations by default for the pseries-4.0 machine type.

By now machine firmware should have been upgraded to allow these
settings.

Signed-off-by: default avatarSuraj Jitindar Singh <sjitindarsingh@gmail.com>
Message-Id: <20190301044609.9626-3-sjitindarsingh@gmail.com>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 006e9d36

hw/ppc/spapr.c

+6 −3
Original line number Diff line number Diff line
@@ -4307,9 +4307,9 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) 
    smc->default_caps.caps[SPAPR_CAP_HTM] = SPAPR_CAP_OFF;

    smc->default_caps.caps[SPAPR_CAP_VSX] = 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_SBBC] = SPAPR_CAP_BROKEN;

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

    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_WORKAROUND;

    smc->default_caps.caps[SPAPR_CAP_HPT_MAXPAGESIZE] = 16; /* 64kiB */

    smc->default_caps.caps[SPAPR_CAP_NESTED_KVM_HV] = SPAPR_CAP_OFF;

    smc->default_caps.caps[SPAPR_CAP_LARGE_DECREMENTER] = SPAPR_CAP_ON;
@@ -4389,6 +4389,9 @@ static void spapr_machine_3_1_class_options(MachineClass *mc) 
    mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("power8_v2.0");

    smc->update_dt_enabled = false;

    smc->dr_phb_enabled = false;

    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;

    smc->default_caps.caps[SPAPR_CAP_LARGE_DECREMENTER] = SPAPR_CAP_OFF;

}