Blame SOURCES/kvm-target-ppc-Factor-out-the-parsing-in-kvmppc_get_cpu_.patch

26ba25
From e4af250e57428a1a29b8f18c4ceaeb6be3d1eff6 Mon Sep 17 00:00:00 2001
26ba25
From: Suraj Jitindar Singh <sursingh@redhat.com>
26ba25
Date: Thu, 21 Jun 2018 06:56:47 +0200
26ba25
Subject: [PATCH 060/268] target/ppc: Factor out the parsing in
26ba25
 kvmppc_get_cpu_characteristics()
26ba25
26ba25
RH-Author: Suraj Jitindar Singh <sursingh@redhat.com>
26ba25
Message-id: <1529564209-30369-2-git-send-email-sursingh@redhat.com>
26ba25
Patchwork-id: 80927
26ba25
O-Subject: [RHEL-7.6 qemu-kvm-rhev PATCH 1/3] target/ppc: Factor out the parsing in kvmppc_get_cpu_characteristics()
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
Factor out the parsing of struct kvm_ppc_cpu_char in
26ba25
kvmppc_get_cpu_characteristics() into a separate function for each cap
26ba25
for simplicity.
26ba25
26ba25
Signed-off-by: Suraj Jitindar Singh <sjitindarsingh@gmail.com>
26ba25
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
26ba25
(cherry picked from commit 8fea70440eb0d095442de7e80d586a285cf96be5)
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
 target/ppc/kvm.c | 59 +++++++++++++++++++++++++++++++++++++-------------------
26ba25
 1 file changed, 39 insertions(+), 20 deletions(-)
26ba25
26ba25
diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
26ba25
index 79a436a..d787032 100644
26ba25
--- a/target/ppc/kvm.c
26ba25
+++ b/target/ppc/kvm.c
26ba25
@@ -2461,6 +2461,41 @@ bool kvmppc_has_cap_mmu_hash_v3(void)
26ba25
     return cap_mmu_hash_v3;
26ba25
 }
26ba25
 
26ba25
+static int parse_cap_ppc_safe_cache(struct kvm_ppc_cpu_char c)
26ba25
+{
26ba25
+    if (~c.behaviour & c.behaviour_mask & H_CPU_BEHAV_L1D_FLUSH_PR) {
26ba25
+        return 2;
26ba25
+    } else if ((c.character & c.character_mask & H_CPU_CHAR_L1D_THREAD_PRIV) &&
26ba25
+               (c.character & c.character_mask
26ba25
+                & (H_CPU_CHAR_L1D_FLUSH_ORI30 | H_CPU_CHAR_L1D_FLUSH_TRIG2))) {
26ba25
+        return 1;
26ba25
+    }
26ba25
+
26ba25
+    return 0;
26ba25
+}
26ba25
+
26ba25
+static int parse_cap_ppc_safe_bounds_check(struct kvm_ppc_cpu_char c)
26ba25
+{
26ba25
+    if (~c.behaviour & c.behaviour_mask & H_CPU_BEHAV_BNDS_CHK_SPEC_BAR) {
26ba25
+        return 2;
26ba25
+    } else if (c.character & c.character_mask & H_CPU_CHAR_SPEC_BAR_ORI31) {
26ba25
+        return 1;
26ba25
+    }
26ba25
+
26ba25
+    return 0;
26ba25
+}
26ba25
+
26ba25
+static int parse_cap_ppc_safe_indirect_branch(struct kvm_ppc_cpu_char c)
26ba25
+{
26ba25
+    if (c.character & c.character_mask & H_CPU_CHAR_CACHE_COUNT_DIS) {
26ba25
+        return  SPAPR_CAP_FIXED_CCD;
26ba25
+    } else if (c.character & c.character_mask & H_CPU_CHAR_BCCTRL_SERIALISED) {
26ba25
+        return SPAPR_CAP_FIXED_IBS;
26ba25
+    }
26ba25
+
26ba25
+    return 0;
26ba25
+}
26ba25
+
26ba25
 static void kvmppc_get_cpu_characteristics(KVMState *s)
26ba25
 {
26ba25
     struct kvm_ppc_cpu_char c;
26ba25
@@ -2479,26 +2514,10 @@ static void kvmppc_get_cpu_characteristics(KVMState *s)
26ba25
     if (ret < 0) {
26ba25
         return;
26ba25
     }
26ba25
-    /* Parse and set cap_ppc_safe_cache */
26ba25
-    if (~c.behaviour & c.behaviour_mask & H_CPU_BEHAV_L1D_FLUSH_PR) {
26ba25
-        cap_ppc_safe_cache = 2;
26ba25
-    } else if ((c.character & c.character_mask & H_CPU_CHAR_L1D_THREAD_PRIV) &&
26ba25
-               (c.character & c.character_mask
26ba25
-                & (H_CPU_CHAR_L1D_FLUSH_ORI30 | H_CPU_CHAR_L1D_FLUSH_TRIG2))) {
26ba25
-        cap_ppc_safe_cache = 1;
26ba25
-    }
26ba25
-    /* Parse and set cap_ppc_safe_bounds_check */
26ba25
-    if (~c.behaviour & c.behaviour_mask & H_CPU_BEHAV_BNDS_CHK_SPEC_BAR) {
26ba25
-        cap_ppc_safe_bounds_check = 2;
26ba25
-    } else if (c.character & c.character_mask & H_CPU_CHAR_SPEC_BAR_ORI31) {
26ba25
-        cap_ppc_safe_bounds_check = 1;
26ba25
-    }
26ba25
-    /* Parse and set cap_ppc_safe_indirect_branch */
26ba25
-    if (c.character & c.character_mask & H_CPU_CHAR_CACHE_COUNT_DIS) {
26ba25
-        cap_ppc_safe_indirect_branch = SPAPR_CAP_FIXED_CCD;
26ba25
-    } else if (c.character & c.character_mask & H_CPU_CHAR_BCCTRL_SERIALISED) {
26ba25
-        cap_ppc_safe_indirect_branch = SPAPR_CAP_FIXED_IBS;
26ba25
-    }
26ba25
+
26ba25
+    cap_ppc_safe_cache = parse_cap_ppc_safe_cache(c);
26ba25
+    cap_ppc_safe_bounds_check = parse_cap_ppc_safe_bounds_check(c);
26ba25
+    cap_ppc_safe_indirect_branch = parse_cap_ppc_safe_indirect_branch(c);
26ba25
 }
26ba25
 
26ba25
 int kvmppc_get_cap_safe_cache(void)
26ba25
-- 
26ba25
1.8.3.1
26ba25