From: Radim Krčmář <rkrcmar@redhat.com>
Date: Fri, 22 Jul 2016 18:27:26 +0000 (+0200)
Subject: Merge tag 'kvm-arm-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm... 
X-Git-Tag: Ubuntu-4.10.0-19.21~2858^2~16
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=912902ce78b0d48f717f9128e61fb9bffbd65f86;p=mirror_ubuntu-artful-kernel.git

Merge tag 'kvm-arm-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into next

KVM/ARM changes for Linux 4.8

- GICv3 ITS emulation
- Simpler idmap management that fixes potential TLB conflicts
- Honor the kernel protection in HYP mode
- Removal of the old vgic implementation
---

912902ce78b0d48f717f9128e61fb9bffbd65f86
diff --cc Documentation/virtual/kvm/api.txt
index 299306db5d84,07049eadb124..5237e1b2fd66
--- a/Documentation/virtual/kvm/api.txt
+++ b/Documentation/virtual/kvm/api.txt
@@@ -2195,15 -2175,19 +2195,23 @@@ struct kvm_msi 
  	__u32 address_hi;
  	__u32 data;
  	__u32 flags;
- 	__u8  pad[16];
+ 	__u32 devid;
+ 	__u8  pad[12];
  };
  
- No flags are defined so far. The corresponding field must be 0.
+ flags: KVM_MSI_VALID_DEVID: devid contains a valid value
+ devid: If KVM_MSI_VALID_DEVID is set, contains a unique device identifier
+        for the device that wrote the MSI message.
+        For PCI, this is usually a BFD identifier in the lower 16 bits.
+ 
+ The per-VM KVM_CAP_MSI_DEVID capability advertises the need to provide
+ the device ID. If this capability is not set, userland cannot rely on
+ the kernel to allow the KVM_MSI_VALID_DEVID flag being set.
  
 +On x86, address_hi is ignored unless the KVM_CAP_X2APIC_API capability is
 +enabled.  If it is enabled, address_hi bits 31-8 provide bits 31-8 of the
 +destination id.  Bits 7-0 of address_hi must be zero.
 +
  
  4.71 KVM_CREATE_PIT2
  
diff --cc include/uapi/linux/kvm.h
index 70941f4ab6d8,d8c4c324cfae..8f2756c263d4
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -866,8 -866,7 +866,9 @@@ struct kvm_ppc_smmu_info 
  #define KVM_CAP_ARM_PMU_V3 126
  #define KVM_CAP_VCPU_ATTRIBUTES 127
  #define KVM_CAP_MAX_VCPU_ID 128
 -#define KVM_CAP_MSI_DEVID 129
 +#define KVM_CAP_X2APIC_API 129
 +#define KVM_CAP_S390_USER_INSTR0 130
++#define KVM_CAP_MSI_DEVID 131
  
  #ifdef KVM_CAP_IRQ_ROUTING