From: Suraj Jitindar Singh Date: Tue, 12 Jun 2018 05:16:30 +0000 (+1000) Subject: ppc/spapr_caps: Don't disable cap_cfpc on POWER8 by default X-Git-Tag: v3.0.0-rc0~80^2~26 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b2540203bdf4a390c3489146eae82ce237303653;p=thirdparty%2Fqemu.git ppc/spapr_caps: Don't disable cap_cfpc on POWER8 by default In default_caps_with_cpu() we set spapr_cap_cfpc to broken for POWER8 processors and before. Since we no longer require private l1d cache on POWER8 for this cap to be set to workaround change this to default to broken for POWER7 processors and before. Signed-off-by: Suraj Jitindar Singh Reviewed-by: David Gibson Signed-off-by: David Gibson --- diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c index 531e145114a..00e43a9ba77 100644 --- a/hw/ppc/spapr_caps.c +++ b/hw/ppc/spapr_caps.c @@ -335,14 +335,10 @@ 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; + caps.caps[SPAPR_CAP_CFPC] = SPAPR_CAP_BROKEN; } if (!ppc_check_compat(cpu, CPU_POWERPC_LOGICAL_2_06_PLUS,