s390x/cpumodel: Bump up QEMU model to a stripped-down IBM z14 GA2
TCG implements everything we need to run basic z14 OS+software. Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: David Hildenbrand <david@redhat.com> Message-Id: <20210608092337.12221-27-david@redhat.com> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
This commit is contained in:
parent
8a9b7ed32d
commit
463e50da8b
|
@ -802,7 +802,10 @@ DEFINE_CCW_MACHINE(6_1, "6.1", true);
|
||||||
|
|
||||||
static void ccw_machine_6_0_instance_options(MachineState *machine)
|
static void ccw_machine_6_0_instance_options(MachineState *machine)
|
||||||
{
|
{
|
||||||
|
static const S390FeatInit qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V6_0 };
|
||||||
|
|
||||||
ccw_machine_6_1_instance_options(machine);
|
ccw_machine_6_1_instance_options(machine);
|
||||||
|
s390_set_qemu_cpu_model(0x2964, 13, 2, qemu_cpu_feat);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void ccw_machine_6_0_class_options(MachineClass *mc)
|
static void ccw_machine_6_0_class_options(MachineClass *mc)
|
||||||
|
|
|
@ -90,8 +90,8 @@ static S390CPUDef s390_cpu_defs[] = {
|
||||||
CPUDEF_INIT(0x8562, 15, 1, 47, 0x08000000U, "gen15b", "IBM z15 T02 GA1"),
|
CPUDEF_INIT(0x8562, 15, 1, 47, 0x08000000U, "gen15b", "IBM z15 T02 GA1"),
|
||||||
};
|
};
|
||||||
|
|
||||||
#define QEMU_MAX_CPU_TYPE 0x2964
|
#define QEMU_MAX_CPU_TYPE 0x3906
|
||||||
#define QEMU_MAX_CPU_GEN 13
|
#define QEMU_MAX_CPU_GEN 14
|
||||||
#define QEMU_MAX_CPU_EC_GA 2
|
#define QEMU_MAX_CPU_EC_GA 2
|
||||||
static const S390FeatInit qemu_max_cpu_feat_init = { S390_FEAT_LIST_QEMU_MAX };
|
static const S390FeatInit qemu_max_cpu_feat_init = { S390_FEAT_LIST_QEMU_MAX };
|
||||||
static S390FeatBitmap qemu_max_cpu_feat;
|
static S390FeatBitmap qemu_max_cpu_feat;
|
||||||
|
|
|
@ -706,21 +706,23 @@ static uint16_t qemu_V4_1[] = {
|
||||||
S390_FEAT_VECTOR,
|
S390_FEAT_VECTOR,
|
||||||
};
|
};
|
||||||
|
|
||||||
static uint16_t qemu_LATEST[] = {
|
static uint16_t qemu_V6_0[] = {
|
||||||
S390_FEAT_ACCESS_EXCEPTION_FS_INDICATION,
|
S390_FEAT_ACCESS_EXCEPTION_FS_INDICATION,
|
||||||
S390_FEAT_SIDE_EFFECT_ACCESS_ESOP2,
|
S390_FEAT_SIDE_EFFECT_ACCESS_ESOP2,
|
||||||
S390_FEAT_ESOP,
|
S390_FEAT_ESOP,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static uint16_t qemu_LATEST[] = {
|
||||||
|
S390_FEAT_INSTRUCTION_EXEC_PROT,
|
||||||
|
S390_FEAT_MISC_INSTRUCTION_EXT2,
|
||||||
|
S390_FEAT_MSA_EXT_8,
|
||||||
|
S390_FEAT_VECTOR_ENH,
|
||||||
|
};
|
||||||
|
|
||||||
/* add all new definitions before this point */
|
/* add all new definitions before this point */
|
||||||
static uint16_t qemu_MAX[] = {
|
static uint16_t qemu_MAX[] = {
|
||||||
/* generates a dependency warning, leave it out for now */
|
/* generates a dependency warning, leave it out for now */
|
||||||
S390_FEAT_MSA_EXT_5,
|
S390_FEAT_MSA_EXT_5,
|
||||||
/* features introduced after the z13 */
|
|
||||||
S390_FEAT_INSTRUCTION_EXEC_PROT,
|
|
||||||
S390_FEAT_MISC_INSTRUCTION_EXT2,
|
|
||||||
S390_FEAT_MSA_EXT_8,
|
|
||||||
S390_FEAT_VECTOR_ENH,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/****** END FEATURE DEFS ******/
|
/****** END FEATURE DEFS ******/
|
||||||
|
@ -839,6 +841,7 @@ static FeatGroupDefSpec QemuFeatDef[] = {
|
||||||
QEMU_FEAT_INITIALIZER(V3_1),
|
QEMU_FEAT_INITIALIZER(V3_1),
|
||||||
QEMU_FEAT_INITIALIZER(V4_0),
|
QEMU_FEAT_INITIALIZER(V4_0),
|
||||||
QEMU_FEAT_INITIALIZER(V4_1),
|
QEMU_FEAT_INITIALIZER(V4_1),
|
||||||
|
QEMU_FEAT_INITIALIZER(V6_0),
|
||||||
QEMU_FEAT_INITIALIZER(LATEST),
|
QEMU_FEAT_INITIALIZER(LATEST),
|
||||||
QEMU_FEAT_INITIALIZER(MAX),
|
QEMU_FEAT_INITIALIZER(MAX),
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue