MIRRORS/linux-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/linux-imx.git synced 2025-07-11 20:05:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

ANDROID: KVM: arm64: move __activate_traps_hfgxtr out of __activate_traps_common

Browse Source 
In future patches, this function isn't going to be used for
protected VMs. Therefore, move it out of the common function so
that in can be selectively called in future patches.

No functional change intended.

Bug: 278749606
Change-Id: If48c299240602a43367b5a0cb49fb6ec73629b30
Signed-off-by: Fuad Tabba <tabba@google.com>
This commit is contained in:
Fuad Tabba 2023-12-12 13:06:53 +00:00
parent 96aa0305c4
commit bcbca2e57f
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm64/kvm/hyp/include/hyp/switch.h
View File

@ -235,8 +235,6 @@ static inline void __activate_traps_common(struct kvm_vcpu *vcpu)
write_sysreg_s(hcrx, SYS_HCRX_EL2);
}
__activate_traps_hfgxtr(vcpu);
}
static inline void __deactivate_traps_common(struct kvm_vcpu *vcpu)

1
arch/arm64/kvm/hyp/nvhe/switch.c
View File

@ -43,6 +43,7 @@ static void __activate_traps(struct kvm_vcpu *vcpu)
___activate_traps(vcpu);
__activate_traps_common(vcpu);
__activate_traps_hfgxtr(vcpu);
val = vcpu->arch.cptr_el2;
val |= CPTR_EL2_TAM; /* Same bit irrespective of E2H */

1
arch/arm64/kvm/hyp/vhe/switch.c
View File

@ -148,6 +148,7 @@ void activate_traps_vhe_load(struct kvm_vcpu *vcpu)
local_irq_save(flags);
__activate_traps_common(vcpu);
__activate_traps_hfgxtr(vcpu);
local_irq_restore(flags);
}