[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [Patch v4 17/30] s390x/sclp: propagate the mha via sclp
From: |
David Hildenbrand |
Subject: |
[Qemu-devel] [Patch v4 17/30] s390x/sclp: propagate the mha via sclp |
Date: |
Mon, 5 Sep 2016 10:52:31 +0200 |
The mha is provided in the CPU model, so get any CPU and extract the value.
Acked-by: Cornelia Huck <address@hidden>
Signed-off-by: David Hildenbrand <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 52f8bb9..5ffcf51 100644
--- a/hw/s390x/sclp.c
+++ b/hw/s390x/sclp.c
@@ -105,6 +105,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();
rnsize = 1 << (sclp->increment_size - 20);
if (rnsize <= 128) {
diff --git a/include/hw/s390x/sclp.h b/include/hw/s390x/sclp.h
index 664be9b..dab3c0f 100644
--- a/include/hw/s390x/sclp.h
+++ b/include/hw/s390x/sclp.h
@@ -124,7 +124,8 @@ typedef struct ReadInfo {
uint8_t _reserved0[76 - 56]; /* 56-75 */
uint32_t ibc_val;
uint8_t conf_char[96 - 80]; /* 80-95 */
- uint8_t _reserved4[100 - 96]; /* 96-99 */
+ uint8_t _reserved4[99 - 96]; /* 96-98 */
+ uint8_t mha_pow;
uint32_t rnsize2;
uint64_t rnmax2;
uint8_t _reserved6[116 - 112]; /* 112-115 */
diff --git a/target-s390x/cpu_models.c b/target-s390x/cpu_models.c
index 4331d74..aae7216 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"),
};
+uint8_t s390_get_mha_pow(void)
+{
+ static S390CPU *cpu;
+
+ if (!cpu) {
+ cpu = S390_CPU(qemu_get_cpu(0));
+ }
+
+ if (!cpu || !cpu->model) {
+ return 0;
+ }
+ return cpu->model->def->mha_pow;
+}
+
uint32_t s390_get_ibc_val(void)
{
uint16_t unblocked_ibc, lowest_ibc;
diff --git a/target-s390x/cpu_models.h b/target-s390x/cpu_models.h
index 5e870ec..d378919 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
+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.8.4
- [Qemu-devel] [Patch v4 13/30] s390x/sclp: factor out preparation of cpu entries, (continued)
- [Qemu-devel] [Patch v4 13/30] s390x/sclp: factor out preparation of cpu entries, David Hildenbrand, 2016/09/05
- [Qemu-devel] [Patch v4 15/30] s390x/sclp: indicate sclp features, David Hildenbrand, 2016/09/05
- [Qemu-devel] [Patch v4 03/30] s390x/cpumodel: expose CPU class properties, David Hildenbrand, 2016/09/05
- [Qemu-devel] [Patch v4 10/30] s390x/cpumodel: expose features and feature groups as properties, David Hildenbrand, 2016/09/05
- [Qemu-devel] [Patch v4 30/30] s390x/cpumodel: implement QMP interface "query-cpu-model-baseline", David Hildenbrand, 2016/09/05
- [Qemu-devel] [Patch v4 12/30] s390x/cpumodel: check and apply the CPU model, David Hildenbrand, 2016/09/05
- [Qemu-devel] [Patch v4 23/30] s390x/kvm: let the CPU model control CMM(A), David Hildenbrand, 2016/09/05
- [Qemu-devel] [Patch v4 22/30] s390x/kvm: disable host model for problematic compat machines, David Hildenbrand, 2016/09/05
- [Qemu-devel] [Patch v4 02/30] s390x/cpumodel: "host" and "qemu" as CPU subclasses, David Hildenbrand, 2016/09/05
- [Qemu-devel] [Patch v4 11/30] s390x/cpumodel: let the CPU model handle feature checks, David Hildenbrand, 2016/09/05
- [Qemu-devel] [Patch v4 17/30] s390x/sclp: propagate the mha via sclp,
David Hildenbrand <=
- [Qemu-devel] [Patch v4 24/30] s390x/kvm: don't enable key wrapping if msa3 is disabled, David Hildenbrand, 2016/09/05
- [Qemu-devel] [Patch v4 08/30] s390x/cpumodel: register defined CPU models as subclasses, David Hildenbrand, 2016/09/05
- [Qemu-devel] [Patch v4 18/30] s390x/sclp: propagate hmfai, David Hildenbrand, 2016/09/05
- [Qemu-devel] [Patch v4 26/30] qmp: add QMP interface "query-cpu-model-comparison", David Hildenbrand, 2016/09/05
- Re: [Qemu-devel] [Patch v4 00/30] s390x CPU models: exposing features, Cornelia Huck, 2016/09/05
- Re: [Qemu-devel] [Patch v4 00/30] s390x CPU models: exposing features, no-reply, 2016/09/05
- Re: [Qemu-devel] [Patch v4 00/30] s390x CPU models: exposing features, Cornelia Huck, 2016/09/05