Re: [Qemu-devel] [PATCH 2/2] s390x/cpumodel: z14 cpu models

[Christian Borntraeger <borntraeger@de.ibm.com>]

On 07/17/2017 06:58 PM, Christian Borntraeger wrote:
> From: "Jason J. Herne" <jjherne@linux.vnet.ibm.com>
> 
> This patch introduces the CPU model for z14, along with all base and
> optional features.
> 
> Signed-off-by: Jason J. Herne <jjherne@linux.vnet.ibm.com>
> Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
> ---
>  target/s390x/cpu_models.c   |  1 +
>  target/s390x/gen-features.c | 38 ++++++++++++++++++++++++++++++++++++++
>  2 files changed, 39 insertions(+)
> 
> diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
> index c654279..e2ccc32 100644
> --- a/target/s390x/cpu_models.c
> +++ b/target/s390x/cpu_models.c
> @@ -75,6 +75,7 @@ static S390CPUDef s390_cpu_defs[] = {
>      CPUDEF_INIT(0x2964, 13, 1, 47, 0x08000000U, "z13", "IBM z13 GA1"),
>      CPUDEF_INIT(0x2964, 13, 2, 47, 0x08000000U, "z13.2", "IBM z13 GA2"),
>      CPUDEF_INIT(0x2965, 13, 2, 47, 0x08000000U, "z13s", "IBM z13s GA1"),
> +    CPUDEF_INIT(0x3906, 14, 1, 47, 0x08000000U, "z14", "IBM z14 GA1"),
>  };
> 
>  void s390_cpudef_featoff(uint8_t gen, uint8_t ec_ga, S390Feat feat)
> diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
> index af14b11..118a95e 100644
> --- a/target/s390x/gen-features.c
> +++ b/target/s390x/gen-features.c
> @@ -338,6 +338,14 @@ static uint16_t base_GEN13_GA1[] = {
> 
>  #define base_GEN13_GA2 EmptyFeat
> 
> +static uint16_t base_GEN14_GA1[] = {
> +    S390_FEAT_ENTROPY_ENC_COMP,
> +    S390_FEAT_MISC_INSTRUCTION_EXT,
> +    S390_FEAT_SEMAPHORE_ASSIST,
> +    S390_FEAT_TIME_SLICE_INSTRUMENTATION,
> +    S390_FEAT_ORDER_PRESERVING_COMPRESSION,
> +};
> +
>  /* Full features (in order of release)
>   * Automatically includes corresponding base features.
>   * Full features are all features this hardware supports even if kvm/QEMU do not
> @@ -442,6 +450,23 @@ static uint16_t full_GEN13_GA1[] = {
> 
>  #define full_GEN13_GA2 EmptyFeat
> 
> +static uint16_t full_GEN14_GA1[] = {
> +    S390_FEAT_INSTRUCTION_EXEC_PROT,
> +    S390_FEAT_GUARDED_STORAGE,
> +    S390_FEAT_VECTOR_PACKED_DECIMAL,
> +    S390_FEAT_VECTOR_ENH,
> +    S390_FEAT_MULTIPLE_EPOCH,
> +    S390_FEAT_TEST_PENDING_EXT_INTERRUPTION,
> +    S390_FEAT_INSERT_REFERENCE_BITS_MULT,
> +    S390_FEAT_GROUP_MSA_EXT_6,
> +    S390_FEAT_GROUP_MSA_EXT_7,
> +    S390_FEAT_GROUP_MSA_EXT_8,
> +    S390_FEAT_CMM_NT,
> +    S390_FEAT_HPMA2,
> +    S390_FEAT_SIE_KSS,
> +    S390_FEAT_ORDER_PRESERVING_COMPRESSION,

Just realized that this is redundant.
since ORDER_PRESERVING is also part of the base model, I will remove it here in
my pull request.