From: Marc Zyngier <maz@kernel.org>
Date: Tue, 13 Apr 2021 14:35:58 +0000 (+0100)
Subject: Merge branch 'kvm-arm64/misc-5.13' into kvmarm-master/next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ad569b70aa02ffba1e86411b79570cbe4e6c7bb8;p=linux.git

Merge branch 'kvm-arm64/misc-5.13' into kvmarm-master/next

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

ad569b70aa02ffba1e86411b79570cbe4e6c7bb8
diff --cc arch/arm64/kvm/arm.c
index 3f98dbe095003,85261015ce5d7..74acc4444d487
--- a/arch/arm64/kvm/arm.c
+++ b/arch/arm64/kvm/arm.c
@@@ -1881,18 -1808,12 +1881,20 @@@ static int init_hyp_mode(void
  	if (is_protected_kvm_enabled()) {
  		init_cpu_logical_map();
  
- 		if (!init_psci_relay())
+ 		if (!init_psci_relay()) {
+ 			err = -ENODEV;
  			goto out_err;
+ 		}
  	}
  
 +	if (is_protected_kvm_enabled()) {
 +		err = kvm_hyp_init_protection(hyp_va_bits);
 +		if (err) {
 +			kvm_err("Failed to init hyp memory protection\n");
 +			goto out_err;
 +		}
 +	}
 +
  	return 0;
  
  out_err: