On 27/09/2018 00:54, Tony Krowiak wrote:
> Updates the linux header files in preparation for introduction
> of the VFIO AP device:
>
> * Added a feature ID to indicate AP facilities are installed
>
> * 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 <akrow...@linux.ibm.com>
> ---
> linux-headers/asm-s390/kvm.h | 3 +++
> linux-headers/linux/vfio.h | 2 ++
> 2 files changed, 5 insertions(+)
>
> diff --git a/linux-headers/asm-s390/kvm.h b/linux-headers/asm-s390/kvm.h
> index 1ab9901911bf..b4948706468e 100644
> --- a/linux-headers/asm-s390/kvm.h
> +++ b/linux-headers/asm-s390/kvm.h
> @@ -130,6 +130,7 @@ struct kvm_s390_vm_cpu_machine {
> #define KVM_S390_VM_CPU_FEAT_PFMFI 11
> #define KVM_S390_VM_CPU_FEAT_SIGPIF 12
> #define KVM_S390_VM_CPU_FEAT_KSS 13
> +#define KVM_S390_VM_CPU_FEAT_AP 14
Guess that's a leftover. But should be fixed automatically by proper
header sync later.
> struct kvm_s390_vm_cpu_feat {
> __u64 feat[16];
> };
> @@ -160,6 +161,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,
>
--
Thanks,
David / dhildenb
