Re: [PATCH v2 1/9] s390x/cpu_model: S390_FEAT_MISC_INSTRUCTION_EXT -> S390_FEAT_MISC_INSTRUCTION_EXT2

[Christian Borntraeger]

On 28.09.20 14:27, David Hildenbrand wrote:
> Let's avoid confusion with the "Miscellaneous-Instruction-Extensions
> Facility 1"
> 
> Suggested-by: Thomas Huth <thuth@redhat.com>
> Cc: Christian Borntraeger <borntraeger@de.ibm.com>
> Signed-off-by: David Hildenbrand <david@redhat.com>
> ---
>  target/s390x/cpu_features_def.h.inc | 2 +-

strange this is target/s390x/cpu_features_def.inc.h in my repo?

>  target/s390x/gen-features.c         | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/target/s390x/cpu_features_def.h.inc 
> b/target/s390x/cpu_features_def.h.inc
> index 5942f81f16..6cc776e121 100644
> --- a/target/s390x/cpu_features_def.h.inc
> +++ b/target/s390x/cpu_features_def.h.inc
> @@ -72,7 +72,7 @@ DEF_FEAT(INTERLOCKED_ACCESS_2, "iacc2", STFL, 52, 
> "Interlocked-access facility 2
>  DEF_FEAT(STFLE_53, "stfle53", STFL, 53, "Various facilities introduced with 
> z13")
>  DEF_FEAT(ENTROPY_ENC_COMP, "eec", STFL, 54, "Entropy encoding compression 
> facility")
>  DEF_FEAT(MSA_EXT_5, "msa5-base", STFL, 57, 
> "Message-security-assist-extension-5 facility (excluding subfunctions)")
> -DEF_FEAT(MISC_INSTRUCTION_EXT, "minste2", STFL, 58, 
> "Miscellaneous-instruction-extensions facility 2")
> +DEF_FEAT(MISC_INSTRUCTION_EXT2, "minste2", STFL, 58, 
> "Miscellaneous-instruction-extensions facility 2")

Right, the 1 variant is part of STFLE_49 and thus not mentioned directly, but 
as everything else uses the 2 in that
line it makes sense to also rename the define. 


>  DEF_FEAT(SEMAPHORE_ASSIST, "sema", STFL, 59, "Semaphore-assist facility")
>  DEF_FEAT(TIME_SLICE_INSTRUMENTATION, "tsi", STFL, 60, "Time-slice 
> Instrumentation facility")
>  DEF_FEAT(MISC_INSTRUCTION_EXT3, "minste3", STFL, 61, 
> "Miscellaneous-Instruction-Extensions Facility 3")
> diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
> index 8ddeebc544..210cee65f3 100644
> --- a/target/s390x/gen-features.c
> +++ b/target/s390x/gen-features.c
> @@ -412,7 +412,7 @@ static uint16_t base_GEN13_GA1[] = {
>  
>  static uint16_t base_GEN14_GA1[] = {
>      S390_FEAT_ENTROPY_ENC_COMP,
> -    S390_FEAT_MISC_INSTRUCTION_EXT,
> +    S390_FEAT_MISC_INSTRUCTION_EXT2,
>      S390_FEAT_SEMAPHORE_ASSIST,
>      S390_FEAT_TIME_SLICE_INSTRUMENTATION,
>      S390_FEAT_ORDER_PRESERVING_COMPRESSION,
>