From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51262) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUYMC-000840-SZ for qemu-devel@nongnu.org; Tue, 02 Aug 2016 07:59:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bUYMA-00017M-4P for qemu-devel@nongnu.org; Tue, 02 Aug 2016 07:59:35 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:12230) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUYM9-00016k-R6 for qemu-devel@nongnu.org; Tue, 02 Aug 2016 07:59:34 -0400 Received: from pps.filterd (m0098404.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id u72BsOOp077241 for ; Tue, 2 Aug 2016 07:59:33 -0400 Received: from e06smtp06.uk.ibm.com (e06smtp06.uk.ibm.com [195.75.94.102]) by mx0a-001b2d01.pphosted.com with ESMTP id 24graw23k7-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Tue, 02 Aug 2016 07:59:32 -0400 Received: from localhost by e06smtp06.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 2 Aug 2016 12:59:30 +0100 Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id 5E14817D805A for ; Tue, 2 Aug 2016 13:01:04 +0100 (BST) Received: from d06av10.portsmouth.uk.ibm.com (d06av10.portsmouth.uk.ibm.com [9.149.37.251]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u72BxSvD12517648 for ; Tue, 2 Aug 2016 11:59:28 GMT Received: from d06av10.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av10.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u72AxUi8024627 for ; Tue, 2 Aug 2016 04:59:30 -0600 From: David Hildenbrand Date: Tue, 2 Aug 2016 13:59:03 +0200 In-Reply-To: <1470139155-53900-1-git-send-email-dahi@linux.vnet.ibm.com> References: <1470139155-53900-1-git-send-email-dahi@linux.vnet.ibm.com> Message-Id: <1470139155-53900-18-git-send-email-dahi@linux.vnet.ibm.com> Subject: [Qemu-devel] [Patch v1 17/29] s390x/sclp: propagate the mha via sclp List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: ehabkost@redhat.com, jdenemar@redhat.com, imammedo@redhat.com, cornelia.huck@de.ibm.com, borntraeger@de.ibm.com, fiuczy@linux.vnet.ibm.com, mimu@linux.vnet.ibm.com The mha is provided in the CPU model, so get any CPU and extract the value. Acked-by: Cornelia Huck Signed-off-by: David Hildenbrand --- 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 51ce3d8..2363027 100644 --- a/target-s390x/cpu_models.c +++ b/target-s390x/cpu_models.c @@ -74,6 +74,20 @@ static const 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 bbb85ac..ee019b4 100644 --- a/target-s390x/cpu_models.h +++ b/target-s390x/cpu_models.h @@ -45,6 +45,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.6.6