openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

s390x/cpumodel: default enable mepoch for z14 and later 

Latest systems and host kernels support mepoch, which is a
feature that was meant to be supported for z14 GA1 from the
get-go. Let's copy it to the z14 GA1 default CPU model.

Machines s390-ccw-virtio-3.1 and older will retain the old CPU
models and will not provide this bit nor the extended PTFF
functions in the default model.

Signed-off-by: Collin Walling <walling@linux.ibm.com>
Message-Id: <20190212011657.18324-2-walling@linux.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
This commit is contained in:
Collin Walling 2019-02-11 20:16:56 -05:00 committed by Cornelia Huck
parent ddf5d18af3
commit 84176c7906
4 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/s390x/s390-virtio-ccw.c
View File

@ -659,7 +659,8 @@ static void ccw_machine_3_1_instance_options(MachineState *machine)
{
static const S390FeatInit qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V3_1 };
ccw_machine_4_0_instance_options(machine);
s390_cpudef_featoff_greater(14, 1, S390_FEAT_MULTIPLE_EPOCH);
s390_cpudef_group_featoff_greater(14, 1, S390_FEAT_GROUP_MULTIPLE_EPOCH_PTFF);
s390_set_qemu_cpu_model(0x2827, 12, 2, qemu_cpu_feat);
}

24
target/s390x/cpu_models.c
View File

@ -117,6 +117,30 @@ void s390_cpudef_featoff_greater(uint8_t gen, uint8_t ec_ga, S390Feat feat)
}
}
void s390_cpudef_group_featoff_greater(uint8_t gen, uint8_t ec_ga,
S390FeatGroup group)
{
const S390FeatGroupDef *group_def = s390_feat_group_def(group);
S390FeatBitmap group_def_off;
int i;
bitmap_complement(group_def_off, group_def->feat, S390_FEAT_MAX);
for (i = 0; i < ARRAY_SIZE(s390_cpu_defs); i++) {
const S390CPUDef *cpu_def = &s390_cpu_defs[i];
if (cpu_def->gen < gen) {
continue;
}
if (cpu_def->gen == gen && cpu_def->ec_ga < ec_ga) {
continue;
}
bitmap_and((unsigned long *)&cpu_def->default_feat,
cpu_def->default_feat, group_def_off, S390_FEAT_MAX);
}
}
uint32_t s390_get_hmfai(void)
{
static S390CPU *cpu;

2
target/s390x/cpu_models.h
View File

@ -75,6 +75,8 @@ struct S390CPUModel {
void s390_cpudef_featoff(uint8_t gen, uint8_t ec_ga, S390Feat feat);
void s390_cpudef_featoff_greater(uint8_t gen, uint8_t ec_ga, S390Feat feat);
void s390_cpudef_group_featoff_greater(uint8_t gen, uint8_t ec_ga,
S390FeatGroup group);
uint32_t s390_get_hmfai(void);
uint8_t s390_get_mha_pow(void);
uint32_t s390_get_ibc_val(void);

2
target/s390x/gen-features.c
View File

@ -550,6 +550,8 @@ static uint16_t default_GEN14_GA1[] = {
S390_FEAT_GROUP_MSA_EXT_6,
S390_FEAT_GROUP_MSA_EXT_7,
S390_FEAT_GROUP_MSA_EXT_8,
S390_FEAT_MULTIPLE_EPOCH,
S390_FEAT_GROUP_MULTIPLE_EPOCH_PTFF,
};
/* QEMU (CPU model) features */