From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33348) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YatGW-0000XZ-TZ for qemu-devel@nongnu.org; Wed, 25 Mar 2015 17:55:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YatGR-0007aN-27 for qemu-devel@nongnu.org; Wed, 25 Mar 2015 17:55:08 -0400 From: Alexander Graf Date: Wed, 25 Mar 2015 22:54:58 +0100 Message-Id: <1427320500-6772-4-git-send-email-agraf@suse.de> In-Reply-To: <1427320500-6772-1-git-send-email-agraf@suse.de> References: <1427320500-6772-1-git-send-email-agraf@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 2.3 3/5] target-ppc: Remove POWER5+ v0.0 that never existed List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-ppc@nongnu.org Cc: Alexey Kardashevskiy , peter.maydell@linaro.org, qemu-devel@nongnu.org From: Alexey Kardashevskiy IBM uses low 16bits to specify the chip version of a POWER CPU. So there has never been an actual silicon with PVR =3D 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 Reviewed-by: Andreas F=C3=A4rber [agraf: fix commit message] Signed-off-by: Alexander Graf --- 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, POW= ER5, "POWER5") #endif - POWERPC_DEF("POWER5+_v0.0", CPU_POWERPC_POWER5P_v00, POW= ER5P, - "POWER5+ v0.0") POWERPC_DEF("POWER5+_v2.1", CPU_POWERPC_POWER5P_v21, POW= ER5P, "POWER5+ v2.1") #if defined(TODO) @@ -1387,8 +1385,8 @@ PowerPCCPUAlias ppc_cpu_aliases[] =3D { { "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 =3D 0x00380000, /* XXX: missing 0x003A0201 */ CPU_POWERPC_POWER5 =3D 0x003A0203, - CPU_POWERPC_POWER5P_v00 =3D 0x003B0000, CPU_POWERPC_POWER5P_v21 =3D 0x003B0201, CPU_POWERPC_POWER6 =3D 0x003E0000, CPU_POWERPC_POWER6_5 =3D 0x0F000001, /* POWER6 in POWER5 m= ode */ --=20 1.8.1.4