shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

UPSTREAM: KVM: arm64: Keep mdcr_el2's value as set by __init_el2_debug

Browse Source 
__init_el2_debug configures mdcr_el2 at initialization based on,
among other things, available hardware support. Trap deactivation
doesn't check that, so keep the initial value.

No functional change intended.

Signed-off-by: Fuad Tabba <tabba@google.com>
Acked-by: Will Deacon <will@kernel.org>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20210817081134.2918285-8-tabba@google.com
(cherry picked from commit 12849badc6)
Signed-off-by: Will Deacon <willdeacon@google.com>
Bug: 198418208
Change-Id: I8c242118f090e0dc284575ca60d14275825f3daa
This commit is contained in:
Fuad Tabba
2021-08-17 09:11:26 +01:00
committed by Will Deacon
parent 6a5ec9b956
commit 5527a977ae
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,10 +90,6 @@ static void __deactivate_traps(struct kvm_vcpu *vcpu)
isb();
}
vcpu->arch.mdcr_el2_host &= MDCR_EL2_HPMN_MASK |
MDCR_EL2_E2PB_MASK << MDCR_EL2_E2PB_SHIFT |
MDCR_EL2_E2TB_MASK << MDCR_EL2_E2TB_SHIFT;
__deactivate_traps_common(vcpu);
write_sysreg(this_cpu_ptr(&kvm_init_params)->hcr_el2, hcr_el2);

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

@@ -93,10 +93,6 @@ void activate_traps_vhe_load(struct kvm_vcpu *vcpu)
void deactivate_traps_vhe_put(struct kvm_vcpu *vcpu)
{
vcpu->arch.mdcr_el2_host &= MDCR_EL2_HPMN_MASK |
MDCR_EL2_E2PB_MASK << MDCR_EL2_E2PB_SHIFT |
MDCR_EL2_TPMS;
__deactivate_traps_common(vcpu);
}