| Message ID | 20181009175226.22138-2-akrowiak@linux.vnet.ibm.com |
|---|---|
| State | New |
| Headers | show |
| Series | s390x: vfio-ap: guest dedicated crypto adapters | expand |
On Tue, 9 Oct 2018 13:52:21 -0400 Tony Krowiak <akrowiak@linux.vnet.ibm.com> wrote: > Updates the linux header files in preparation for introduction > of the VFIO AP device: > > * Added device attributes to the KVM_S390_VM_CRYPTO group > to indicate whether AP instructions are to be interpreted > > * Added VFIO device information for AP devices > > Signed-off-by: Tony Krowiak <akrowiak@linux.ibm.com> > --- > linux-headers/asm-s390/kvm.h | 2 ++ > linux-headers/linux/vfio.h | 2 ++ > 2 files changed, 4 insertions(+) The needed changes are all in kvm/next, and we're near the next Linux merge window, so I'll just replace this one with a proper header sync against kvm/next.
diff --git a/linux-headers/asm-s390/kvm.h b/linux-headers/asm-s390/kvm.h index 1ab9901911bf..0265482f8fdf 100644 --- a/linux-headers/asm-s390/kvm.h +++ b/linux-headers/asm-s390/kvm.h @@ -160,6 +160,8 @@ struct kvm_s390_vm_cpu_subfunc { #define KVM_S390_VM_CRYPTO_ENABLE_DEA_KW 1 #define KVM_S390_VM_CRYPTO_DISABLE_AES_KW 2 #define KVM_S390_VM_CRYPTO_DISABLE_DEA_KW 3 +#define KVM_S390_VM_CRYPTO_ENABLE_APIE 4 +#define KVM_S390_VM_CRYPTO_DISABLE_APIE 5 /* kvm attributes for migration mode */ #define KVM_S390_VM_MIGRATION_STOP 0 diff --git a/linux-headers/linux/vfio.h b/linux-headers/linux/vfio.h index 3615a269d378..838919a4c03a 100644 --- a/linux-headers/linux/vfio.h +++ b/linux-headers/linux/vfio.h @@ -200,6 +200,7 @@ struct vfio_device_info { #define VFIO_DEVICE_FLAGS_PLATFORM (1 << 2) /* vfio-platform device */ #define VFIO_DEVICE_FLAGS_AMBA (1 << 3) /* vfio-amba device */ #define VFIO_DEVICE_FLAGS_CCW (1 << 4) /* vfio-ccw device */ +#define VFIO_DEVICE_FLAGS_AP (1 << 5) /* vfio-ap device */ __u32 num_regions; /* Max region index + 1 */ __u32 num_irqs; /* Max IRQ index + 1 */ }; @@ -215,6 +216,7 @@ struct vfio_device_info { #define VFIO_DEVICE_API_PLATFORM_STRING "vfio-platform" #define VFIO_DEVICE_API_AMBA_STRING "vfio-amba" #define VFIO_DEVICE_API_CCW_STRING "vfio-ccw" +#define VFIO_DEVICE_API_AP_STRING "vfio-ap" /** * VFIO_DEVICE_GET_REGION_INFO - _IOWR(VFIO_TYPE, VFIO_BASE + 8,
Updates the linux header files in preparation for introduction of the VFIO AP device: * Added device attributes to the KVM_S390_VM_CRYPTO group to indicate whether AP instructions are to be interpreted * Added VFIO device information for AP devices Signed-off-by: Tony Krowiak <akrowiak@linux.ibm.com> --- linux-headers/asm-s390/kvm.h | 2 ++ linux-headers/linux/vfio.h | 2 ++ 2 files changed, 4 insertions(+)