Commit 12849bad authored by Fuad Tabba's avatar Fuad Tabba Committed by Marc Zyngier

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

__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: default avatarFuad Tabba <tabba@google.com>
Acked-by: default avatarWill Deacon <will@kernel.org>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20210817081134.2918285-8-tabba@google.com
parent 1460b4b2
...@@ -90,10 +90,6 @@ static void __deactivate_traps(struct kvm_vcpu *vcpu) ...@@ -90,10 +90,6 @@ static void __deactivate_traps(struct kvm_vcpu *vcpu)
isb(); 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); __deactivate_traps_common(vcpu);
write_sysreg(this_cpu_ptr(&kvm_init_params)->hcr_el2, hcr_el2); write_sysreg(this_cpu_ptr(&kvm_init_params)->hcr_el2, hcr_el2);
......
...@@ -93,10 +93,6 @@ void activate_traps_vhe_load(struct kvm_vcpu *vcpu) ...@@ -93,10 +93,6 @@ void activate_traps_vhe_load(struct kvm_vcpu *vcpu)
void deactivate_traps_vhe_put(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); __deactivate_traps_common(vcpu);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment