* [PATCH] s390x/cpumodel: Add more feature to gen16 default model
@ 2021-09-07 9:11 Christian Borntraeger
2021-09-07 9:22 ` Christian Borntraeger
0 siblings, 1 reply; 3+ messages in thread
From: Christian Borntraeger @ 2021-09-07 9:11 UTC (permalink / raw)
To: Thomas Huth
Cc: Janosch Frank, David Hildenbrand, Cornelia Huck,
Richard Henderson, qemu-devel, Halil Pasic, Christian Borntraeger,
qemu-s390x
Add the new gen16 features to the default model and fence them for
machine version 6.1 and earlier.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
hw/s390x/s390-virtio-ccw.c | 5 +++++
target/s390x/gen-features.c | 8 +++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 4d25278cf20e..72573ec66e84 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -803,6 +803,11 @@ DEFINE_CCW_MACHINE(6_2, "6.2", true);
static void ccw_machine_6_1_instance_options(MachineState *machine)
{
ccw_machine_6_2_instance_options(machine);
+ s390_cpudef_featoff_greater(12, 1, S390_FEAT_NNPA);
+ s390_cpudef_featoff_greater(12, 1, S390_FEAT_VECTOR_PACKED_DECIMAL_ENH2);
+ s390_cpudef_featoff_greater(12, 1, S390_FEAT_BEAR_ENH);
+ s390_cpudef_featoff_greater(12, 1, S390_FEAT_RDP);
+ s390_cpudef_featoff_greater(12, 1, S390_FEAT_PAI);
}
static void ccw_machine_6_1_class_options(MachineClass *mc)
diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
index 7d85322d6814..7cb1a6ec10be 100644
--- a/target/s390x/gen-features.c
+++ b/target/s390x/gen-features.c
@@ -663,7 +663,13 @@ static uint16_t default_GEN15_GA1[] = {
S390_FEAT_ETOKEN,
};
-#define default_GEN16_GA1 EmptyFeat
+static uint16_t default_GEN16_GA1[] = {
+ S390_FEAT_NNPA,
+ S390_FEAT_VECTOR_PACKED_DECIMAL_ENH2,
+ S390_FEAT_BEAR_ENH,
+ S390_FEAT_RDP,
+ S390_FEAT_PAI,
+};
/* QEMU (CPU model) features */
--
2.32.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] s390x/cpumodel: Add more feature to gen16 default model
2021-09-07 9:11 [PATCH] s390x/cpumodel: Add more feature to gen16 default model Christian Borntraeger
@ 2021-09-07 9:22 ` Christian Borntraeger
2021-09-07 9:54 ` David Hildenbrand
0 siblings, 1 reply; 3+ messages in thread
From: Christian Borntraeger @ 2021-09-07 9:22 UTC (permalink / raw)
To: Thomas Huth
Cc: Janosch Frank, David Hildenbrand, Cornelia Huck,
Richard Henderson, qemu-devel, Halil Pasic, qemu-s390x
On 07.09.21 11:11, Christian Borntraeger wrote:
> Add the new gen16 features to the default model and fence them for
> machine version 6.1 and earlier.
>
> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
> ---
> hw/s390x/s390-virtio-ccw.c | 5 +++++
> target/s390x/gen-features.c | 8 +++++++-
> 2 files changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
> index 4d25278cf20e..72573ec66e84 100644
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c
> @@ -803,6 +803,11 @@ DEFINE_CCW_MACHINE(6_2, "6.2", true);
> static void ccw_machine_6_1_instance_options(MachineState *machine)
> {
> ccw_machine_6_2_instance_options(machine);
> + s390_cpudef_featoff_greater(12, 1, S390_FEAT_NNPA);
> + s390_cpudef_featoff_greater(12, 1, S390_FEAT_VECTOR_PACKED_DECIMAL_ENH2);
> + s390_cpudef_featoff_greater(12, 1, S390_FEAT_BEAR_ENH);
> + s390_cpudef_featoff_greater(12, 1, S390_FEAT_RDP);
> + s390_cpudef_featoff_greater(12, 1, S390_FEAT_PAI);
It does not hurt, but the 12 should be 16 of course.
Will fix.
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] s390x/cpumodel: Add more feature to gen16 default model
2021-09-07 9:22 ` Christian Borntraeger
@ 2021-09-07 9:54 ` David Hildenbrand
0 siblings, 0 replies; 3+ messages in thread
From: David Hildenbrand @ 2021-09-07 9:54 UTC (permalink / raw)
To: Christian Borntraeger, Thomas Huth
Cc: Janosch Frank, Cornelia Huck, Richard Henderson, qemu-devel,
Halil Pasic, qemu-s390x
On 07.09.21 11:22, Christian Borntraeger wrote:
>
>
> On 07.09.21 11:11, Christian Borntraeger wrote:
>> Add the new gen16 features to the default model and fence them for
>> machine version 6.1 and earlier.
>>
>> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
>> ---
>> hw/s390x/s390-virtio-ccw.c | 5 +++++
>> target/s390x/gen-features.c | 8 +++++++-
>> 2 files changed, 12 insertions(+), 1 deletion(-)
>>
>> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
>> index 4d25278cf20e..72573ec66e84 100644
>> --- a/hw/s390x/s390-virtio-ccw.c
>> +++ b/hw/s390x/s390-virtio-ccw.c
>> @@ -803,6 +803,11 @@ DEFINE_CCW_MACHINE(6_2, "6.2", true);
>> static void ccw_machine_6_1_instance_options(MachineState *machine)
>> {
>> ccw_machine_6_2_instance_options(machine);
>> + s390_cpudef_featoff_greater(12, 1, S390_FEAT_NNPA);
>> + s390_cpudef_featoff_greater(12, 1, S390_FEAT_VECTOR_PACKED_DECIMAL_ENH2);
>> + s390_cpudef_featoff_greater(12, 1, S390_FEAT_BEAR_ENH);
>> + s390_cpudef_featoff_greater(12, 1, S390_FEAT_RDP);
>> + s390_cpudef_featoff_greater(12, 1, S390_FEAT_PAI);
>
> It does not hurt, but the 12 should be 16 of course.
> Will fix.
>
... I was just about to reply this very second :D
LGTM otherwise
--
Thanks,
David / dhildenb
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-09-07 9:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-09-07 9:11 [PATCH] s390x/cpumodel: Add more feature to gen16 default model Christian Borntraeger
2021-09-07 9:22 ` Christian Borntraeger
2021-09-07 9:54 ` David Hildenbrand
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).