Re: [RFC PATCH 03/14] s390x/cpumodel: add msa12 changes

[Christian Borntraeger]

Am 12.11.24 um 16:54 schrieb Hendrik Brueckner:
> MSA12 changes the KIMD/KLMD instruction format for SHA3/SHAKE.
>
> Signed-off-by: Hendrik Brueckner <brueckner@linux.ibm.com>

Reviewed-by: Christian Borntraeger <borntraeger@linux.ibm.com>

> ---
>   target/s390x/cpu_features_def.h.inc | 1 +
>   target/s390x/gen-features.c         | 8 ++++++++
>   2 files changed, 9 insertions(+)
>
> diff --git a/target/s390x/cpu_features_def.h.inc 
> b/target/s390x/cpu_features_def.h.inc
> index 15ea51fc54..2e5dc96984 100644
> --- a/target/s390x/cpu_features_def.h.inc
> +++ b/target/s390x/cpu_features_def.h.inc
> @@ -90,6 +90,7 @@ DEF_FEAT(EDAT_2, "edat2", STFL, 78, "Enhanced-DAT facility 2")
>   DEF_FEAT(DFP_PACKED_CONVERSION, "dfppc", STFL, 80, "Decimal-floating-point 
> packed-conversion facility")
>   DEF_FEAT(PPA15, "ppa15", STFL, 81, "PPA15 is installed")
>   DEF_FEAT(BPB, "bpb", STFL, 82, "Branch prediction blocking")
> +DEF_FEAT(MSA_EXT_12, "msa12-base", STFL, 86, "Message-security-assist-extension-12 
> facility (excluding subfunctions)")
>   DEF_FEAT(VECTOR, "vx", STFL, 129, "Vector facility")
>   DEF_FEAT(INSTRUCTION_EXEC_PROT, "iep", STFL, 130, 
> "Instruction-execution-protection facility")
>   DEF_FEAT(SIDE_EFFECT_ACCESS_ESOP2, "sea_esop2", STFL, 131, "Side-effect-access 
> facility and Enhanced-suppression-on-protection facility 2")
> diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
> index d6305f945a..ab9ad51d5e 100644
> --- a/target/s390x/gen-features.c
> +++ b/target/s390x/gen-features.c
> @@ -270,6 +270,9 @@
>       S390_FEAT_PCKMO_HMAC_512, \
>       S390_FEAT_PCKMO_HMAC_1024
>   
> +#define S390_FEAT_GROUP_MSA_EXT_12 \
> +    S390_FEAT_MSA_EXT_12
> +
>   #define S390_FEAT_GROUP_ENH_SORT \
>       S390_FEAT_ESORT_BASE, \
>       S390_FEAT_SORTL_SFLR, \
> @@ -339,6 +342,10 @@ static uint16_t group_MSA_EXT_11[] = {
>       S390_FEAT_GROUP_MSA_EXT_11,
>   };
>   
> +static uint16_t group_MSA_EXT_12[] = {
> +    S390_FEAT_GROUP_MSA_EXT_12,
> +};
> +
>   static uint16_t group_MSA_EXT_9_PCKMO[] = {
>       S390_FEAT_GROUP_MSA_EXT_9_PCKMO,
>   };
> @@ -902,6 +909,7 @@ static FeatGroupDefSpec FeatGroupDef[] = {
>       FEAT_GROUP_INITIALIZER(MSA_EXT_10_PCKMO),
>       FEAT_GROUP_INITIALIZER(MSA_EXT_11),
>       FEAT_GROUP_INITIALIZER(MSA_EXT_11_PCKMO),
> +    FEAT_GROUP_INITIALIZER(MSA_EXT_12),
>       FEAT_GROUP_INITIALIZER(MULTIPLE_EPOCH_PTFF),
>       FEAT_GROUP_INITIALIZER(ENH_SORT),
>       FEAT_GROUP_INITIALIZER(DEFLATE_CONVERSION),

As an optional enhancement we could add a dependency to MSA6 in 
check_consistency but certainly not important.