Merge remote-tracking branch 'origin/kvm-arm64/psci-relay' into kvmarm-master/next

Signed-off-by: Marc Zyngier <maz@kernel.org>

diff --cc arch/arm64/include/asm/cpucaps.h
Simple merge

diff --cc arch/arm64/include/asm/cpufeature.h
Simple merge

diff --cc arch/arm64/include/asm/kvm_asm.h
Simple merge

diff --cc arch/arm64/include/asm/kvm_host.h
Simple merge

diff --cc arch/arm64/include/asm/kvm_mmu.h
Simple merge

diff --cc arch/arm64/include/asm/sysreg.h
Simple merge

diff --cc arch/arm64/kernel/cpufeature.c
Simple merge

diff --cc arch/arm64/kernel/process.c
Simple merge

diff --cc arch/arm64/kernel/proton-pack.c
index fca0364,6809b55..902e408
--- 1/arch/arm64/kernel/proton-pack.c
--- 2/arch/arm64/kernel/proton-pack.c
+++ b/arch/arm64/kernel/proton-pack.c
@@@ -24,9 -24,9 +24,10 @@@
  #include <linux/prctl.h>
  #include <linux/sched/task_stack.h>
  
+ #include <asm/insn.h>
  #include <asm/spectre.h>
  #include <asm/traps.h>
 +#include <asm/virt.h>
  
  /*
   * We try to ensure that the mitigation state can never change as the result of

diff --cc arch/arm64/kvm/arm.c
index 7e86207,fadcc94..6e637d2
--- 1/arch/arm64/kvm/arm.c
--- 2/arch/arm64/kvm/arm.c
+++ b/arch/arm64/kvm/arm.c
@@@ -1603,10 -1589,11 +1667,11 @@@ static int init_subsystems(void
                goto out;
  
        kvm_perf_init();
 -      kvm_coproc_table_init();
 +      kvm_sys_reg_table_init();
  
  out:
-       on_each_cpu(_kvm_arch_hardware_disable, NULL, 1);
+       if (err || !is_protected_kvm_enabled())
+               on_each_cpu(_kvm_arch_hardware_disable, NULL, 1);
  
        return err;
  }

diff --cc arch/arm64/kvm/hyp/nvhe/Makefile
index 77b8c4e,bf62c8e..1f1e351
--- 1/arch/arm64/kvm/hyp/nvhe/Makefile
--- 2/arch/arm64/kvm/hyp/nvhe/Makefile
+++ b/arch/arm64/kvm/hyp/nvhe/Makefile
@@@ -6,9 -6,10 +6,10 @@@
  asflags-y := -D__KVM_NVHE_HYPERVISOR__
  ccflags-y := -D__KVM_NVHE_HYPERVISOR__
  
- obj-y := timer-sr.o sysreg-sr.o debug-sr.o switch.o tlb.o hyp-init.o host.o hyp-main.o
+ obj-y := timer-sr.o sysreg-sr.o debug-sr.o switch.o tlb.o hyp-init.o host.o \
+        hyp-main.o hyp-smp.o psci-relay.o
  obj-y += ../vgic-v3-sr.o ../aarch32.o ../vgic-v2-cpuif-proxy.o ../entry.o \
 -       ../fpsimd.o ../hyp-entry.o
 +       ../fpsimd.o ../hyp-entry.o ../exception.o
  
  ##
  ## Build rules for compiling nVHE hyp code

diff --cc arch/arm64/kvm/hyp/nvhe/switch.c
Simple merge

diff --cc arch/arm64/kvm/va_layout.c
Simple merge