Re: [Qemu-ppc] [RFC NO-MERGE 08/12] target/ppc: Add POWER9/ISAv3.00 to compat_table

[David Gibson]

On Fri, Feb 17, 2017 at 04:08:08PM +1100, Suraj Jitindar Singh wrote:
> compat_table contains the list of logical pvr compat modes which a cpu can
> operate in. It is a list of struct CompatInfo which contains the given pvr
> value for a compat mode, the pcr bits which should be set to operate in
> that compat mode, the pcr level which must be present in pcr_supported for
> a processor to support that compat mode and the max threads possible in
> that compat mode.
> 
> Add an entry for the POWER9/ISAv3.00 logical pvr which represents a
> processor running with support for logical pvr 0x0f000005. A processor
> running in this mode should have PCR_COMPAT_3_00 set in the pcr (if
> available in pcr_mask) and should have PCR_COMPAT_3_00 in pcr_supported
> to indicate that it is capable of running in this compat mode.
> 
> Also add PCR_COMPAT_3_00 to the bits which must be set for all previous
> compat modes. Since no processor models contain this bit yet in pcr_mask
> it will never be set, but this ensures we don't forget to in the future.
> 
> Signed-off-by: Suraj Jitindar Singh <address@hidden>
> ---
>  target/ppc/compat.c | 16 +++++++++++-----
>  1 file changed, 11 insertions(+), 5 deletions(-)
> 
> diff --git a/target/ppc/compat.c b/target/ppc/compat.c
> index 458da26..80c3a95 100644
> --- a/target/ppc/compat.c
> +++ b/target/ppc/compat.c
> @@ -39,29 +39,35 @@ static const CompatInfo compat_table[] = {
>       */
>      { /* POWER6, ISA2.05 */
>          .pvr = CPU_POWERPC_LOGICAL_2_05,
> -        .pcr = PCR_COMPAT_2_07 | PCR_COMPAT_2_06 | PCR_COMPAT_2_05
> -               | PCR_TM_DIS | PCR_VSX_DIS,
> +        .pcr = PCR_COMPAT_3_00 | PCR_COMPAT_2_07 | PCR_COMPAT_2_06 |
> +               PCR_COMPAT_2_05 | PCR_TM_DIS | PCR_VSX_DIS,
>          .pcr_level = PCR_COMPAT_2_05,
>          .max_threads = 2,
>      },
>      { /* POWER7, ISA2.06 */
>          .pvr = CPU_POWERPC_LOGICAL_2_06,
> -        .pcr = PCR_COMPAT_2_07 | PCR_COMPAT_2_06 | PCR_TM_DIS,
> +        .pcr = PCR_COMPAT_3_00 | PCR_COMPAT_2_07 | PCR_COMPAT_2_06 | 
> PCR_TM_DIS,
>          .pcr_level = PCR_COMPAT_2_06,
>          .max_threads = 4,
>      },
>      {
>          .pvr = CPU_POWERPC_LOGICAL_2_06_PLUS,
> -        .pcr = PCR_COMPAT_2_07 | PCR_COMPAT_2_06 | PCR_TM_DIS,
> +        .pcr = PCR_COMPAT_3_00 | PCR_COMPAT_2_07 | PCR_COMPAT_2_06 | 
> PCR_TM_DIS,
>          .pcr_level = PCR_COMPAT_2_06,
>          .max_threads = 4,
>      },
>      { /* POWER8, ISA2.07 */
>          .pvr = CPU_POWERPC_LOGICAL_2_07,
> -        .pcr = PCR_COMPAT_2_07,
> +        .pcr = PCR_COMPAT_3_00 | PCR_COMPAT_2_07,
>          .pcr_level = PCR_COMPAT_2_07,
>          .max_threads = 8,
>      },
> +    { /* POWER9, ISA3.00 */
> +        .pvr = CPU_POWERPC_LOGICAL_3_00,
> +        .pcr = PCR_COMPAT_3_00,
> +     .pcr_level = PCR_COMPAT_3_00,
> +        .max_threads = 4,

Does this need to be 1 for the time being, until Paulus sorts out the
issues about matching guest and host SMT modes.

> +    },
>  };
>  
>  static const CompatInfo *compat_by_pvr(uint32_t pvr)

-- 
David Gibson                    | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au  | minimalist, thank you.  NOT _the_ _other_
                                | _way_ _around_!
http://www.ozlabs.org/~dgibson

signature.asc
Description: PGP signature