5 files changed, 19 insertions, 21 deletions

diff --git a/arch/arm/kvm/Kconfig b/arch/arm/kvm/Kconfig
index bfb915d05665..356970f3b25e 100644
--- a/arch/arm/kvm/Kconfig
+++ b/arch/arm/kvm/Kconfig
@@ -21,6 +21,7 @@ config KVM
         depends on MMU && OF
         select PREEMPT_NOTIFIERS
         select ANON_INODES
+        select ARM_GIC
         select HAVE_KVM_CPU_RELAX_INTERCEPT
         select HAVE_KVM_ARCH_TLB_FLUSH_ALL
         select KVM_MMIO
@@ -45,15 +46,4 @@ config KVM_ARM_HOST
         ---help---
           Provides host support for ARM processors.
 
-config KVM_ARM_MAX_VCPUS
-        int "Number maximum supported virtual CPUs per VM"
-        depends on KVM_ARM_HOST
-        default 4
-        help
-          Static number of max supported virtual CPUs per VM.
-
-          If you choose a high number, the vcpu structures will be quite
-          large, so only choose a reasonable number that you expect to
-          actually use.
-
 endif # VIRTUALIZATION
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index ce404a5c3062..78b286994577 100644
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -446,7 +446,7 @@ static int kvm_vcpu_first_run_init(struct kvm_vcpu *vcpu)
          * Map the VGIC hardware resources before running a vcpu the first
          * time on this VM.
          */
-        if (unlikely(!vgic_ready(kvm))) {
+        if (unlikely(irqchip_in_kernel(kvm) && !vgic_ready(kvm))) {
                 ret = kvm_vgic_map_resources(kvm);
                 if (ret)
                         return ret;
@@ -1080,7 +1080,7 @@ static int init_hyp_mode(void)
          */
         err = kvm_timer_hyp_init();
         if (err)
-                goto out_free_mappings;
+                goto out_free_context;
 
 #ifndef CONFIG_HOTPLUG_CPU
         free_boot_hyp_pgd();
diff --git a/arch/arm/kvm/interrupts_head.S b/arch/arm/kvm/interrupts_head.S
index 702740d37465..51a59504bef4 100644
--- a/arch/arm/kvm/interrupts_head.S
+++ b/arch/arm/kvm/interrupts_head.S
@@ -515,8 +515,7 @@ ARM_BE8(rev	r6, r6  )
 
         mrc     p15, 0, r2, c14, c3, 1  @ CNTV_CTL
         str     r2, [vcpu, #VCPU_TIMER_CNTV_CTL]
-        bic     r2, #1                  @ Clear ENABLE
-        mcr     p15, 0, r2, c14, c3, 1  @ CNTV_CTL
+
         isb
 
         mrrc    p15, 3, rr_lo_hi(r2, r3), c14   @ CNTV_CVAL
@@ -529,6 +528,9 @@ ARM_BE8(rev	r6, r6  )
         mcrr    p15, 4, r2, r2, c14     @ CNTVOFF
 
 1:
+        mov     r2, #0                  @ Clear ENABLE
+        mcr     p15, 0, r2, c14, c3, 1  @ CNTV_CTL
+
         @ Allow physical timer/counter access for the host
         mrc     p15, 4, r2, c14, c1, 0  @ CNTHCTL
         orr     r2, r2, #(CNTHCTL_PL1PCEN | CNTHCTL_PL1PCTEN)
diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c
index 7b4201294187..6984342da13d 100644
--- a/arch/arm/kvm/mmu.c
+++ b/arch/arm/kvm/mmu.c
@@ -1792,8 +1792,10 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm,
                 if (vma->vm_flags & VM_PFNMAP) {
                         gpa_t gpa = mem->guest_phys_addr +
                                     (vm_start - mem->userspace_addr);
-                        phys_addr_t pa = (vma->vm_pgoff << PAGE_SHIFT) +
-                                         vm_start - vma->vm_start;
+                        phys_addr_t pa;
+
+                        pa = (phys_addr_t)vma->vm_pgoff << PAGE_SHIFT;
+                        pa += vm_start - vma->vm_start;
 
                         /* IO region dirty page logging not allowed */
                         if (memslot->flags & KVM_MEM_LOG_DIRTY_PAGES)
diff --git a/arch/arm/kvm/psci.c b/arch/arm/kvm/psci.c
index 4b94b513168d..ad6f6424f1d1 100644
--- a/arch/arm/kvm/psci.c
+++ b/arch/arm/kvm/psci.c
@@ -126,7 +126,7 @@ static unsigned long kvm_psci_vcpu_on(struct kvm_vcpu *source_vcpu)
 
 static unsigned long kvm_psci_vcpu_affinity_info(struct kvm_vcpu *vcpu)
 {
-        int i;
+        int i, matching_cpus = 0;
         unsigned long mpidr;
         unsigned long target_affinity;
         unsigned long target_affinity_mask;
@@ -151,12 +151,16 @@ static unsigned long kvm_psci_vcpu_affinity_info(struct kvm_vcpu *vcpu)
          */
         kvm_for_each_vcpu(i, tmp, kvm) {
                 mpidr = kvm_vcpu_get_mpidr_aff(tmp);
-                if (((mpidr & target_affinity_mask) == target_affinity) &&
-                    !tmp->arch.pause) {
-                        return PSCI_0_2_AFFINITY_LEVEL_ON;
+                if ((mpidr & target_affinity_mask) == target_affinity) {
+                        matching_cpus++;
+                        if (!tmp->arch.pause)
+                                return PSCI_0_2_AFFINITY_LEVEL_ON;
                 }
         }
 
+        if (!matching_cpus)
+                return PSCI_RET_INVALID_PARAMS;
+
         return PSCI_0_2_AFFINITY_LEVEL_OFF;
 }