moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "ANDROID: KVM: arm64: Move vgic state between host and shadow vcpu structures"

Browse Source 
This reverts commit 9dc084e269.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I711af7b1c67f7d415517dd1a6e35ae7dbd1ae474
This commit is contained in:
Will Deacon
2022-07-07 15:51:37 +01:00
parent 6c8d7e0937
commit 8390b3b63d
2 changed files with 4 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm64/kvm/vgic/vgic-v3.c
View File

@@ -707,8 +707,7 @@ void vgic_v3_load(struct kvm_vcpu *vcpu)
{
struct vgic_v3_cpu_if *cpu_if = &vcpu->arch.vgic_cpu.vgic_v3;
if (likely(!is_protected_kvm_enabled()))
kvm_call_hyp(__vgic_v3_restore_vmcr_aprs, cpu_if);
kvm_call_hyp(__vgic_v3_restore_vmcr_aprs, cpu_if);
if (has_vhe())
__vgic_v3_activate_traps(cpu_if);
@@ -722,8 +721,7 @@ void vgic_v3_put(struct kvm_vcpu *vcpu, bool blocking)
WARN_ON(vgic_v4_put(vcpu, blocking));
if (likely(!is_protected_kvm_enabled()))
kvm_call_hyp(__vgic_v3_save_vmcr_aprs, cpu_if);
kvm_call_hyp(__vgic_v3_save_vmcr_aprs, cpu_if);
if (has_vhe())
__vgic_v3_deactivate_traps(cpu_if);