[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PULL 2.3 3/5] target-ppc: Remove POWER5+ v0.0 that never exi
From: |
Alexander Graf |
Subject: |
[Qemu-ppc] [PULL 2.3 3/5] target-ppc: Remove POWER5+ v0.0 that never existed |
Date: |
Wed, 25 Mar 2015 22:54:58 +0100 |
From: Alexey Kardashevskiy <address@hidden>
IBM uses low 16bits to specify the chip version of a POWER CPU.
So there has never been an actual silicon with PVR = 0x003B0000.
The first silicon would have PVR 0x003B0100 but it is very unlikely
to find it in any machine shipped to any customer as it was too raw.
This removes CPU_POWERPC_POWER5P_v00 definition and changes
POWER5+ and POWERgs aliases (which are synonyms) to point to
POWER5+_v2.1 which can still be found in real machines.
Signed-off-by: Alexey Kardashevskiy <address@hidden>
Reviewed-by: Andreas Färber <address@hidden>
[agraf: fix commit message]
Signed-off-by: Alexander Graf <address@hidden>
---
target-ppc/cpu-models.c | 6 ++----
target-ppc/cpu-models.h | 1 -
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/target-ppc/cpu-models.c b/target-ppc/cpu-models.c
index 2b560a4..4d5ab4b 100644
--- a/target-ppc/cpu-models.c
+++ b/target-ppc/cpu-models.c
@@ -1124,8 +1124,6 @@
POWERPC_DEF("POWER5", CPU_POWERPC_POWER5, POWER5,
"POWER5")
#endif
- POWERPC_DEF("POWER5+_v0.0", CPU_POWERPC_POWER5P_v00, POWER5P,
- "POWER5+ v0.0")
POWERPC_DEF("POWER5+_v2.1", CPU_POWERPC_POWER5P_v21, POWER5P,
"POWER5+ v2.1")
#if defined(TODO)
@@ -1387,8 +1385,8 @@ PowerPCCPUAlias ppc_cpu_aliases[] = {
{ "Dino", "POWER3" },
{ "POWER3+", "631" },
{ "POWER5gr", "POWER5" },
- { "POWER5+", "POWER5+_v0.0" },
- { "POWER5gs", "POWER5+_v0.0" },
+ { "POWER5+", "POWER5+_v2.1" },
+ { "POWER5gs", "POWER5+_v2.1" },
{ "POWER7", "POWER7_v2.3" },
{ "POWER7+", "POWER7+_v2.1" },
{ "POWER8E", "POWER8E_v1.0" },
diff --git a/target-ppc/cpu-models.h b/target-ppc/cpu-models.h
index ee693af..9d80e72 100644
--- a/target-ppc/cpu-models.h
+++ b/target-ppc/cpu-models.h
@@ -547,7 +547,6 @@ enum {
CPU_POWERPC_POWER4P = 0x00380000,
/* XXX: missing 0x003A0201 */
CPU_POWERPC_POWER5 = 0x003A0203,
- CPU_POWERPC_POWER5P_v00 = 0x003B0000,
CPU_POWERPC_POWER5P_v21 = 0x003B0201,
CPU_POWERPC_POWER6 = 0x003E0000,
CPU_POWERPC_POWER6_5 = 0x0F000001, /* POWER6 in POWER5 mode */
--
1.8.1.4
- [Qemu-ppc] [PULL 2.3 0/5] ppc patch queue 2015-03-25 for 2.3, Alexander Graf, 2015/03/25
- [Qemu-ppc] [PULL 2.3 2/5] spapr: Add missing checks for NULL pointers and report failures, Alexander Graf, 2015/03/25
- [Qemu-ppc] [PULL 2.3 3/5] target-ppc: Remove POWER5+ v0.0 that never existed,
Alexander Graf <=
- [Qemu-ppc] [PULL 2.3 1/5] pseries: Update SLOF firmware image to qemu-slof-20150313, Alexander Graf, 2015/03/25
- [Qemu-ppc] [PULL 2.3 5/5] powerpc: fix -machine usb=no for newworld and pseries machines, Alexander Graf, 2015/03/25
- [Qemu-ppc] [PULL 2.3 4/5] PPC: pseries: Implement boot once=foo, Alexander Graf, 2015/03/25
- Re: [Qemu-ppc] [PULL 2.3 0/5] ppc patch queue 2015-03-25 for 2.3, Peter Maydell, 2015/03/26