Re: [Qemu-ppc] [Qemu-devel] [PATCH] target-ppc: Add POWER7+ CPU model

[Andreas Färber]

Am 02.08.2013 04:59, schrieb Alexey Kardashevskiy:
> This patch adds CPU PVR definition for POWER7+.
> 
> Signed-off-by: Alexey Kardashevskiy <address@hidden>
> ---
>  target-ppc/cpu-models.c | 2 ++
>  target-ppc/cpu-models.h | 1 +
>  2 files changed, 3 insertions(+)
> 
> diff --git a/target-ppc/cpu-models.c b/target-ppc/cpu-models.c
> index 9578ed8..c97c183 100644
> --- a/target-ppc/cpu-models.c
> +++ b/target-ppc/cpu-models.c
> @@ -1143,6 +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")

Subject says POWER7+ rather than POWER7P. Since this is a string there's
nothing wrong with +. How should it show up in SLOF?
See also below.

>      POWERPC_DEF("POWER8_v1.0",   CPU_POWERPC_POWER8_v10,             POWER8,
>                  "POWER8 v1.0")
>      POWERPC_DEF("970",           CPU_POWERPC_970,                    970,
> diff --git a/target-ppc/cpu-models.h b/target-ppc/cpu-models.h
> index 01e488f..c3c78d1 100644
> --- a/target-ppc/cpu-models.h
> +++ b/target-ppc/cpu-models.h
> @@ -556,6 +556,7 @@ enum {
>      CPU_POWERPC_POWER7_v20         = 0x003F0200,
>      CPU_POWERPC_POWER7_v21         = 0x003F0201,
>      CPU_POWERPC_POWER7_v23         = 0x003F0203,
> +    CPU_POWERPC_POWER7P            = 0x004A0201,

Shouldn't this be ..._POWER7P_v21 to align with the surrounding models?
Ditto for the model name then, POWER7+ being an alias to the latest
version only.

The first field becomes part of the type name, so we should properly
name it from the start.

Andreas

>      CPU_POWERPC_POWER8_v10         = 0x004B0100,
>      CPU_POWERPC_970                = 0x00390202,
>      CPU_POWERPC_970FX_v10          = 0x00391100,

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg