Commit a7d6b9f0 authored by Andreas Färber's avatar Andreas Färber Committed by Anthony Liguori
Browse files

target-ppc: Fix POWER7+ model 



Commit 03a15a54 claimed to add a POWER7+
model but instead added a "POWER7P" model, with an unhelpful "POWER7P"
description on top. Fix this to "POWER7+" as we already have "POWER3+",
"POWER4+" and "POWER5+" and there being no reason to deviate with the
user-visible command line -cpu POWER7P from the marketing name POWER7+.

Further, don't needlessly deviate from the scheme of naming PVR constant,
QOM type and device description after the exact revision that is in fact
encoded in the PVR used.
That way, we can change the user-friendly alias -cpu POWER7+ to point to a
different revision if we so desire, while not polluting the type namespace.

This naming scheme is sensible and completely orthogonal to how PVRs may
or may not get matched to CPU types.

Cc: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
Message-id: 1375736387-8429-1-git-send-email-afaerber@suse.de
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 0dd5ce38

target-ppc/cpu-models.c

+3 −2
Original line number Diff line number Diff line
@@ -1143,8 +1143,8 @@ 
                "POWER7 v2.1")

    POWERPC_DEF("POWER7_v2.3",   CPU_POWERPC_POWER7_v23,             POWER7,

                "POWER7 v2.3")

    POWERPC_DEF("POWER7P",       CPU_POWERPC_POWER7P,                POWER7,

                "POWER7P")

    POWERPC_DEF("POWER7+_v2.1",  CPU_POWERPC_POWER7P_v21,            POWER7,

                "POWER7+ v2.1")

    POWERPC_DEF("POWER8_v1.0",   CPU_POWERPC_POWER8_v10,             POWER8,

                "POWER8 v1.0")

    POWERPC_DEF("970",           CPU_POWERPC_970,                    970,
@@ -1392,6 +1392,7 @@ PowerPCCPUAlias ppc_cpu_aliases[] = { 
    { "Dino",  "POWER3" },

    { "POWER3+", "631" },

    { "POWER7", "POWER7_v2.3" },

    { "POWER7+", "POWER7+_v2.1" },

    { "POWER8", "POWER8_v1.0" },

    { "970fx", "970fx_v3.1" },

    { "970mp", "970mp_v1.1" },

target-ppc/cpu-models.h

+1 −1
Original line number Diff line number Diff line
@@ -556,7 +556,7 @@ enum { 
    CPU_POWERPC_POWER7_v20         = 0x003F0200,

    CPU_POWERPC_POWER7_v21         = 0x003F0201,

    CPU_POWERPC_POWER7_v23         = 0x003F0203,

    CPU_POWERPC_POWER7P            = 0x004A0201,

    CPU_POWERPC_POWER7P_v21        = 0x004A0201,

    CPU_POWERPC_POWER8_v10         = 0x004B0100,

    CPU_POWERPC_970                = 0x00390202,

    CPU_POWERPC_970FX_v10          = 0x00391100,