[PATCH 0/1] Add features and cpu models

[PATCH 0/1] Add features and cpu models

[Christian Borntraeger]

5 new features and 2 new models

Christian Borntraeger (1):
  s390x/cpumodel: add 3931 and 3932

 target/s390x/cpu_features_def.h.inc |  5 +++++
 target/s390x/cpu_models.c           |  6 ++++++
 target/s390x/gen-features.c         | 14 ++++++++++++++
 3 files changed, 25 insertions(+)

-- 
2.31.1

[PATCH 1/1] s390x/cpumodel: add 3931 and 3932

[Christian Borntraeger]

This defines 5 new facilities and the new 3931 and 3932 machines.
As before the name is not yet known and we do use gen16a and gen16b.
The new features are part of the full model.

The default model is still empty (same as z15) and will be added
in a separate patch at a later point in time.

Also add the dependencies of new facilities and as a fix for z15 add
a dependency from S390_FEAT_VECTOR_PACKED_DECIMAL_ENH to
S390_VECTOR_PACKED_DECIMAL.

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
 target/s390x/cpu_features_def.h.inc |  5 +++++
 target/s390x/cpu_models.c           |  6 ++++++
 target/s390x/gen-features.c         | 14 ++++++++++++++
 3 files changed, 25 insertions(+)

diff --git a/target/s390x/cpu_features_def.h.inc b/target/s390x/cpu_features_def.h.inc
index 7db3449e0434..c71caee74411 100644
--- a/target/s390x/cpu_features_def.h.inc
+++ b/target/s390x/cpu_features_def.h.inc
@@ -109,6 +109,11 @@ DEF_FEAT(VECTOR_PACKED_DECIMAL_ENH, "vxpdeh", STFL, 152, "Vector-Packed-Decimal-
 DEF_FEAT(MSA_EXT_9, "msa9-base", STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)")
 DEF_FEAT(ETOKEN, "etoken", STFL, 156, "Etoken facility")
 DEF_FEAT(UNPACK, "unpack", STFL, 161, "Unpack facility")
+DEF_FEAT(NNPA, "nnpa", STFL, 165, "NNPA facility")
+DEF_FEAT(VECTOR_PACKED_DECIMAL_ENH2, "vxpdeh2", STFL, 192, "Vector-Packed-Decimal-Enhancement facility 2")
+DEF_FEAT(BEAR, "bear", STFL, 193, "BEAR-enhancement facility")
+DEF_FEAT(RDP, "rdp", STFL, 194, "Reset-DAT-protection facility")
+DEF_FEAT(ACTIVITY, "activity", STFL, 196, "Processor-Activity-Instrumentation facility")
 
 /* Features exposed via SCLP SCCB Byte 80 - 98  (bit numbers relative to byte-80) */
 DEF_FEAT(SIE_GSLS, "gsls", SCLP_CONF_CHAR, 40, "SIE: Guest-storage-limit-suppression facility")
diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
index 94090a6e223d..9699823b2074 100644
--- a/target/s390x/cpu_models.c
+++ b/target/s390x/cpu_models.c
@@ -88,6 +88,8 @@ static S390CPUDef s390_cpu_defs[] = {
     CPUDEF_INIT(0x3907, 14, 1, 47, 0x08000000U, "z14ZR1", "IBM z14 Model ZR1 GA1"),
     CPUDEF_INIT(0x8561, 15, 1, 47, 0x08000000U, "gen15a", "IBM z15 T01 GA1"),
     CPUDEF_INIT(0x8562, 15, 1, 47, 0x08000000U, "gen15b", "IBM z15 T02 GA1"),
+    CPUDEF_INIT(0x3931, 16, 1, 47, 0x08000000U, "gen16a", "IBM 3931 GA1"),
+    CPUDEF_INIT(0x3932, 16, 1, 47, 0x08000000U, "gen16b", "IBM 3932 GA1"),
 };
 
 #define QEMU_MAX_CPU_TYPE 0x3906
@@ -812,6 +814,8 @@ static void check_consistency(const S390CPUModel *model)
         { S390_FEAT_MSA_EXT_9, S390_FEAT_MSA_EXT_4 },
         { S390_FEAT_MULTIPLE_EPOCH, S390_FEAT_TOD_CLOCK_STEERING },
         { S390_FEAT_VECTOR_PACKED_DECIMAL, S390_FEAT_VECTOR },
+        { S390_FEAT_VECTOR_PACKED_DECIMAL_ENH, S390_FEAT_VECTOR_PACKED_DECIMAL },
+        { S390_FEAT_VECTOR_PACKED_DECIMAL_ENH2, S390_FEAT_VECTOR_PACKED_DECIMAL_ENH },
         { S390_FEAT_VECTOR_ENH, S390_FEAT_VECTOR },
         { S390_FEAT_INSTRUCTION_EXEC_PROT, S390_FEAT_SIDE_EFFECT_ACCESS_ESOP2 },
         { S390_FEAT_SIDE_EFFECT_ACCESS_ESOP2, S390_FEAT_ESOP },
@@ -843,6 +847,8 @@ static void check_consistency(const S390CPUModel *model)
         { S390_FEAT_PTFF_STOUE, S390_FEAT_MULTIPLE_EPOCH },
         { S390_FEAT_AP_QUEUE_INTERRUPT_CONTROL, S390_FEAT_AP },
         { S390_FEAT_DIAG_318, S390_FEAT_EXTENDED_LENGTH_SCCB },
+        { S390_FEAT_NNPA, S390_FEAT_VECTOR },
+        { S390_FEAT_RDP, S390_FEAT_LOCAL_TLB_CLEARING },
     };
     int i;
 
diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
index 242c95ede48a..a7396d3d5f30 100644
--- a/target/s390x/gen-features.c
+++ b/target/s390x/gen-features.c
@@ -424,6 +424,8 @@ static uint16_t base_GEN15_GA1[] = {
     S390_FEAT_MISC_INSTRUCTION_EXT3,
 };
 
+#define base_GEN16_GA1 EmptyFeat
+
 /* 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
@@ -567,6 +569,15 @@ static uint16_t full_GEN15_GA1[] = {
     S390_FEAT_UNPACK,
 };
 
+static uint16_t full_GEN16_GA1[] = {
+    S390_FEAT_NNPA,
+    S390_FEAT_VECTOR_PACKED_DECIMAL_ENH2,
+    S390_FEAT_BEAR,
+    S390_FEAT_RDP,
+    S390_FEAT_ACTIVITY,
+};
+
+
 /* Default features (in order of release)
  * Automatically includes corresponding base features.
  * Default features are all features this version of QEMU supports for this
@@ -652,6 +663,8 @@ static uint16_t default_GEN15_GA1[] = {
     S390_FEAT_ETOKEN,
 };
 
+#define default_GEN16_GA1 EmptyFeat
+
 /* QEMU (CPU model) features */
 
 static uint16_t qemu_V2_11[] = {
@@ -785,6 +798,7 @@ static CpuFeatDefSpec CpuFeatDef[] = {
     CPU_FEAT_INITIALIZER(GEN14_GA1),
     CPU_FEAT_INITIALIZER(GEN14_GA2),
     CPU_FEAT_INITIALIZER(GEN15_GA1),
+    CPU_FEAT_INITIALIZER(GEN16_GA1),
 };
 
 #define FEAT_GROUP_INITIALIZER(_name)                  \
-- 
2.31.1

Re: [PATCH 1/1] s390x/cpumodel: add 3931 and 3932

[David Hildenbrand]

On 22.06.21 22:19, Christian Borntraeger wrote:
> This defines 5 new facilities and the new 3931 and 3932 machines.
> As before the name is not yet known and we do use gen16a and gen16b.
> The new features are part of the full model.
> 
> The default model is still empty (same as z15) and will be added
> in a separate patch at a later point in time.
> 
> Also add the dependencies of new facilities and as a fix for z15 add
> a dependency from S390_FEAT_VECTOR_PACKED_DECIMAL_ENH to
> S390_VECTOR_PACKED_DECIMAL.
> 
> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
> ---
>   target/s390x/cpu_features_def.h.inc |  5 +++++
>   target/s390x/cpu_models.c           |  6 ++++++
>   target/s390x/gen-features.c         | 14 ++++++++++++++
>   3 files changed, 25 insertions(+)
> 
> diff --git a/target/s390x/cpu_features_def.h.inc b/target/s390x/cpu_features_def.h.inc
> index 7db3449e0434..c71caee74411 100644
> --- a/target/s390x/cpu_features_def.h.inc
> +++ b/target/s390x/cpu_features_def.h.inc
> @@ -109,6 +109,11 @@ DEF_FEAT(VECTOR_PACKED_DECIMAL_ENH, "vxpdeh", STFL, 152, "Vector-Packed-Decimal-
>   DEF_FEAT(MSA_EXT_9, "msa9-base", STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)")
>   DEF_FEAT(ETOKEN, "etoken", STFL, 156, "Etoken facility")
>   DEF_FEAT(UNPACK, "unpack", STFL, 161, "Unpack facility")
> +DEF_FEAT(NNPA, "nnpa", STFL, 165, "NNPA facility")
> +DEF_FEAT(VECTOR_PACKED_DECIMAL_ENH2, "vxpdeh2", STFL, 192, "Vector-Packed-Decimal-Enhancement facility 2")
> +DEF_FEAT(BEAR, "bear", STFL, 193, "BEAR-enhancement facility")

Usually we use "eh" for enhancement. Which would result in "beareh" or 
alternatively "beh". But maybe the "enhancement" part is not actually an 
enhancement, but instead this facility is more like the etoken or unpack 
facility ...

> +DEF_FEAT(RDP, "rdp", STFL, 194, "Reset-DAT-protection facility")
> +DEF_FEAT(ACTIVITY, "activity", STFL, 196, "Processor-Activity-Instrumentation facility")

Would "pai" be a more appropriate feature name?


-- 
Thanks,

David / dhildenb

Re: [PATCH 1/1] s390x/cpumodel: add 3931 and 3932

[Christian Borntraeger]

On 30.06.21 15:32, David Hildenbrand wrote:
> On 22.06.21 22:19, Christian Borntraeger wrote:
>> This defines 5 new facilities and the new 3931 and 3932 machines.
>> As before the name is not yet known and we do use gen16a and gen16b.
>> The new features are part of the full model.
>>
>> The default model is still empty (same as z15) and will be added
>> in a separate patch at a later point in time.
>>
>> Also add the dependencies of new facilities and as a fix for z15 add
>> a dependency from S390_FEAT_VECTOR_PACKED_DECIMAL_ENH to
>> S390_VECTOR_PACKED_DECIMAL.
>>
>> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
>> ---
>>   target/s390x/cpu_features_def.h.inc |  5 +++++
>>   target/s390x/cpu_models.c           |  6 ++++++
>>   target/s390x/gen-features.c         | 14 ++++++++++++++
>>   3 files changed, 25 insertions(+)
>>
>> diff --git a/target/s390x/cpu_features_def.h.inc b/target/s390x/cpu_features_def.h.inc
>> index 7db3449e0434..c71caee74411 100644
>> --- a/target/s390x/cpu_features_def.h.inc
>> +++ b/target/s390x/cpu_features_def.h.inc
>> @@ -109,6 +109,11 @@ DEF_FEAT(VECTOR_PACKED_DECIMAL_ENH, "vxpdeh", STFL, 152, "Vector-Packed-Decimal-
>>   DEF_FEAT(MSA_EXT_9, "msa9-base", STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)")
>>   DEF_FEAT(ETOKEN, "etoken", STFL, 156, "Etoken facility")
>>   DEF_FEAT(UNPACK, "unpack", STFL, 161, "Unpack facility")
>> +DEF_FEAT(NNPA, "nnpa", STFL, 165, "NNPA facility")
>> +DEF_FEAT(VECTOR_PACKED_DECIMAL_ENH2, "vxpdeh2", STFL, 192, "Vector-Packed-Decimal-Enhancement facility 2")
>> +DEF_FEAT(BEAR, "bear", STFL, 193, "BEAR-enhancement facility")
> 
> Usually we use "eh" for enhancement. Which would result in "beareh" or alternatively "beh". But maybe the "enhancement" part is not actually an enhancement, but instead this facility is more like the etoken or unpack facility ...

There was no bear facility (I think it was part of PER3).
beareh or beh would be fine with me.

> 
>> +DEF_FEAT(RDP, "rdp", STFL, 194, "Reset-DAT-protection facility")
>> +DEF_FEAT(ACTIVITY, "activity", STFL, 196, "Processor-Activity-Instrumentation facility")
> 
> Would "pai" be a more appropriate feature name?

pai would be ok for me as well.

Conny, do you want to replace "activity" with "pai" and "bear" with "beareh" in your tree?

Re: [PATCH 1/1] s390x/cpumodel: add 3931 and 3932

[Cornelia Huck]

On Wed, Jun 30 2021, Christian Borntraeger <borntraeger@de.ibm.com> wrote:

> On 30.06.21 15:32, David Hildenbrand wrote:
>> On 22.06.21 22:19, Christian Borntraeger wrote:
>>> This defines 5 new facilities and the new 3931 and 3932 machines.
>>> As before the name is not yet known and we do use gen16a and gen16b.
>>> The new features are part of the full model.
>>>
>>> The default model is still empty (same as z15) and will be added
>>> in a separate patch at a later point in time.
>>>
>>> Also add the dependencies of new facilities and as a fix for z15 add
>>> a dependency from S390_FEAT_VECTOR_PACKED_DECIMAL_ENH to
>>> S390_VECTOR_PACKED_DECIMAL.
>>>
>>> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
>>> ---
>>>   target/s390x/cpu_features_def.h.inc |  5 +++++
>>>   target/s390x/cpu_models.c           |  6 ++++++
>>>   target/s390x/gen-features.c         | 14 ++++++++++++++
>>>   3 files changed, 25 insertions(+)
>>>
>>> diff --git a/target/s390x/cpu_features_def.h.inc b/target/s390x/cpu_features_def.h.inc
>>> index 7db3449e0434..c71caee74411 100644
>>> --- a/target/s390x/cpu_features_def.h.inc
>>> +++ b/target/s390x/cpu_features_def.h.inc
>>> @@ -109,6 +109,11 @@ DEF_FEAT(VECTOR_PACKED_DECIMAL_ENH, "vxpdeh", STFL, 152, "Vector-Packed-Decimal-
>>>   DEF_FEAT(MSA_EXT_9, "msa9-base", STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)")
>>>   DEF_FEAT(ETOKEN, "etoken", STFL, 156, "Etoken facility")
>>>   DEF_FEAT(UNPACK, "unpack", STFL, 161, "Unpack facility")
>>> +DEF_FEAT(NNPA, "nnpa", STFL, 165, "NNPA facility")
>>> +DEF_FEAT(VECTOR_PACKED_DECIMAL_ENH2, "vxpdeh2", STFL, 192, "Vector-Packed-Decimal-Enhancement facility 2")
>>> +DEF_FEAT(BEAR, "bear", STFL, 193, "BEAR-enhancement facility")
>> 
>> Usually we use "eh" for enhancement. Which would result in "beareh" or alternatively "beh". But maybe the "enhancement" part is not actually an enhancement, but instead this facility is more like the etoken or unpack facility ...
>
> There was no bear facility (I think it was part of PER3).
> beareh or beh would be fine with me.
>
>> 
>>> +DEF_FEAT(RDP, "rdp", STFL, 194, "Reset-DAT-protection facility")
>>> +DEF_FEAT(ACTIVITY, "activity", STFL, 196, "Processor-Activity-Instrumentation facility")
>> 
>> Would "pai" be a more appropriate feature name?
>
> pai would be ok for me as well.
>
> Conny, do you want to replace "activity" with "pai" and "bear" with "beareh" in your tree?

I can certainly edit this to a naming everyone agrees with (no strong
opinions from my side).

[Although I rather like large animals in cpu facilities 8)]

Re: [PATCH 1/1] s390x/cpumodel: add 3931 and 3932

[Christian Borntraeger]

On 30.06.21 17:32, Cornelia Huck wrote:
> On Wed, Jun 30 2021, Christian Borntraeger <borntraeger@de.ibm.com> wrote:
> 
>> On 30.06.21 15:32, David Hildenbrand wrote:
>>> On 22.06.21 22:19, Christian Borntraeger wrote:
>>>> This defines 5 new facilities and the new 3931 and 3932 machines.
>>>> As before the name is not yet known and we do use gen16a and gen16b.
>>>> The new features are part of the full model.
>>>>
>>>> The default model is still empty (same as z15) and will be added
>>>> in a separate patch at a later point in time.
>>>>
>>>> Also add the dependencies of new facilities and as a fix for z15 add
>>>> a dependency from S390_FEAT_VECTOR_PACKED_DECIMAL_ENH to
>>>> S390_VECTOR_PACKED_DECIMAL.
>>>>
>>>> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
>>>> ---
>>>>    target/s390x/cpu_features_def.h.inc |  5 +++++
>>>>    target/s390x/cpu_models.c           |  6 ++++++
>>>>    target/s390x/gen-features.c         | 14 ++++++++++++++
>>>>    3 files changed, 25 insertions(+)
>>>>
>>>> diff --git a/target/s390x/cpu_features_def.h.inc b/target/s390x/cpu_features_def.h.inc
>>>> index 7db3449e0434..c71caee74411 100644
>>>> --- a/target/s390x/cpu_features_def.h.inc
>>>> +++ b/target/s390x/cpu_features_def.h.inc
>>>> @@ -109,6 +109,11 @@ DEF_FEAT(VECTOR_PACKED_DECIMAL_ENH, "vxpdeh", STFL, 152, "Vector-Packed-Decimal-
>>>>    DEF_FEAT(MSA_EXT_9, "msa9-base", STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)")
>>>>    DEF_FEAT(ETOKEN, "etoken", STFL, 156, "Etoken facility")
>>>>    DEF_FEAT(UNPACK, "unpack", STFL, 161, "Unpack facility")
>>>> +DEF_FEAT(NNPA, "nnpa", STFL, 165, "NNPA facility")
>>>> +DEF_FEAT(VECTOR_PACKED_DECIMAL_ENH2, "vxpdeh2", STFL, 192, "Vector-Packed-Decimal-Enhancement facility 2")
>>>> +DEF_FEAT(BEAR, "bear", STFL, 193, "BEAR-enhancement facility")
>>>
>>> Usually we use "eh" for enhancement. Which would result in "beareh" or alternatively "beh". But maybe the "enhancement" part is not actually an enhancement, but instead this facility is more like the etoken or unpack facility ...
>>
>> There was no bear facility (I think it was part of PER3).
>> beareh or beh would be fine with me.
>>
>>>
>>>> +DEF_FEAT(RDP, "rdp", STFL, 194, "Reset-DAT-protection facility")
>>>> +DEF_FEAT(ACTIVITY, "activity", STFL, 196, "Processor-Activity-Instrumentation facility")
>>>
>>> Would "pai" be a more appropriate feature name?
>>
>> pai would be ok for me as well.
>>
>> Conny, do you want to replace "activity" with "pai" and "bear" with "beareh" in your tree?
> 
> I can certainly edit this to a naming everyone agrees with (no strong
> opinions from my side).

Lets pick "pai" and the choose among "beareh" and "beh"

Re: [PATCH 1/1] s390x/cpumodel: add 3931 and 3932

[David Hildenbrand]

On 30.06.21 17:56, Christian Borntraeger wrote:
> 
> 
> On 30.06.21 17:32, Cornelia Huck wrote:
>> On Wed, Jun 30 2021, Christian Borntraeger <borntraeger@de.ibm.com> wrote:
>>
>>> On 30.06.21 15:32, David Hildenbrand wrote:
>>>> On 22.06.21 22:19, Christian Borntraeger wrote:
>>>>> This defines 5 new facilities and the new 3931 and 3932 machines.
>>>>> As before the name is not yet known and we do use gen16a and gen16b.
>>>>> The new features are part of the full model.
>>>>>
>>>>> The default model is still empty (same as z15) and will be added
>>>>> in a separate patch at a later point in time.
>>>>>
>>>>> Also add the dependencies of new facilities and as a fix for z15 add
>>>>> a dependency from S390_FEAT_VECTOR_PACKED_DECIMAL_ENH to
>>>>> S390_VECTOR_PACKED_DECIMAL.
>>>>>
>>>>> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
>>>>> ---
>>>>>     target/s390x/cpu_features_def.h.inc |  5 +++++
>>>>>     target/s390x/cpu_models.c           |  6 ++++++
>>>>>     target/s390x/gen-features.c         | 14 ++++++++++++++
>>>>>     3 files changed, 25 insertions(+)
>>>>>
>>>>> diff --git a/target/s390x/cpu_features_def.h.inc b/target/s390x/cpu_features_def.h.inc
>>>>> index 7db3449e0434..c71caee74411 100644
>>>>> --- a/target/s390x/cpu_features_def.h.inc
>>>>> +++ b/target/s390x/cpu_features_def.h.inc
>>>>> @@ -109,6 +109,11 @@ DEF_FEAT(VECTOR_PACKED_DECIMAL_ENH, "vxpdeh", STFL, 152, "Vector-Packed-Decimal-
>>>>>     DEF_FEAT(MSA_EXT_9, "msa9-base", STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)")
>>>>>     DEF_FEAT(ETOKEN, "etoken", STFL, 156, "Etoken facility")
>>>>>     DEF_FEAT(UNPACK, "unpack", STFL, 161, "Unpack facility")
>>>>> +DEF_FEAT(NNPA, "nnpa", STFL, 165, "NNPA facility")
>>>>> +DEF_FEAT(VECTOR_PACKED_DECIMAL_ENH2, "vxpdeh2", STFL, 192, "Vector-Packed-Decimal-Enhancement facility 2")
>>>>> +DEF_FEAT(BEAR, "bear", STFL, 193, "BEAR-enhancement facility")
>>>>
>>>> Usually we use "eh" for enhancement. Which would result in "beareh" or alternatively "beh". But maybe the "enhancement" part is not actually an enhancement, but instead this facility is more like the etoken or unpack facility ...
>>>
>>> There was no bear facility (I think it was part of PER3).
>>> beareh or beh would be fine with me.
>>>
>>>>
>>>>> +DEF_FEAT(RDP, "rdp", STFL, 194, "Reset-DAT-protection facility")
>>>>> +DEF_FEAT(ACTIVITY, "activity", STFL, 196, "Processor-Activity-Instrumentation facility")
>>>>
>>>> Would "pai" be a more appropriate feature name?
>>>
>>> pai would be ok for me as well.
>>>
>>> Conny, do you want to replace "activity" with "pai" and "bear" with "beareh" in your tree?
>>
>> I can certainly edit this to a naming everyone agrees with (no strong
>> opinions from my side).
> 
> Lets pick "pai" and the choose among "beareh" and "beh"
> 

I'd just go for "beareh" in case we ever have another b...enhancement 
feature. But no strong opinion.

-- 
Thanks,

David / dhildenb

Re: [PATCH 1/1] s390x/cpumodel: add 3931 and 3932

[Thomas Huth]

On 01/07/2021 09.45, David Hildenbrand wrote:
> On 30.06.21 17:56, Christian Borntraeger wrote:
>>
>>
>> On 30.06.21 17:32, Cornelia Huck wrote:
>>> On Wed, Jun 30 2021, Christian Borntraeger <borntraeger@de.ibm.com> wrote:
>>>
>>>> On 30.06.21 15:32, David Hildenbrand wrote:
>>>>> On 22.06.21 22:19, Christian Borntraeger wrote:
>>>>>> This defines 5 new facilities and the new 3931 and 3932 machines.
>>>>>> As before the name is not yet known and we do use gen16a and gen16b.
>>>>>> The new features are part of the full model.
>>>>>>
>>>>>> The default model is still empty (same as z15) and will be added
>>>>>> in a separate patch at a later point in time.
>>>>>>
>>>>>> Also add the dependencies of new facilities and as a fix for z15 add
>>>>>> a dependency from S390_FEAT_VECTOR_PACKED_DECIMAL_ENH to
>>>>>> S390_VECTOR_PACKED_DECIMAL.
>>>>>>
>>>>>> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
>>>>>> ---
>>>>>>     target/s390x/cpu_features_def.h.inc |  5 +++++
>>>>>>     target/s390x/cpu_models.c           |  6 ++++++
>>>>>>     target/s390x/gen-features.c         | 14 ++++++++++++++
>>>>>>     3 files changed, 25 insertions(+)
>>>>>>
>>>>>> diff --git a/target/s390x/cpu_features_def.h.inc 
>>>>>> b/target/s390x/cpu_features_def.h.inc
>>>>>> index 7db3449e0434..c71caee74411 100644
>>>>>> --- a/target/s390x/cpu_features_def.h.inc
>>>>>> +++ b/target/s390x/cpu_features_def.h.inc
>>>>>> @@ -109,6 +109,11 @@ DEF_FEAT(VECTOR_PACKED_DECIMAL_ENH, "vxpdeh", 
>>>>>> STFL, 152, "Vector-Packed-Decimal-
>>>>>>     DEF_FEAT(MSA_EXT_9, "msa9-base", STFL, 155, 
>>>>>> "Message-security-assist-extension-9 facility (excluding subfunctions)")
>>>>>>     DEF_FEAT(ETOKEN, "etoken", STFL, 156, "Etoken facility")
>>>>>>     DEF_FEAT(UNPACK, "unpack", STFL, 161, "Unpack facility")
>>>>>> +DEF_FEAT(NNPA, "nnpa", STFL, 165, "NNPA facility")
>>>>>> +DEF_FEAT(VECTOR_PACKED_DECIMAL_ENH2, "vxpdeh2", STFL, 192, 
>>>>>> "Vector-Packed-Decimal-Enhancement facility 2")
>>>>>> +DEF_FEAT(BEAR, "bear", STFL, 193, "BEAR-enhancement facility")
>>>>>
>>>>> Usually we use "eh" for enhancement. Which would result in "beareh" or 
>>>>> alternatively "beh". But maybe the "enhancement" part is not actually 
>>>>> an enhancement, but instead this facility is more like the etoken or 
>>>>> unpack facility ...
>>>>
>>>> There was no bear facility (I think it was part of PER3).
>>>> beareh or beh would be fine with me.
>>>>
>>>>>
>>>>>> +DEF_FEAT(RDP, "rdp", STFL, 194, "Reset-DAT-protection facility")
>>>>>> +DEF_FEAT(ACTIVITY, "activity", STFL, 196, 
>>>>>> "Processor-Activity-Instrumentation facility")
>>>>>
>>>>> Would "pai" be a more appropriate feature name?
>>>>
>>>> pai would be ok for me as well.
>>>>
>>>> Conny, do you want to replace "activity" with "pai" and "bear" with 
>>>> "beareh" in your tree?
>>>
>>> I can certainly edit this to a naming everyone agrees with (no strong
>>> opinions from my side).
>>
>> Lets pick "pai" and the choose among "beareh" and "beh"
>>
> 
> I'd just go for "beareh" in case we ever have another b...enhancement 
> feature. But no strong opinion.

+1 for beareh
... the chance for confusion with other TLAs is to big otherwise.

  Thomas

Re: [PATCH 0/1] Add features and cpu models

[no-reply]

Patchew URL: https://patchew.org/QEMU/20210622201923.150205-1-borntraeger@de.ibm.com/



Hi,

This series seems to have some coding style problems. See output below for
more information:

Type: series
Message-id: 20210622201923.150205-1-borntraeger@de.ibm.com
Subject: [PATCH 0/1] Add features and cpu models

=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===

Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
Switched to a new branch 'test'
b71b2c5 s390x/cpumodel: add 3931 and 3932

=== OUTPUT BEGIN ===
ERROR: line over 90 characters
#35: FILE: target/s390x/cpu_features_def.h.inc:113:
+DEF_FEAT(VECTOR_PACKED_DECIMAL_ENH2, "vxpdeh2", STFL, 192, "Vector-Packed-Decimal-Enhancement facility 2")

WARNING: line over 80 characters
#38: FILE: target/s390x/cpu_features_def.h.inc:116:
+DEF_FEAT(ACTIVITY, "activity", STFL, 196, "Processor-Activity-Instrumentation facility")

WARNING: line over 80 characters
#59: FILE: target/s390x/cpu_models.c:817:
+        { S390_FEAT_VECTOR_PACKED_DECIMAL_ENH, S390_FEAT_VECTOR_PACKED_DECIMAL },

WARNING: line over 80 characters
#60: FILE: target/s390x/cpu_models.c:818:
+        { S390_FEAT_VECTOR_PACKED_DECIMAL_ENH2, S390_FEAT_VECTOR_PACKED_DECIMAL_ENH },

total: 1 errors, 3 warnings, 73 lines checked

Commit b71b2c5056b7 (s390x/cpumodel: add 3931 and 3932) has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
=== OUTPUT END ===

Test command exited with code: 1


The full log is available at
http://patchew.org/logs/20210622201923.150205-1-borntraeger@de.ibm.com/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com

Re: [PATCH 0/1] Add features and cpu models

[Cornelia Huck]

On Tue, Jun 22 2021, Christian Borntraeger <borntraeger@de.ibm.com> wrote:

> 5 new features and 2 new models
>
> Christian Borntraeger (1):
>   s390x/cpumodel: add 3931 and 3932
>
>  target/s390x/cpu_features_def.h.inc |  5 +++++
>  target/s390x/cpu_models.c           |  6 ++++++
>  target/s390x/gen-features.c         | 14 ++++++++++++++
>  3 files changed, 25 insertions(+)

Thanks, applied.

[PATCH fixup] s390x: fixup for "s390x/cpumodel: add 3931 and 3932"

[Christian Borntraeger]

as discussed we want to change some facility names. Please merge

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
 target/s390x/cpu_features_def.h.inc | 4 ++--
 target/s390x/gen-features.c         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/target/s390x/cpu_features_def.h.inc b/target/s390x/cpu_features_def.h.inc
index 6f92b155c3b1..33c67e36cf79 100644
--- a/target/s390x/cpu_features_def.h.inc
+++ b/target/s390x/cpu_features_def.h.inc
@@ -111,9 +111,9 @@ DEF_FEAT(ETOKEN, "etoken", STFL, 156, "Etoken facility")
 DEF_FEAT(UNPACK, "unpack", STFL, 161, "Unpack facility")
 DEF_FEAT(NNPA, "nnpa", STFL, 165, "NNPA facility")
 DEF_FEAT(VECTOR_PACKED_DECIMAL_ENH2, "vxpdeh2", STFL, 192, "Vector-Packed-Decimal-Enhancement facility 2")
-DEF_FEAT(BEAR, "bear", STFL, 193, "BEAR-enhancement facility ")
+DEF_FEAT(BEAR_ENH, "beareh", STFL, 193, "BEAR-enhancement facility ")
 DEF_FEAT(RDP, "rdp", STFL, 194, "Reset-DAT-protection facility ")
-DEF_FEAT(ACTIVITY, "activity", STFL, 196, "Processor-Activity-Instrumentation facility ")
+DEF_FEAT(PAI, "pai", STFL, 196, "Processor-Activity-Instrumentation facility ")
 
 /* Features exposed via SCLP SCCB Byte 80 - 98  (bit numbers relative to byte-80) */
 DEF_FEAT(SIE_GSLS, "gsls", SCLP_CONF_CHAR, 40, "SIE: Guest-storage-limit-suppression facility")
diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
index a7396d3d5f30..7d85322d6814 100644
--- a/target/s390x/gen-features.c
+++ b/target/s390x/gen-features.c
@@ -572,9 +572,9 @@ static uint16_t full_GEN15_GA1[] = {
 static uint16_t full_GEN16_GA1[] = {
     S390_FEAT_NNPA,
     S390_FEAT_VECTOR_PACKED_DECIMAL_ENH2,
-    S390_FEAT_BEAR,
+    S390_FEAT_BEAR_ENH,
     S390_FEAT_RDP,
-    S390_FEAT_ACTIVITY,
+    S390_FEAT_PAI,
 };
 
 
-- 
2.31.1

Re: [PATCH fixup] s390x: fixup for "s390x/cpumodel: add 3931 and 3932"

[David Hildenbrand]

On 01.07.21 10:43, Christian Borntraeger wrote:
> as discussed we want to change some facility names. Please merge
> 
> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
> ---
>   target/s390x/cpu_features_def.h.inc | 4 ++--
>   target/s390x/gen-features.c         | 4 ++--
>   2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/target/s390x/cpu_features_def.h.inc b/target/s390x/cpu_features_def.h.inc
> index 6f92b155c3b1..33c67e36cf79 100644
> --- a/target/s390x/cpu_features_def.h.inc
> +++ b/target/s390x/cpu_features_def.h.inc
> @@ -111,9 +111,9 @@ DEF_FEAT(ETOKEN, "etoken", STFL, 156, "Etoken facility")
>   DEF_FEAT(UNPACK, "unpack", STFL, 161, "Unpack facility")
>   DEF_FEAT(NNPA, "nnpa", STFL, 165, "NNPA facility")
>   DEF_FEAT(VECTOR_PACKED_DECIMAL_ENH2, "vxpdeh2", STFL, 192, "Vector-Packed-Decimal-Enhancement facility 2")
> -DEF_FEAT(BEAR, "bear", STFL, 193, "BEAR-enhancement facility ")
> +DEF_FEAT(BEAR_ENH, "beareh", STFL, 193, "BEAR-enhancement facility ")
>   DEF_FEAT(RDP, "rdp", STFL, 194, "Reset-DAT-protection facility ")
> -DEF_FEAT(ACTIVITY, "activity", STFL, 196, "Processor-Activity-Instrumentation facility ")
> +DEF_FEAT(PAI, "pai", STFL, 196, "Processor-Activity-Instrumentation facility ")
>   
>   /* Features exposed via SCLP SCCB Byte 80 - 98  (bit numbers relative to byte-80) */
>   DEF_FEAT(SIE_GSLS, "gsls", SCLP_CONF_CHAR, 40, "SIE: Guest-storage-limit-suppression facility")
> diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
> index a7396d3d5f30..7d85322d6814 100644
> --- a/target/s390x/gen-features.c
> +++ b/target/s390x/gen-features.c
> @@ -572,9 +572,9 @@ static uint16_t full_GEN15_GA1[] = {
>   static uint16_t full_GEN16_GA1[] = {
>       S390_FEAT_NNPA,
>       S390_FEAT_VECTOR_PACKED_DECIMAL_ENH2,
> -    S390_FEAT_BEAR,
> +    S390_FEAT_BEAR_ENH,
>       S390_FEAT_RDP,
> -    S390_FEAT_ACTIVITY,
> +    S390_FEAT_PAI,
>   };
>   
>   
> 

For the final patch

Reviewed-by: David Hildenbrand <david@redhat.com>

thanks!

-- 
Thanks,

David / dhildenb

Re: [PATCH fixup] s390x: fixup for "s390x/cpumodel: add 3931 and 3932"

[Cornelia Huck]

On Thu, Jul 01 2021, Christian Borntraeger <borntraeger@de.ibm.com> wrote:

> as discussed we want to change some facility names. Please merge
>
> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
> ---
>  target/s390x/cpu_features_def.h.inc | 4 ++--
>  target/s390x/gen-features.c         | 4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)

Thanks, folded into the existing patch and pushed out.