On 24/10/2019 13.40, Janosch Frank wrote:
> From: Michael Mueller <mimu@xxxxxxxxxxxxx>
>
> Define the interruption injection codes and the related fields in the
> sie control block for PVM interruption injection.
>
> Signed-off-by: Michael Mueller <mimu@xxxxxxxxxxxxx>
> ---
> arch/s390/include/asm/kvm_host.h | 25 +++++++++++++++++++++----
> 1 file changed, 21 insertions(+), 4 deletions(-)
>
> diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h
> index 6cc3b73ca904..82443236d4cc 100644
> --- a/arch/s390/include/asm/kvm_host.h
> +++ b/arch/s390/include/asm/kvm_host.h
> @@ -215,7 +215,15 @@ struct kvm_s390_sie_block {
> __u8 icptcode; /* 0x0050 */
> __u8 icptstatus; /* 0x0051 */
> __u16 ihcpu; /* 0x0052 */
> - __u8 reserved54[2]; /* 0x0054 */
> + __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 */
> @@ -252,7 +260,8 @@ struct kvm_s390_sie_block {
> #define HPID_KVM 0x4
> #define HPID_VSIE 0x5
> __u8 hpid; /* 0x00b8 */
> - __u8 reservedb9[11]; /* 0x00b9 */
> + __u8 reservedb9[7]; /* 0x00b9 */
> + __u32 eiparams; /* 0x00c0 */
> __u16 extcpuaddr; /* 0x00c4 */
> __u16 eic; /* 0x00c6 */
> __u32 reservedc8; /* 0x00c8 */
> @@ -268,8 +277,16 @@ struct kvm_s390_sie_block {
> __u8 oai; /* 0x00e2 */
> __u8 armid; /* 0x00e3 */
> __u8 reservede4[4]; /* 0x00e4 */
> - __u64 tecmc; /* 0x00e8 */
> - __u8 reservedf0[12]; /* 0x00f0 */
> + union {
> + __u64 tecmc; /* 0x00e8 */
I have to admit that I always have to think twice where the compiler
might put the padding in this case. Maybe you could do that manually to
make it obvious and wrap it in a struct, too:
struct {
__u64 tecmc; /* 0x00e8 */
__u8 reservedf0[4]; /* 0x00f0 */
};
?
Just my 0.02 €, though.
Thomas
> + 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
>
