[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 27/38] s390x/sclp: propagate hmfai
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL 27/38] s390x/sclp: propagate hmfai |
Date: |
Tue, 6 Sep 2016 09:46:59 +0200 |
From: David Hildenbrand <address@hidden>
hmfai is provided on CPU models >= z196. Let's propagate it properly.
Acked-by: Cornelia Huck <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
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 a823450..48e38b2 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 dab3c0f..3008a51 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 aae7216..eb32104 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 d378919..87de0fb 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)
--
2.9.3
- [Qemu-devel] [PULL 09/38] s390x/kvm: 2 byte software breakpoint support, (continued)
- [Qemu-devel] [PULL 09/38] s390x/kvm: 2 byte software breakpoint support, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 06/38] s390x/ioinst: advertise fcs facility, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 14/38] s390x/cpumodel: generate CPU feature lists for CPU models, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 07/38] s390x/css: handle cssid 255 correctly, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 13/38] s390x/cpumodel: introduce CPU features, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 04/38] s390/sclp: cache the sclp device, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 15/38] s390x/cpumodel: generate CPU feature group lists, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 10/38] qmp: details about CPU definitions in query-cpu-definitions, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 03/38] s390x/pci: assert zpci always existing, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 17/38] s390x/cpumodel: register defined CPU models as subclasses, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 27/38] s390x/sclp: propagate hmfai,
Cornelia Huck <=
- [Qemu-devel] [PULL 21/38] s390x/cpumodel: check and apply the CPU model, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 29/38] s390x/kvm: implement CPU model support, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 28/38] s390x/kvm: allow runtime-instrumentation for "none" machine, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 32/38] s390x/kvm: don't enable key wrapping if msa3 is disabled, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 23/38] s390x/sclp: introduce sclp feature blocks, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 36/38] s390x/cpumodel: implement QMP interface "query-cpu-model-expansion", Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 37/38] s390x/cpumodel: implement QMP interface "query-cpu-model-comparison", Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 30/38] s390x/kvm: disable host model for problematic compat machines, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 33/38] qmp: add QMP interface "query-cpu-model-expansion", Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 34/38] qmp: add QMP interface "query-cpu-model-comparison", Cornelia Huck, 2016/09/06