[kvm-unit-tests PATCH v2 02/10] s390x: sie: Add PV fields to SIE control block

Janosch Frank
2021-12-07T16:02:08Z

We need those fields for format 4 SIE tests (protected VMs).

Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
---
lib/s390x/sie.h | 41 ++++++++++++++++++++++++++++++++++-------
1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/lib/s390x/sie.h b/lib/s390x/sie.h
index f34e3c80..c6eb6441 100644
--- a/lib/s390x/sie.h
+++ b/lib/s390x/sie.h
@@ -38,7 +38,13 @@ struct kvm_s390_sie_block {
uint8_t reserved08[4]; /* 0x0008 */
#define PROG_IN_SIE (1<<0)
uint32_t prog0c; /* 0x000c */
- uint8_t reserved10[16]; /* 0x0010 */
+union {
+ uint8_t reserved10[16]; /* 0x0010 */
+ struct {
+ uint64_t pv_handle_cpu;
+ uint64_t pv_handle_config;
+ };
+ };
#define PROG_BLOCK_SIE (1<<0)
#define PROG_REQUEST (1<<1)
uint32_t prog20; /* 0x0020 */
@@ -87,10 +93,22 @@ struct kvm_s390_sie_block {
#define ICPT_PARTEXEC 0x38
#define ICPT_IOINST 0x40
#define ICPT_KSS 0x5c
+#define ICPT_INT_ENABLE 0x64
+#define ICPT_PV_INSTR 0x68
+#define ICPT_PV_NOTIFY 0x6c
+#define ICPT_PV_PREF 0x70
uint8_t icptcode; /* 0x0050 */
uint8_t icptstatus; /* 0x0051 */
uint16_t ihcpu; /* 0x0052 */
- uint8_t reserved54[2]; /* 0x0054 */
+ uint8_t reserved54; /* 0x0054 */
+#define IICTL_CODE_NONE 0x00
+#define IICTL_CODE_MCHK 0x01
+#define IICTL_CODE_EXT 0x02
+#define IICTL_CODE_IO 0x03
+#define IICTL_CODE_RESTART 0x04
+#define IICTL_CODE_SPECIFICATION 0x10
+#define IICTL_CODE_OPERAND 0x11
+ uint8_t iictl; /* 0x0055 */
uint16_t ipa; /* 0x0056 */
uint32_t ipb; /* 0x0058 */
uint32_t scaoh; /* 0x005c */
@@ -112,7 +130,7 @@ struct kvm_s390_sie_block {
#define ECB3_RI 0x01
uint8_t ecb3; /* 0x0063 */
uint32_t scaol; /* 0x0064 */
- uint8_t reserved68; /* 0x0068 */
+ uint8_t sdf; /* 0x0068 */
uint8_t epdx; /* 0x0069 */
uint8_t reserved6a[2]; /* 0x006a */
uint32_t todpr; /* 0x006c */
@@ -128,9 +146,15 @@ struct kvm_s390_sie_block {
#define HPID_KVM 0x4
#define HPID_VSIE 0x5
uint8_t hpid; /* 0x00b8 */
- uint8_t reservedb9[11]; /* 0x00b9 */
- uint16_t extcpuaddr; /* 0x00c4 */
- uint16_t eic; /* 0x00c6 */
+ uint8_t reservedb9[7]; /* 0x00b9 */
+ union {
+ struct {
+ uint32_t eiparams; /* 0x00c0 */
+ uint16_t extcpuaddr; /* 0x00c4 */
+ uint16_t eic; /* 0x00c6 */
+ };
+ uint64_t mcic; /* 0x00c0 */
+ } __attribute__ ((__packed__));
uint32_t reservedc8; /* 0x00c8 */
uint16_t pgmilc; /* 0x00cc */
uint16_t iprcc; /* 0x00ce */
@@ -152,7 +176,10 @@ struct kvm_s390_sie_block {
#define CRYCB_FORMAT2 0x00000003
uint32_t crycbd; /* 0x00fc */
uint64_t gcr[16]; /* 0x0100 */
- uint64_t gbea; /* 0x0180 */
+ union {
+ uint64_t gbea; /* 0x0180 */
+ uint64_t sidad;
+ };
uint8_t reserved188[8]; /* 0x0188 */
uint64_t sdnxo; /* 0x0190 */
uint8_t reserved198[8]; /* 0x0198 */
--
2.32.0