openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

s390x/sclp: propagate the mha via sclp 

The mha is provided in the CPU model, so get any CPU and extract the value.

Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Message-Id: <20160905085244.99980-18-dahi@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
This commit is contained in:
David Hildenbrand 2016-09-05 10:52:31 +02:00 committed by Cornelia Huck
parent 059be520d5
commit 3fad3252a3
4 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/s390x/sclp.c
View File

@ -110,6 +110,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) {

3
include/hw/s390x/sclp.h
View File

@ -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 */

14
target-s390x/cpu_models.c
View File

@ -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;

1
target-s390x/cpu_models.h
View File

@ -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)
{