Merge tag 'kvm-arm-for-v4.12-round2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD

Second round of KVM/ARM Changes for v4.12.

Changes include:
 - A fix related to the 32-bit idmap stub
 - A fix to the bitmask used to deode the operands of an AArch32 CP
   instruction
 - We have moved the files shared between arch/arm/kvm and
   arch/arm64/kvm to virt/kvm/arm
 - We add support for saving/restoring the virtual ITS state to
   userspace

3 files changed, 29 insertions, 1 deletions

diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h
index 581a59ea7e34..97b8d3728b31 100644
--- a/include/kvm/arm_vgic.h
+++ b/include/kvm/arm_vgic.h
@@ -148,7 +148,6 @@ struct vgic_its {
         gpa_t                   vgic_its_base;
 
         bool                    enabled;
-        bool                    initialized;
         struct vgic_io_device   iodev;
         struct kvm_device       *dev;
 
@@ -162,6 +161,9 @@ struct vgic_its {
         u32                     creadr;
         u32                     cwriter;
 
+        /* migration ABI revision in use */
+        u32                     abi_rev;
+
         /* Protects the device and collection lists */
         struct mutex            its_lock;
         struct list_head        device_list;
@@ -283,6 +285,7 @@ extern struct static_key_false vgic_v2_cpuif_trap;
 
 int kvm_vgic_addr(struct kvm *kvm, unsigned long type, u64 *addr, bool write);
 void kvm_vgic_early_init(struct kvm *kvm);
+int kvm_vgic_vcpu_init(struct kvm_vcpu *vcpu);
 int kvm_vgic_create(struct kvm *kvm, u32 type);
 void kvm_vgic_destroy(struct kvm *kvm);
 void kvm_vgic_vcpu_early_init(struct kvm_vcpu *vcpu);
diff --git a/include/linux/irqchip/arm-gic-v3.h b/include/linux/irqchip/arm-gic-v3.h
index 97cbca19430d..fffb91202bc9 100644
--- a/include/linux/irqchip/arm-gic-v3.h
+++ b/include/linux/irqchip/arm-gic-v3.h
@@ -132,6 +132,9 @@
 #define GIC_BASER_SHAREABILITY(reg, type)                               \
         (GIC_BASER_##type << reg##_SHAREABILITY_SHIFT)
 
+/* encode a size field of width @w containing @n - 1 units */
+#define GIC_ENCODE_SZ(n, w) (((unsigned long)(n) - 1) & GENMASK_ULL(((w) - 1), 0))
+
 #define GICR_PROPBASER_SHAREABILITY_SHIFT               (10)
 #define GICR_PROPBASER_INNER_CACHEABILITY_SHIFT         (7)
 #define GICR_PROPBASER_OUTER_CACHEABILITY_SHIFT         (56)
@@ -156,6 +159,8 @@
 #define GICR_PROPBASER_RaWaWb   GIC_BASER_CACHEABILITY(GICR_PROPBASER, INNER, RaWaWb)
 
 #define GICR_PROPBASER_IDBITS_MASK                      (0x1f)
+#define GICR_PROPBASER_ADDRESS(x)       ((x) & GENMASK_ULL(51, 12))
+#define GICR_PENDBASER_ADDRESS(x)       ((x) & GENMASK_ULL(51, 16))
 
 #define GICR_PENDBASER_SHAREABILITY_SHIFT               (10)
 #define GICR_PENDBASER_INNER_CACHEABILITY_SHIFT         (7)
@@ -232,12 +237,18 @@
 #define GITS_CTLR_QUIESCENT             (1U << 31)
 
 #define GITS_TYPER_PLPIS                (1UL << 0)
+#define GITS_TYPER_ITT_ENTRY_SIZE_SHIFT 4
 #define GITS_TYPER_IDBITS_SHIFT         8
 #define GITS_TYPER_DEVBITS_SHIFT        13
 #define GITS_TYPER_DEVBITS(r)           ((((r) >> GITS_TYPER_DEVBITS_SHIFT) & 0x1f) + 1)
 #define GITS_TYPER_PTA                  (1UL << 19)
 #define GITS_TYPER_HWCOLLCNT_SHIFT      24
 
+#define GITS_IIDR_REV_SHIFT             12
+#define GITS_IIDR_REV_MASK              (0xf << GITS_IIDR_REV_SHIFT)
+#define GITS_IIDR_REV(r)                (((r) >> GITS_IIDR_REV_SHIFT) & 0xf)
+#define GITS_IIDR_PRODUCTID_SHIFT       24
+
 #define GITS_CBASER_VALID                       (1ULL << 63)
 #define GITS_CBASER_SHAREABILITY_SHIFT          (10)
 #define GITS_CBASER_INNER_CACHEABILITY_SHIFT    (59)
@@ -290,6 +301,7 @@
 #define GITS_BASER_TYPE(r)              (((r) >> GITS_BASER_TYPE_SHIFT) & 7)
 #define GITS_BASER_ENTRY_SIZE_SHIFT             (48)
 #define GITS_BASER_ENTRY_SIZE(r)        ((((r) >> GITS_BASER_ENTRY_SIZE_SHIFT) & 0x1f) + 1)
+#define GITS_BASER_ENTRY_SIZE_MASK      GENMASK_ULL(52, 48)
 #define GITS_BASER_SHAREABILITY_SHIFT   (10)
 #define GITS_BASER_InnerShareable                                       \
         GIC_BASER_SHAREABILITY(GITS_BASER, InnerShareable)
@@ -337,9 +349,11 @@
 #define E_ITS_INT_UNMAPPED_INTERRUPT            0x010307
 #define E_ITS_CLEAR_UNMAPPED_INTERRUPT          0x010507
 #define E_ITS_MAPD_DEVICE_OOR                   0x010801
+#define E_ITS_MAPD_ITTSIZE_OOR                  0x010802
 #define E_ITS_MAPC_PROCNUM_OOR                  0x010902
 #define E_ITS_MAPC_COLLECTION_OOR               0x010903
 #define E_ITS_MAPTI_UNMAPPED_DEVICE             0x010a04
+#define E_ITS_MAPTI_ID_OOR                      0x010a05
 #define E_ITS_MAPTI_PHYSICALID_OOR              0x010a06
 #define E_ITS_INV_UNMAPPED_INTERRUPT            0x010c07
 #define E_ITS_INVALL_UNMAPPED_COLLECTION        0x010d09
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 4f12fb6b01de..9ff201b63512 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -499,6 +499,17 @@ static inline struct kvm_vcpu *kvm_get_vcpu_by_id(struct kvm *kvm, int id)
         return NULL;
 }
 
+static inline int kvm_vcpu_get_idx(struct kvm_vcpu *vcpu)
+{
+        struct kvm_vcpu *tmp;
+        int idx;
+
+        kvm_for_each_vcpu(idx, tmp, vcpu->kvm)
+                if (tmp == vcpu)
+                        return idx;
+        BUG();
+}
+
 #define kvm_for_each_memslot(memslot, slots)    \
         for (memslot = &slots->memslots[0];     \
               memslot < slots->memslots + KVM_MEM_SLOTS_NUM && memslot->npages;\