26ba25
From fc0c82b8d52b1d5a5da0cef66a54b9e277084663 Mon Sep 17 00:00:00 2001
26ba25
From: Suraj Jitindar Singh <sursingh@redhat.com>
26ba25
Date: Thu, 21 Jun 2018 06:56:49 +0200
26ba25
Subject: [PATCH 062/268] ppc/spapr_caps: Don't disable cap_cfpc on POWER8 by
26ba25
 default
26ba25
26ba25
RH-Author: Suraj Jitindar Singh <sursingh@redhat.com>
26ba25
Message-id: <1529564209-30369-4-git-send-email-sursingh@redhat.com>
26ba25
Patchwork-id: 80929
26ba25
O-Subject: [RHEL-7.6 qemu-kvm-rhev PATCH 3/3] ppc/spapr_caps: Don't disable cap_cfpc on POWER8 by default
26ba25
Bugzilla: 1560847
26ba25
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
26ba25
RH-Acked-by: David Gibson <dgibson@redhat.com>
26ba25
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
26ba25
26ba25
From: Suraj Jitindar Singh <sjitindarsingh@gmail.com>
26ba25
26ba25
In default_caps_with_cpu() we set spapr_cap_cfpc to broken for POWER8
26ba25
processors and before.
26ba25
26ba25
Since we no longer require private l1d cache on POWER8 for this cap to
26ba25
be set to workaround change this to default to broken for POWER7
26ba25
processors and before.
26ba25
26ba25
Signed-off-by: Suraj Jitindar Singh <sjitindarsingh@gmail.com>
26ba25
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
26ba25
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
26ba25
(cherry picked from commit b2540203bdf4a390c3489146eae82ce237303653)
26ba25
26ba25
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1560847
26ba25
26ba25
Signed-off-by: Suraj Jitindar Singh <sursingh@redhat.com>
26ba25
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
26ba25
---
26ba25
 hw/ppc/spapr_caps.c | 6 +-----
26ba25
 1 file changed, 1 insertion(+), 5 deletions(-)
26ba25
26ba25
diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c
26ba25
index 531e145..00e43a9 100644
26ba25
--- a/hw/ppc/spapr_caps.c
26ba25
+++ b/hw/ppc/spapr_caps.c
26ba25
@@ -335,14 +335,10 @@ static sPAPRCapabilities default_caps_with_cpu(sPAPRMachineState *spapr,
26ba25
 
26ba25
     caps = smc->default_caps;
26ba25
 
26ba25
-    if (!ppc_check_compat(cpu, CPU_POWERPC_LOGICAL_3_00,
26ba25
-                          0, spapr->max_compat_pvr)) {
26ba25
-        caps.caps[SPAPR_CAP_CFPC] = SPAPR_CAP_BROKEN;
26ba25
-    }
26ba25
-
26ba25
     if (!ppc_check_compat(cpu, CPU_POWERPC_LOGICAL_2_07,
26ba25
                           0, spapr->max_compat_pvr)) {
26ba25
         caps.caps[SPAPR_CAP_HTM] = SPAPR_CAP_OFF;
26ba25
+        caps.caps[SPAPR_CAP_CFPC] = SPAPR_CAP_BROKEN;
26ba25
     }
26ba25
 
26ba25
     if (!ppc_check_compat(cpu, CPU_POWERPC_LOGICAL_2_06_PLUS,
26ba25
-- 
26ba25
1.8.3.1
26ba25