KVM: s390/CPACF: Choose crypto control block format

We need to specify a different format for the crypto control block
depending on whether the APXA facility is installed or not. Let's
test for it by executing the PQAP(QCI) function and use either a
format-1 or a format-2 crypto control block accordingly. This is a
host only change for z13 and does not affect the guest view.

Signed-off-by: Tony Krowiak <akrowiak@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>

1 files changed, 2 insertions, 0 deletions

diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h
index f79058e3fd98..77ae01444e98 100644
--- a/arch/s390/include/asm/kvm_host.h
+++ b/arch/s390/include/asm/kvm_host.h
@@ -163,6 +163,7 @@ struct kvm_s390_sie_block {
         __u64   tecmc;                  /* 0x00e8 */
         __u8    reservedf0[12];         /* 0x00f0 */
 #define CRYCB_FORMAT1 0x00000001
+#define CRYCB_FORMAT2 0x00000003
         __u32   crycbd;                 /* 0x00fc */
         __u64   gcr[16];                /* 0x0100 */
         __u64   gbea;                   /* 0x0180 */
@@ -516,6 +517,7 @@ struct kvm_s390_crypto_cb {
         __u8    reserved00[72];                 /* 0x0000 */
         __u8    dea_wrapping_key_mask[24];      /* 0x0048 */
         __u8    aes_wrapping_key_mask[32];      /* 0x0060 */
+        __u8    reserved80[128];                /* 0x0080 */
 };
 
 struct kvm_arch{