Commit 84176c79 authored by Collin Walling's avatar Collin Walling Committed by Cornelia Huck
Browse files

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: default avatarCollin Walling <walling@linux.ibm.com>
Message-Id: <20190212011657.18324-2-walling@linux.ibm.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent ddf5d18a

hw/s390x/s390-virtio-ccw.c

+2 −1
Original line number Diff line number Diff line
@@ -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);

}

target/s390x/cpu_models.c

+24 −0
Original line number Diff line number Diff line
@@ -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;

target/s390x/cpu_models.h

+2 −0
Original line number Diff line number Diff line
@@ -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);

target/s390x/gen-features.c

+2 −0
Original line number Diff line number Diff line
@@ -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 */