Commit dd9db3bf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 's390-6.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull more s390 updates from Vasily Gorbik:

 - Fix machine check handler _CIF_MCCK_GUEST bit setting by adding the
   missing base register for relocated lowcore address

 - Fix build failure on older linkers by conditionally adding the
   -no-pie linker option only when it is supported

 - Fix inaccurate kernel messages in vfio-ap by providing descriptive
   error notifications for AP queue sharing violations

 - Fix PCI isolation logic by ensuring non-VF devices correctly return
   false in zpci_bus_is_isolated_vf()

 - Fix PCI DMA range map setup by using dma_direct_set_offset() to add a
   proper sentinel element, preventing potential overruns and
   translation errors

 - Cleanup header dependency problems with asm-offsets.c

 - Add fault info for unexpected low-address protection faults in user
   mode

 - Add support for HOTPLUG_SMT, replacing the arch-specific "nosmt"
   handling with common code handling

 - Use bitop functions to implement CPU flag helper functions to ensure
   that bits cannot get lost if modified in different contexts on a CPU

 - Remove unused machine_flags for the lowcore

* tag 's390-6.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/vfio-ap: Fix no AP queue sharing allowed message written to kernel log
  s390/pci: Fix dev.dma_range_map missing sentinel element
  s390/mm: Dump fault info in case of low address protection fault
  s390/smp: Add support for HOTPLUG_SMT
  s390: Fix linker error when -no-pie option is unavailable
  s390/processor: Use bitop functions for cpu flag helper functions
  s390/asm-offsets: Remove ASM_OFFSETS_C
  s390/asm-offsets: Include ftrace_regs.h instead of ftrace.h
  s390/kvm: Split kvm_host header file
  s390/pci: Fix zpci_bus_is_isolated_vf() for non-VFs
  s390/lowcore: Remove unused machine_flags
  s390/entry: Fix setting _CIF_MCCK_GUEST with lowcore relocation
parents 9f867ba2 d33d729a

Documentation/admin-guide/kernel-parameters.txt

+2 −2
Original line number Diff line number Diff line
@@ -4265,10 +4265,10 @@ 
	nosmp		[SMP,EARLY] Tells an SMP kernel to act as a UP kernel,

			and disable the IO APIC.  legacy for "maxcpus=0".



	nosmt		[KNL,MIPS,PPC,S390,EARLY] Disable symmetric multithreading (SMT).

	nosmt		[KNL,MIPS,PPC,EARLY] Disable symmetric multithreading (SMT).

			Equivalent to smt=1.



			[KNL,X86,PPC] Disable symmetric multithreading (SMT).

			[KNL,X86,PPC,S390] Disable symmetric multithreading (SMT).

			nosmt=force: Force disable SMT, cannot be undone

				     via the sysfs control file.

arch/s390/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -240,6 +240,7 @@ config S390 
	select HAVE_SYSCALL_TRACEPOINTS

	select HAVE_VIRT_CPU_ACCOUNTING

	select HAVE_VIRT_CPU_ACCOUNTING_IDLE

	select HOTPLUG_SMT

	select IOMMU_HELPER		if PCI

	select IOMMU_SUPPORT		if PCI

	select KASAN_VMALLOC if KASAN

arch/s390/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ KBUILD_CFLAGS_MODULE += -fPIC 
KBUILD_AFLAGS	+= -m64

KBUILD_CFLAGS	+= -m64

KBUILD_CFLAGS	+= -fPIC

LDFLAGS_vmlinux	:= -no-pie --emit-relocs --discard-none

LDFLAGS_vmlinux	:= $(call ld-option,-no-pie) --emit-relocs --discard-none

extra_tools	:= relocs

aflags_dwarf	:= -Wa,-gdwarf-2

KBUILD_AFLAGS_DECOMPRESSOR := $(CLANG_FLAGS) -m64 -D__ASSEMBLY__

arch/s390/include/asm/kvm_host.h

+1 −338
Original line number Diff line number Diff line
@@ -20,14 +20,13 @@ 
#include <linux/module.h>

#include <linux/pci.h>

#include <linux/mmu_notifier.h>

#include <asm/kvm_host_types.h>

#include <asm/debug.h>

#include <asm/cpu.h>

#include <asm/fpu.h>

#include <asm/isc.h>

#include <asm/guarded_storage.h>



#define KVM_S390_BSCA_CPU_SLOTS 64

#define KVM_S390_ESCA_CPU_SLOTS 248

#define KVM_MAX_VCPUS 255



#define KVM_INTERNAL_MEM_SLOTS 1
@@ -51,342 +50,6 @@ 
#define KVM_REQ_REFRESH_GUEST_PREFIX	\

	KVM_ARCH_REQ_FLAGS(6, KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)



#define SIGP_CTRL_C		0x80

#define SIGP_CTRL_SCN_MASK	0x3f



union bsca_sigp_ctrl {

	__u8 value;

	struct {

		__u8 c : 1;

		__u8 r : 1;

		__u8 scn : 6;

	};

};



union esca_sigp_ctrl {

	__u16 value;

	struct {

		__u8 c : 1;

		__u8 reserved: 7;

		__u8 scn;

	};

};



struct esca_entry {

	union esca_sigp_ctrl sigp_ctrl;

	__u16   reserved1[3];

	__u64   sda;

	__u64   reserved2[6];

};



struct bsca_entry {

	__u8	reserved0;

	union bsca_sigp_ctrl	sigp_ctrl;

	__u16	reserved[3];

	__u64	sda;

	__u64	reserved2[2];

};



union ipte_control {

	unsigned long val;

	struct {

		unsigned long k  : 1;

		unsigned long kh : 31;

		unsigned long kg : 32;

	};

};



/*

 * Utility is defined as two bytes but having it four bytes wide

 * generates more efficient code. Since the following bytes are

 * reserved this makes no functional difference.

 */

union sca_utility {

	__u32 val;

	struct {

		__u32 mtcr : 1;

		__u32	   : 31;

	};

};



struct bsca_block {

	union ipte_control ipte_control;

	__u64	reserved[5];

	__u64	mcn;

	union sca_utility utility;

	__u8	reserved2[4];

	struct bsca_entry cpu[KVM_S390_BSCA_CPU_SLOTS];

};



struct esca_block {

	union ipte_control ipte_control;

	__u64   reserved1[6];

	union sca_utility utility;

	__u8	reserved2[4];

	__u64   mcn[4];

	__u64   reserved3[20];

	struct esca_entry cpu[KVM_S390_ESCA_CPU_SLOTS];

};



/*

 * This struct is used to store some machine check info from lowcore

 * for machine checks that happen while the guest is running.

 * This info in host's lowcore might be overwritten by a second machine

 * check from host when host is in the machine check's high-level handling.

 * The size is 24 bytes.

 */

struct mcck_volatile_info {

	__u64 mcic;

	__u64 failing_storage_address;

	__u32 ext_damage_code;

	__u32 reserved;

};



#define CR0_INITIAL_MASK (CR0_UNUSED_56 | CR0_INTERRUPT_KEY_SUBMASK | \

			  CR0_MEASUREMENT_ALERT_SUBMASK)

#define CR14_INITIAL_MASK (CR14_UNUSED_32 | CR14_UNUSED_33 | \

			   CR14_EXTERNAL_DAMAGE_SUBMASK)



#define SIDAD_SIZE_MASK		0xff

#define sida_addr(sie_block) phys_to_virt((sie_block)->sidad & PAGE_MASK)

#define sida_size(sie_block) \

	((((sie_block)->sidad & SIDAD_SIZE_MASK) + 1) * PAGE_SIZE)



#define CPUSTAT_STOPPED    0x80000000

#define CPUSTAT_WAIT       0x10000000

#define CPUSTAT_ECALL_PEND 0x08000000

#define CPUSTAT_STOP_INT   0x04000000

#define CPUSTAT_IO_INT     0x02000000

#define CPUSTAT_EXT_INT    0x01000000

#define CPUSTAT_RUNNING    0x00800000

#define CPUSTAT_RETAINED   0x00400000

#define CPUSTAT_TIMING_SUB 0x00020000

#define CPUSTAT_SIE_SUB    0x00010000

#define CPUSTAT_RRF        0x00008000

#define CPUSTAT_SLSV       0x00004000

#define CPUSTAT_SLSR       0x00002000

#define CPUSTAT_ZARCH      0x00000800

#define CPUSTAT_MCDS       0x00000100

#define CPUSTAT_KSS        0x00000200

#define CPUSTAT_SM         0x00000080

#define CPUSTAT_IBS        0x00000040

#define CPUSTAT_GED2       0x00000010

#define CPUSTAT_G          0x00000008

#define CPUSTAT_GED        0x00000004

#define CPUSTAT_J          0x00000002

#define CPUSTAT_P          0x00000001



struct kvm_s390_sie_block {

	atomic_t cpuflags;		/* 0x0000 */

	__u32 : 1;			/* 0x0004 */

	__u32 prefix : 18;

	__u32 : 1;

	__u32 ibc : 12;

	__u8	reserved08[4];		/* 0x0008 */

#define PROG_IN_SIE (1<<0)

	__u32	prog0c;			/* 0x000c */

	union {

		__u8	reserved10[16];		/* 0x0010 */

		struct {

			__u64	pv_handle_cpu;

			__u64	pv_handle_config;

		};

	};

#define PROG_BLOCK_SIE	(1<<0)

#define PROG_REQUEST	(1<<1)

	atomic_t prog20;		/* 0x0020 */

	__u8	reserved24[4];		/* 0x0024 */

	__u64	cputm;			/* 0x0028 */

	__u64	ckc;			/* 0x0030 */

	__u64	epoch;			/* 0x0038 */

	__u32	svcc;			/* 0x0040 */

#define LCTL_CR0	0x8000

#define LCTL_CR6	0x0200

#define LCTL_CR9	0x0040

#define LCTL_CR10	0x0020

#define LCTL_CR11	0x0010

#define LCTL_CR14	0x0002

	__u16   lctl;			/* 0x0044 */

	__s16	icpua;			/* 0x0046 */

#define ICTL_OPEREXC	0x80000000

#define ICTL_PINT	0x20000000

#define ICTL_LPSW	0x00400000

#define ICTL_STCTL	0x00040000

#define ICTL_ISKE	0x00004000

#define ICTL_SSKE	0x00002000

#define ICTL_RRBE	0x00001000

#define ICTL_TPROT	0x00000200

	__u32	ictl;			/* 0x0048 */

#define ECA_CEI		0x80000000

#define ECA_IB		0x40000000

#define ECA_SIGPI	0x10000000

#define ECA_MVPGI	0x01000000

#define ECA_AIV		0x00200000

#define ECA_VX		0x00020000

#define ECA_PROTEXCI	0x00002000

#define ECA_APIE	0x00000008

#define ECA_SII		0x00000001

	__u32	eca;			/* 0x004c */

#define ICPT_INST	0x04

#define ICPT_PROGI	0x08

#define ICPT_INSTPROGI	0x0C

#define ICPT_EXTREQ	0x10

#define ICPT_EXTINT	0x14

#define ICPT_IOREQ	0x18

#define ICPT_WAIT	0x1c

#define ICPT_VALIDITY	0x20

#define ICPT_STOP	0x28

#define ICPT_OPEREXC	0x2C

#define ICPT_PARTEXEC	0x38

#define ICPT_IOINST	0x40

#define ICPT_KSS	0x5c

#define ICPT_MCHKREQ	0x60

#define ICPT_INT_ENABLE	0x64

#define ICPT_PV_INSTR	0x68

#define ICPT_PV_NOTIFY	0x6c

#define ICPT_PV_PREF	0x70

	__u8	icptcode;		/* 0x0050 */

	__u8	icptstatus;		/* 0x0051 */

	__u16	ihcpu;			/* 0x0052 */

	__u8	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

	__u8	iictl;			/* 0x0055 */

	__u16	ipa;			/* 0x0056 */

	__u32	ipb;			/* 0x0058 */

	__u32	scaoh;			/* 0x005c */

#define FPF_BPBC 	0x20

	__u8	fpf;			/* 0x0060 */

#define ECB_GS		0x40

#define ECB_TE		0x10

#define ECB_SPECI	0x08

#define ECB_SRSI	0x04

#define ECB_HOSTPROTINT	0x02

#define ECB_PTF		0x01

	__u8	ecb;			/* 0x0061 */

#define ECB2_CMMA	0x80

#define ECB2_IEP	0x20

#define ECB2_PFMFI	0x08

#define ECB2_ESCA	0x04

#define ECB2_ZPCI_LSI	0x02

	__u8    ecb2;                   /* 0x0062 */

#define ECB3_AISI	0x20

#define ECB3_AISII	0x10

#define ECB3_DEA 0x08

#define ECB3_AES 0x04

#define ECB3_RI  0x01

	__u8    ecb3;			/* 0x0063 */

#define ESCA_SCAOL_MASK ~0x3fU

	__u32	scaol;			/* 0x0064 */

	__u8	sdf;			/* 0x0068 */

	__u8    epdx;			/* 0x0069 */

	__u8	cpnc;			/* 0x006a */

	__u8	reserved6b;		/* 0x006b */

	__u32	todpr;			/* 0x006c */

#define GISA_FORMAT1 0x00000001

	__u32	gd;			/* 0x0070 */

	__u8	reserved74[12];		/* 0x0074 */

	__u64	mso;			/* 0x0080 */

	__u64	msl;			/* 0x0088 */

	psw_t	gpsw;			/* 0x0090 */

	__u64	gg14;			/* 0x00a0 */

	__u64	gg15;			/* 0x00a8 */

	__u8	reservedb0[8];		/* 0x00b0 */

#define HPID_KVM	0x4

#define HPID_VSIE	0x5

	__u8	hpid;			/* 0x00b8 */

	__u8	reservedb9[7];		/* 0x00b9 */

	union {

		struct {

			__u32	eiparams;	/* 0x00c0 */

			__u16	extcpuaddr;	/* 0x00c4 */

			__u16	eic;		/* 0x00c6 */

		};

		__u64	mcic;			/* 0x00c0 */

	} __packed;

	__u32	reservedc8;		/* 0x00c8 */

	union {

		struct {

			__u16	pgmilc;		/* 0x00cc */

			__u16	iprcc;		/* 0x00ce */

		};

		__u32	edc;			/* 0x00cc */

	} __packed;

	union {

		struct {

			__u32	dxc;		/* 0x00d0 */

			__u16	mcn;		/* 0x00d4 */

			__u8	perc;		/* 0x00d6 */

			__u8	peratmid;	/* 0x00d7 */

		};

		__u64	faddr;			/* 0x00d0 */

	} __packed;

	__u64	peraddr;		/* 0x00d8 */

	__u8	eai;			/* 0x00e0 */

	__u8	peraid;			/* 0x00e1 */

	__u8	oai;			/* 0x00e2 */

	__u8	armid;			/* 0x00e3 */

	__u8	reservede4[4];		/* 0x00e4 */

	union {

		__u64	tecmc;		/* 0x00e8 */

		struct {

			__u16	subchannel_id;	/* 0x00e8 */

			__u16	subchannel_nr;	/* 0x00ea */

			__u32	io_int_parm;	/* 0x00ec */

			__u32	io_int_word;	/* 0x00f0 */

		};

	} __packed;

	__u8	reservedf4[8];		/* 0x00f4 */

#define CRYCB_FORMAT_MASK 0x00000003

#define CRYCB_FORMAT0 0x00000000

#define CRYCB_FORMAT1 0x00000001

#define CRYCB_FORMAT2 0x00000003

	__u32	crycbd;			/* 0x00fc */

	__u64	gcr[16];		/* 0x0100 */

	union {

		__u64	gbea;		/* 0x0180 */

		__u64	sidad;

	};

	__u8    reserved188[8];		/* 0x0188 */

	__u64   sdnxo;			/* 0x0190 */

	__u8    reserved198[8];		/* 0x0198 */

	__u32	fac;			/* 0x01a0 */

	__u8	reserved1a4[20];	/* 0x01a4 */

	__u64	cbrlo;			/* 0x01b8 */

	__u8	reserved1c0[8];		/* 0x01c0 */

#define ECD_HOSTREGMGMT	0x20000000

#define ECD_MEF		0x08000000

#define ECD_ETOKENF	0x02000000

#define ECD_ECC		0x00200000

#define ECD_HMAC	0x00004000

	__u32	ecd;			/* 0x01c8 */

	__u8	reserved1cc[18];	/* 0x01cc */

	__u64	pp;			/* 0x01de */

	__u8	reserved1e6[2];		/* 0x01e6 */

	__u64	itdba;			/* 0x01e8 */

	__u64   riccbd;			/* 0x01f0 */

	__u64	gvrd;			/* 0x01f8 */

} __packed __aligned(512);



struct kvm_s390_itdb {

	__u8	data[256];

};



struct sie_page {

	struct kvm_s390_sie_block sie_block;

	struct mcck_volatile_info mcck_info;	/* 0x0200 */

	__u8 reserved218[360];		/* 0x0218 */

	__u64 pv_grregs[16];		/* 0x0380 */

	__u8 reserved400[512];		/* 0x0400 */

	struct kvm_s390_itdb itdb;	/* 0x0600 */

	__u8 reserved700[2304];		/* 0x0700 */

};



struct kvm_vcpu_stat {

	struct kvm_vcpu_stat_generic generic;

	u64 exit_userspace;

arch/s390/include/asm/kvm_host_types.h

0 → 100644
+348 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */



#ifndef _ASM_KVM_HOST_TYPES_H

#define _ASM_KVM_HOST_TYPES_H



#include <linux/atomic.h>

#include <linux/types.h>



#define KVM_S390_BSCA_CPU_SLOTS 64

#define KVM_S390_ESCA_CPU_SLOTS 248



#define SIGP_CTRL_C		0x80

#define SIGP_CTRL_SCN_MASK	0x3f



union bsca_sigp_ctrl {

	__u8 value;

	struct {

		__u8 c : 1;

		__u8 r : 1;

		__u8 scn : 6;

	};

};



union esca_sigp_ctrl {

	__u16 value;

	struct {

		__u8 c : 1;

		__u8 reserved: 7;

		__u8 scn;

	};

};



struct esca_entry {

	union esca_sigp_ctrl sigp_ctrl;

	__u16	reserved1[3];

	__u64	sda;

	__u64	reserved2[6];

};



struct bsca_entry {

	__u8	reserved0;

	union bsca_sigp_ctrl	sigp_ctrl;

	__u16	reserved[3];

	__u64	sda;

	__u64	reserved2[2];

};



union ipte_control {

	unsigned long val;

	struct {

		unsigned long k  : 1;

		unsigned long kh : 31;

		unsigned long kg : 32;

	};

};



/*

 * Utility is defined as two bytes but having it four bytes wide

 * generates more efficient code. Since the following bytes are

 * reserved this makes no functional difference.

 */

union sca_utility {

	__u32 val;

	struct {

		__u32 mtcr : 1;

		__u32	   : 31;

	};

};



struct bsca_block {

	union ipte_control ipte_control;

	__u64	reserved[5];

	__u64	mcn;

	union sca_utility utility;

	__u8	reserved2[4];

	struct bsca_entry cpu[KVM_S390_BSCA_CPU_SLOTS];

};



struct esca_block {

	union ipte_control ipte_control;

	__u64	reserved1[6];

	union sca_utility utility;

	__u8	reserved2[4];

	__u64	mcn[4];

	__u64	reserved3[20];

	struct esca_entry cpu[KVM_S390_ESCA_CPU_SLOTS];

};



/*

 * This struct is used to store some machine check info from lowcore

 * for machine checks that happen while the guest is running.

 * This info in host's lowcore might be overwritten by a second machine

 * check from host when host is in the machine check's high-level handling.

 * The size is 24 bytes.

 */

struct mcck_volatile_info {

	__u64 mcic;

	__u64 failing_storage_address;

	__u32 ext_damage_code;

	__u32 reserved;

};



#define CR0_INITIAL_MASK (CR0_UNUSED_56 | CR0_INTERRUPT_KEY_SUBMASK | \

			  CR0_MEASUREMENT_ALERT_SUBMASK)

#define CR14_INITIAL_MASK (CR14_UNUSED_32 | CR14_UNUSED_33 | \

			   CR14_EXTERNAL_DAMAGE_SUBMASK)



#define SIDAD_SIZE_MASK		0xff

#define sida_addr(sie_block) phys_to_virt((sie_block)->sidad & PAGE_MASK)

#define sida_size(sie_block) \

	((((sie_block)->sidad & SIDAD_SIZE_MASK) + 1) * PAGE_SIZE)



#define CPUSTAT_STOPPED    0x80000000

#define CPUSTAT_WAIT	   0x10000000

#define CPUSTAT_ECALL_PEND 0x08000000

#define CPUSTAT_STOP_INT   0x04000000

#define CPUSTAT_IO_INT	   0x02000000

#define CPUSTAT_EXT_INT    0x01000000

#define CPUSTAT_RUNNING    0x00800000

#define CPUSTAT_RETAINED   0x00400000

#define CPUSTAT_TIMING_SUB 0x00020000

#define CPUSTAT_SIE_SUB    0x00010000

#define CPUSTAT_RRF	   0x00008000

#define CPUSTAT_SLSV	   0x00004000

#define CPUSTAT_SLSR	   0x00002000

#define CPUSTAT_ZARCH	   0x00000800

#define CPUSTAT_MCDS	   0x00000100

#define CPUSTAT_KSS	   0x00000200

#define CPUSTAT_SM	   0x00000080

#define CPUSTAT_IBS	   0x00000040

#define CPUSTAT_GED2	   0x00000010

#define CPUSTAT_G	   0x00000008

#define CPUSTAT_GED	   0x00000004

#define CPUSTAT_J	   0x00000002

#define CPUSTAT_P	   0x00000001



struct kvm_s390_sie_block {

	atomic_t cpuflags;		/* 0x0000 */

	__u32 : 1;			/* 0x0004 */

	__u32 prefix : 18;

	__u32 : 1;

	__u32 ibc : 12;

	__u8	reserved08[4];		/* 0x0008 */

#define PROG_IN_SIE (1<<0)

	__u32	prog0c;			/* 0x000c */

	union {

		__u8	reserved10[16];		/* 0x0010 */

		struct {

			__u64	pv_handle_cpu;

			__u64	pv_handle_config;

		};

	};

#define PROG_BLOCK_SIE	(1<<0)

#define PROG_REQUEST	(1<<1)

	atomic_t prog20;		/* 0x0020 */

	__u8	reserved24[4];		/* 0x0024 */

	__u64	cputm;			/* 0x0028 */

	__u64	ckc;			/* 0x0030 */

	__u64	epoch;			/* 0x0038 */

	__u32	svcc;			/* 0x0040 */

#define LCTL_CR0	0x8000

#define LCTL_CR6	0x0200

#define LCTL_CR9	0x0040

#define LCTL_CR10	0x0020

#define LCTL_CR11	0x0010

#define LCTL_CR14	0x0002

	__u16	lctl;			/* 0x0044 */

	__s16	icpua;			/* 0x0046 */

#define ICTL_OPEREXC	0x80000000

#define ICTL_PINT	0x20000000

#define ICTL_LPSW	0x00400000

#define ICTL_STCTL	0x00040000

#define ICTL_ISKE	0x00004000

#define ICTL_SSKE	0x00002000

#define ICTL_RRBE	0x00001000

#define ICTL_TPROT	0x00000200

	__u32	ictl;			/* 0x0048 */

#define ECA_CEI		0x80000000

#define ECA_IB		0x40000000

#define ECA_SIGPI	0x10000000

#define ECA_MVPGI	0x01000000

#define ECA_AIV		0x00200000

#define ECA_VX		0x00020000

#define ECA_PROTEXCI	0x00002000

#define ECA_APIE	0x00000008

#define ECA_SII		0x00000001

	__u32	eca;			/* 0x004c */

#define ICPT_INST	0x04

#define ICPT_PROGI	0x08

#define ICPT_INSTPROGI	0x0C

#define ICPT_EXTREQ	0x10

#define ICPT_EXTINT	0x14

#define ICPT_IOREQ	0x18

#define ICPT_WAIT	0x1c

#define ICPT_VALIDITY	0x20

#define ICPT_STOP	0x28

#define ICPT_OPEREXC	0x2C

#define ICPT_PARTEXEC	0x38

#define ICPT_IOINST	0x40

#define ICPT_KSS	0x5c

#define ICPT_MCHKREQ	0x60

#define ICPT_INT_ENABLE	0x64

#define ICPT_PV_INSTR	0x68

#define ICPT_PV_NOTIFY	0x6c

#define ICPT_PV_PREF	0x70

	__u8	icptcode;		/* 0x0050 */

	__u8	icptstatus;		/* 0x0051 */

	__u16	ihcpu;			/* 0x0052 */

	__u8	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

	__u8	iictl;			/* 0x0055 */

	__u16	ipa;			/* 0x0056 */

	__u32	ipb;			/* 0x0058 */

	__u32	scaoh;			/* 0x005c */

#define FPF_BPBC	0x20

	__u8	fpf;			/* 0x0060 */

#define ECB_GS		0x40

#define ECB_TE		0x10

#define ECB_SPECI	0x08

#define ECB_SRSI	0x04

#define ECB_HOSTPROTINT	0x02

#define ECB_PTF		0x01

	__u8	ecb;			/* 0x0061 */

#define ECB2_CMMA	0x80

#define ECB2_IEP	0x20

#define ECB2_PFMFI	0x08

#define ECB2_ESCA	0x04

#define ECB2_ZPCI_LSI	0x02

	__u8	ecb2;			/* 0x0062 */

#define ECB3_AISI	0x20

#define ECB3_AISII	0x10

#define ECB3_DEA 0x08

#define ECB3_AES 0x04

#define ECB3_RI  0x01

	__u8	ecb3;			/* 0x0063 */

#define ESCA_SCAOL_MASK ~0x3fU

	__u32	scaol;			/* 0x0064 */

	__u8	sdf;			/* 0x0068 */

	__u8	epdx;			/* 0x0069 */

	__u8	cpnc;			/* 0x006a */

	__u8	reserved6b;		/* 0x006b */

	__u32	todpr;			/* 0x006c */

#define GISA_FORMAT1 0x00000001

	__u32	gd;			/* 0x0070 */

	__u8	reserved74[12];		/* 0x0074 */

	__u64	mso;			/* 0x0080 */

	__u64	msl;			/* 0x0088 */

	psw_t	gpsw;			/* 0x0090 */

	__u64	gg14;			/* 0x00a0 */

	__u64	gg15;			/* 0x00a8 */

	__u8	reservedb0[8];		/* 0x00b0 */

#define HPID_KVM	0x4

#define HPID_VSIE	0x5

	__u8	hpid;			/* 0x00b8 */

	__u8	reservedb9[7];		/* 0x00b9 */

	union {

		struct {

			__u32	eiparams;	/* 0x00c0 */

			__u16	extcpuaddr;	/* 0x00c4 */

			__u16	eic;		/* 0x00c6 */

		};

		__u64	mcic;			/* 0x00c0 */

	} __packed;

	__u32	reservedc8;		/* 0x00c8 */

	union {

		struct {

			__u16	pgmilc;		/* 0x00cc */

			__u16	iprcc;		/* 0x00ce */

		};

		__u32	edc;			/* 0x00cc */

	} __packed;

	union {

		struct {

			__u32	dxc;		/* 0x00d0 */

			__u16	mcn;		/* 0x00d4 */

			__u8	perc;		/* 0x00d6 */

			__u8	peratmid;	/* 0x00d7 */

		};

		__u64	faddr;			/* 0x00d0 */

	} __packed;

	__u64	peraddr;		/* 0x00d8 */

	__u8	eai;			/* 0x00e0 */

	__u8	peraid;			/* 0x00e1 */

	__u8	oai;			/* 0x00e2 */

	__u8	armid;			/* 0x00e3 */

	__u8	reservede4[4];		/* 0x00e4 */

	union {

		__u64	tecmc;		/* 0x00e8 */

		struct {

			__u16	subchannel_id;	/* 0x00e8 */

			__u16	subchannel_nr;	/* 0x00ea */

			__u32	io_int_parm;	/* 0x00ec */

			__u32	io_int_word;	/* 0x00f0 */

		};

	} __packed;

	__u8	reservedf4[8];		/* 0x00f4 */

#define CRYCB_FORMAT_MASK 0x00000003

#define CRYCB_FORMAT0 0x00000000

#define CRYCB_FORMAT1 0x00000001

#define CRYCB_FORMAT2 0x00000003

	__u32	crycbd;			/* 0x00fc */

	__u64	gcr[16];		/* 0x0100 */

	union {

		__u64	gbea;		/* 0x0180 */

		__u64	sidad;

	};

	__u8	reserved188[8];		/* 0x0188 */

	__u64	sdnxo;			/* 0x0190 */

	__u8	reserved198[8];		/* 0x0198 */

	__u32	fac;			/* 0x01a0 */

	__u8	reserved1a4[20];	/* 0x01a4 */

	__u64	cbrlo;			/* 0x01b8 */

	__u8	reserved1c0[8];		/* 0x01c0 */

#define ECD_HOSTREGMGMT	0x20000000

#define ECD_MEF		0x08000000

#define ECD_ETOKENF	0x02000000

#define ECD_ECC		0x00200000

#define ECD_HMAC	0x00004000

	__u32	ecd;			/* 0x01c8 */

	__u8	reserved1cc[18];	/* 0x01cc */

	__u64	pp;			/* 0x01de */

	__u8	reserved1e6[2];		/* 0x01e6 */

	__u64	itdba;			/* 0x01e8 */

	__u64	riccbd;			/* 0x01f0 */

	__u64	gvrd;			/* 0x01f8 */

} __packed __aligned(512);



struct kvm_s390_itdb {

	__u8	data[256];

};



struct sie_page {

	struct kvm_s390_sie_block sie_block;

	struct mcck_volatile_info mcck_info;	/* 0x0200 */

	__u8 reserved218[360];		/* 0x0218 */

	__u64 pv_grregs[16];		/* 0x0380 */

	__u8 reserved400[512];		/* 0x0400 */

	struct kvm_s390_itdb itdb;	/* 0x0600 */

	__u8 reserved700[2304];		/* 0x0700 */

};



#endif /* _ASM_KVM_HOST_TYPES_H */