From: Marc Zyngier <maz@kernel.org>
Date: Wed, 9 Dec 2020 10:00:24 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/kvm-arm64/psci-relay' into kvmarm-master/next
X-Git-Tag: v5.11-rc1~50^2~1^2
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/3a514592b698588326924625b6948a10c35fadd5

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

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

3a514592b698588326924625b6948a10c35fadd5
diff --cc arch/arm64/kernel/proton-pack.c
index fca03648e270,6809b556538f..902e4084c477
--- a/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 7e86207fa2fc,fadcc94931f9..6e637d2b4cfb
--- a/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 77b8c4e06f2f,bf62c8e42ab2..1f1e351c5fe2
--- a/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