[Qemu-devel] [PATCH] target-ppc: Add POWER8E_v2.1 CPU model.

[David Gibson <david@gibson.dropbear.id.au>]

From: Andrea Bolognani <abologna@redhat.com>

Add a missing PVR value for the POWER8E v2.1 CPU.  Information taken
from the kernel cputable.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 target-ppc/cpu-models.c | 4 +++-
 target-ppc/cpu-models.h | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

Alex,

Not sure if this counts as a bugfix which can be merged now we're in
the hard freeze.  The lack of it does mean we can't work on one of our
dev machines which has this CPU.

diff --git a/target-ppc/cpu-models.c b/target-ppc/cpu-models.c
index 4d5ab4b..9d8769b 100644
--- a/target-ppc/cpu-models.c
+++ b/target-ppc/cpu-models.c
@@ -1140,6 +1140,8 @@
                 "POWER7+ v2.1")
     POWERPC_DEF("POWER8E_v1.0",  CPU_POWERPC_POWER8E_v10,            POWER8,
                 "POWER8E v1.0")
+    POWERPC_DEF("POWER8E_v2.1",  CPU_POWERPC_POWER8E_v21,            POWER8,
+                "POWER8E v2.1")
     POWERPC_DEF("POWER8_v1.0",   CPU_POWERPC_POWER8_v10,             POWER8,
                 "POWER8 v1.0")
     POWERPC_DEF("970_v2.2",      CPU_POWERPC_970_v22,                970,
@@ -1389,7 +1391,7 @@ PowerPCCPUAlias ppc_cpu_aliases[] = {
     { "POWER5gs", "POWER5+_v2.1" },
     { "POWER7", "POWER7_v2.3" },
     { "POWER7+", "POWER7+_v2.1" },
-    { "POWER8E", "POWER8E_v1.0" },
+    { "POWER8E", "POWER8E_v2.1" },
     { "POWER8", "POWER8_v1.0" },
     { "970", "970_v2.2" },
     { "970fx", "970fx_v3.1" },
diff --git a/target-ppc/cpu-models.h b/target-ppc/cpu-models.h
index 9d80e72..add31c6 100644
--- a/target-ppc/cpu-models.h
+++ b/target-ppc/cpu-models.h
@@ -558,6 +558,7 @@ enum {
     CPU_POWERPC_POWER7P_v21        = 0x004A0201,
     CPU_POWERPC_POWER8E_BASE       = 0x004B0000,
     CPU_POWERPC_POWER8E_v10        = 0x004B0100,
+    CPU_POWERPC_POWER8E_v21        = 0x004B0201,
     CPU_POWERPC_POWER8_BASE        = 0x004D0000,
     CPU_POWERPC_POWER8_v10         = 0x004D0100,
     CPU_POWERPC_970_v22            = 0x00390202,
-- 
2.4.3