A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-30 03:27:44 -04:00
Code Issues Projects Releases Packages Wiki Activity

arm/arm64: KVM: Turn kvm_psci_version into a static inline

Browse source 
We're about to need kvm_psci_version in HYP too. So let's turn it
into a static inline, and pass the kvm structure as a second
parameter (so that HYP can do a kern_hyp_va on it).

Tested-by: Ard Biesheuvel <[email protected]>
Reviewed-by: Christoffer Dall <[email protected]>
Signed-off-by: Marc Zyngier <[email protected]>
Signed-off-by: Catalin Marinas <[email protected]>
This commit is contained in:
Marc Zyngier 2018-02-06 17:56:13 +00:00 • committed by Catalin Marinas
commit a4097b3511
3 changed files with 34 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

18
arch/arm64/kvm/hyp/switch.c
View file

@ -19,6 +19,8 @@
#include <linux/jump_label.h>
#include <uapi/linux/psci.h>
#include <kvm/arm_psci.h>
#include <asm/kvm_asm.h>
#include <asm/kvm_emulate.h>
#include <asm/kvm_hyp.h>
@ -350,14 +352,16 @@ again:
if (exit_code == ARM_EXCEPTION_TRAP &&
(kvm_vcpu_trap_get_class(vcpu) == ESR_ELx_EC_HVC64 ||
kvm_vcpu_trap_get_class(vcpu) == ESR_ELx_EC_HVC32) &&
vcpu_get_reg(vcpu, 0) == PSCI_0_2_FN_PSCI_VERSION) {
u64 val = PSCI_RET_NOT_SUPPORTED;
if (test_bit(KVM_ARM_VCPU_PSCI_0_2, vcpu->arch.features))
val = 2;
kvm_vcpu_trap_get_class(vcpu) == ESR_ELx_EC_HVC32)) {
u32 val = vcpu_get_reg(vcpu, 0);
vcpu_set_reg(vcpu, 0, val);
goto again;
if (val == PSCI_0_2_FN_PSCI_VERSION) {
val = kvm_psci_version(vcpu, kern_hyp_va(vcpu->kvm));
if (unlikely(val == KVM_ARM_PSCI_0_1))
val = PSCI_RET_NOT_SUPPORTED;
vcpu_set_reg(vcpu, 0, val);
goto again;
}
}
if (static_branch_unlikely(&vgic_v2_cpuif_trap) &&