| Message ID | 20190208221111.25237-2-walling@linux.ibm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] s390x/cpumodel: default enable mepoch for z14 and later | expand |
On 08.02.2019 23:11, Collin Walling wrote: > Introduce the z14 GA2 cpu model for QEMU. There are no new features > introduced with this model, and will inherit the same feature set as > z14 GA1. > > Signed-off-by: Collin Walling <walling@linux.ibm.com> Acked-by: Christian Borntraeger <borntraeger@de.ibm.com> > --- > target/s390x/cpu_models.c | 1 + > target/s390x/gen-features.c | 7 +++++++ > 2 files changed, 8 insertions(+) > > diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c > index 7c253ff308..968c21cd47 100644 > --- a/target/s390x/cpu_models.c > +++ b/target/s390x/cpu_models.c > @@ -79,6 +79,7 @@ static S390CPUDef s390_cpu_defs[] = { > 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"), > + CPUDEF_INIT(0x3906, 14, 2, 47, 0x08000000U, "z14.2", "IBM z14 GA2"), > CPUDEF_INIT(0x3907, 14, 1, 47, 0x08000000U, "z14ZR1", "IBM z14 Model ZR1 GA1"), > }; > > diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c > index d258d67dca..3026fbd88e 100644 > --- a/target/s390x/gen-features.c > +++ b/target/s390x/gen-features.c > @@ -353,6 +353,8 @@ static uint16_t base_GEN14_GA1[] = { > S390_FEAT_ORDER_PRESERVING_COMPRESSION, > }; > > +#define base_GEN14_GA2 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 > @@ -480,6 +482,8 @@ static uint16_t full_GEN14_GA1[] = { > S390_FEAT_GROUP_MULTIPLE_EPOCH_PTFF, > }; > > +#define full_GEN14_GA2 EmptyFeat > + > /* Default features (in order of release) > * Automatically includes corresponding base features. > * Default features are all features this version of QEMU supports for this > @@ -553,6 +557,8 @@ static uint16_t default_GEN14_GA1[] = { > S390_FEAT_MULTIPLE_EPOCH, > }; > > +#define default_GEN14_GA2 EmptyFeat > + > /* QEMU (CPU model) features */ > > static uint16_t qemu_V2_11[] = { > @@ -661,6 +667,7 @@ static CpuFeatDefSpec CpuFeatDef[] = { > CPU_FEAT_INITIALIZER(GEN13_GA1), > CPU_FEAT_INITIALIZER(GEN13_GA2), > CPU_FEAT_INITIALIZER(GEN14_GA1), > + CPU_FEAT_INITIALIZER(GEN14_GA2), > }; > > #define FEAT_GROUP_INITIALIZER(_name) \ >
On 08.02.19 23:11, Collin Walling wrote: > Introduce the z14 GA2 cpu model for QEMU. There are no new features > introduced with this model, and will inherit the same feature set as > z14 GA1. > > Signed-off-by: Collin Walling <walling@linux.ibm.com> > --- > target/s390x/cpu_models.c | 1 + > target/s390x/gen-features.c | 7 +++++++ > 2 files changed, 8 insertions(+) > > diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c > index 7c253ff308..968c21cd47 100644 > --- a/target/s390x/cpu_models.c > +++ b/target/s390x/cpu_models.c > @@ -79,6 +79,7 @@ static S390CPUDef s390_cpu_defs[] = { > 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"), > + CPUDEF_INIT(0x3906, 14, 2, 47, 0x08000000U, "z14.2", "IBM z14 GA2"), > CPUDEF_INIT(0x3907, 14, 1, 47, 0x08000000U, "z14ZR1", "IBM z14 Model ZR1 GA1"), > }; > > diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c > index d258d67dca..3026fbd88e 100644 > --- a/target/s390x/gen-features.c > +++ b/target/s390x/gen-features.c > @@ -353,6 +353,8 @@ static uint16_t base_GEN14_GA1[] = { > S390_FEAT_ORDER_PRESERVING_COMPRESSION, > }; > > +#define base_GEN14_GA2 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 > @@ -480,6 +482,8 @@ static uint16_t full_GEN14_GA1[] = { > S390_FEAT_GROUP_MULTIPLE_EPOCH_PTFF, > }; > > +#define full_GEN14_GA2 EmptyFeat > + > /* Default features (in order of release) > * Automatically includes corresponding base features. > * Default features are all features this version of QEMU supports for this > @@ -553,6 +557,8 @@ static uint16_t default_GEN14_GA1[] = { > S390_FEAT_MULTIPLE_EPOCH, > }; > > +#define default_GEN14_GA2 EmptyFeat > + > /* QEMU (CPU model) features */ > > static uint16_t qemu_V2_11[] = { > @@ -661,6 +667,7 @@ static CpuFeatDefSpec CpuFeatDef[] = { > CPU_FEAT_INITIALIZER(GEN13_GA1), > CPU_FEAT_INITIALIZER(GEN13_GA2), > CPU_FEAT_INITIALIZER(GEN14_GA1), > + CPU_FEAT_INITIALIZER(GEN14_GA2), > }; > > #define FEAT_GROUP_INITIALIZER(_name) \ > Reviewed-by: David Hildenbrand <david@redhat.com>
diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c index 7c253ff308..968c21cd47 100644 --- a/target/s390x/cpu_models.c +++ b/target/s390x/cpu_models.c @@ -79,6 +79,7 @@ static S390CPUDef s390_cpu_defs[] = { 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"), + CPUDEF_INIT(0x3906, 14, 2, 47, 0x08000000U, "z14.2", "IBM z14 GA2"), CPUDEF_INIT(0x3907, 14, 1, 47, 0x08000000U, "z14ZR1", "IBM z14 Model ZR1 GA1"), }; diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c index d258d67dca..3026fbd88e 100644 --- a/target/s390x/gen-features.c +++ b/target/s390x/gen-features.c @@ -353,6 +353,8 @@ static uint16_t base_GEN14_GA1[] = { S390_FEAT_ORDER_PRESERVING_COMPRESSION, }; +#define base_GEN14_GA2 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 @@ -480,6 +482,8 @@ static uint16_t full_GEN14_GA1[] = { S390_FEAT_GROUP_MULTIPLE_EPOCH_PTFF, }; +#define full_GEN14_GA2 EmptyFeat + /* Default features (in order of release) * Automatically includes corresponding base features. * Default features are all features this version of QEMU supports for this @@ -553,6 +557,8 @@ static uint16_t default_GEN14_GA1[] = { S390_FEAT_MULTIPLE_EPOCH, }; +#define default_GEN14_GA2 EmptyFeat + /* QEMU (CPU model) features */ static uint16_t qemu_V2_11[] = { @@ -661,6 +667,7 @@ static CpuFeatDefSpec CpuFeatDef[] = { CPU_FEAT_INITIALIZER(GEN13_GA1), CPU_FEAT_INITIALIZER(GEN13_GA2), CPU_FEAT_INITIALIZER(GEN14_GA1), + CPU_FEAT_INITIALIZER(GEN14_GA2), }; #define FEAT_GROUP_INITIALIZER(_name) \
Introduce the z14 GA2 cpu model for QEMU. There are no new features introduced with this model, and will inherit the same feature set as z14 GA1. Signed-off-by: Collin Walling <walling@linux.ibm.com> --- target/s390x/cpu_models.c | 1 + target/s390x/gen-features.c | 7 +++++++ 2 files changed, 8 insertions(+)