From a366930780a75027bf44fa8b1efa03372f71e17d Mon Sep 17 00:00:00 2001 From: David Hildenbrand Date: Mon, 5 Sep 2016 10:52:32 +0200 Subject: [PATCH] s390x/sclp: propagate hmfai hmfai is provided on CPU models >= z196. Let's propagate it properly. Acked-by: Cornelia Huck Signed-off-by: David Hildenbrand Message-Id: <20160905085244.99980-19-dahi@linux.vnet.ibm.com> Signed-off-by: Cornelia Huck --- hw/s390x/sclp.c | 1 + include/hw/s390x/sclp.h | 3 ++- target-s390x/cpu_models.c | 14 ++++++++++++++ target-s390x/cpu_models.h | 1 + 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c index a823450391..48e38b2bbe 100644 --- a/hw/s390x/sclp.c +++ b/hw/s390x/sclp.c @@ -111,6 +111,7 @@ static void read_SCP_info(SCLPDevice *sclp, SCCB *sccb) read_info->facilities |= cpu_to_be64(SCLP_FC_ASSIGN_ATTACH_READ_STOR); } read_info->mha_pow = s390_get_mha_pow(); + read_info->hmfai = cpu_to_be32(s390_get_hmfai()); rnsize = 1 << (sclp->increment_size - 20); if (rnsize <= 128) { diff --git a/include/hw/s390x/sclp.h b/include/hw/s390x/sclp.h index dab3c0f268..3008a5148a 100644 --- a/include/hw/s390x/sclp.h +++ b/include/hw/s390x/sclp.h @@ -131,7 +131,8 @@ typedef struct ReadInfo { uint8_t _reserved6[116 - 112]; /* 112-115 */ uint8_t conf_char_ext[120 - 116]; /* 116-119 */ uint16_t highest_cpu; - uint8_t _reserved5[128 - 122]; /* 122-127 */ + uint8_t _reserved5[124 - 122]; /* 122-123 */ + uint32_t hmfai; struct CPUEntry entries[0]; } QEMU_PACKED ReadInfo; diff --git a/target-s390x/cpu_models.c b/target-s390x/cpu_models.c index 4d2e48b465..25ac2c9884 100644 --- a/target-s390x/cpu_models.c +++ b/target-s390x/cpu_models.c @@ -74,6 +74,20 @@ static S390CPUDef s390_cpu_defs[] = { CPUDEF_INIT(0x2965, 13, 2, 47, 0x08000000U, "z13s", "IBM z13s GA1"), }; +uint32_t s390_get_hmfai(void) +{ + static S390CPU *cpu; + + if (!cpu) { + cpu = S390_CPU(qemu_get_cpu(0)); + } + + if (!cpu || !cpu->model) { + return 0; + } + return cpu->model->def->hmfai; +} + uint8_t s390_get_mha_pow(void) { static S390CPU *cpu; diff --git a/target-s390x/cpu_models.h b/target-s390x/cpu_models.h index d378919d57..87de0fb12b 100644 --- a/target-s390x/cpu_models.h +++ b/target-s390x/cpu_models.h @@ -51,6 +51,7 @@ typedef struct S390CPUModel { #define S390_GEN_Z10 0xa +uint32_t s390_get_hmfai(void); uint8_t s390_get_mha_pow(void); uint32_t s390_get_ibc_val(void); static inline uint16_t s390_ibc_from_cpu_model(const S390CPUModel *model)