From a2d57b35c0226102b1f2ffdc2f719fcc30c99bf5 Mon Sep 17 00:00:00 2001
From: Janosch Frank <frankja@linux.vnet.ibm.com>
Date: Mon, 23 May 2016 15:09:19 +0200
Subject: [PATCH] KVM: s390: Extend diag 204 fields
The new store hypervisor information instruction, which we are going
to introduce, needs previously unused fields in diag 204 structures.
Signed-off-by: Janosch Frank <frankja@linux.vnet.ibm.com>
Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
arch/s390/include/asm/diag.h | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/arch/s390/include/asm/diag.h b/arch/s390/include/asm/diag.h
index 197e303a76e96..f4000cdb69211 100644
--- a/arch/s390/include/asm/diag.h
+++ b/arch/s390/include/asm/diag.h
@@ -97,6 +97,11 @@ enum diag204_format {
DIAG204_INFO_EXT = 0x00010000
};
+enum diag204_cpu_flags {
+ DIAG204_CPU_ONLINE = 0x20,
+ DIAG204_CPU_CAPPED = 0x40,
+};
+
struct diag204_info_blk_hdr {
__u8 npar;
__u8 flags;
@@ -136,10 +141,13 @@ struct diag204_x_part_hdr {
__u64 online_cs;
__u64 online_es;
__u8 upid;
- char reserved1[3];
+ __u8 reserved:3;
+ __u8 mtid:5;
+ char reserved1[2];
__u32 group_mlu;
char group_name[8];
- char reserved2[32];
+ char hardware_group_name[8];
+ char reserved2[24];
} __packed;
struct diag204_cpu_info {
@@ -168,7 +176,9 @@ struct diag204_x_cpu_info {
__u64 wait_time;
__u32 pma_weight;
__u32 polar_weight;
- char reserved3[40];
+ __u32 cpu_type_cap;
+ __u32 group_cpu_type_cap;
+ char reserved3[32];
} __packed;
struct diag204_phys_hdr {
@@ -199,7 +209,8 @@ struct diag204_x_phys_cpu {
__u16 cpu_addr;
char reserved1[2];
__u8 ctidx;
- char reserved2[3];
+ char reserved2[1];
+ __u16 weight;
__u64 mgm_time;
char reserved3[80];
} __packed;
--
GitLab