aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Evans <matt.evans@arm.com>2016-05-16 13:54:56 +0100
committerChristoffer Dall <christoffer.dall@linaro.org>2016-05-20 15:39:36 +0200
commite4fe9e7dc3828bf6a5714eb3c55aef6260d823a2 (patch)
treef0f62a65627b1ecce3c389a54d435e036dc88e86
parent06485053244480f5f403d8f89b8617bd7d549113 (diff)
downloadlinux-stericsson-e4fe9e7dc3828bf6a5714eb3c55aef6260d823a2.tar.gz
kvm: arm64: Fix EC field in inject_abt64
The EC field of the constructed ESR is conditionally modified by ORing in ESR_ELx_EC_DABT_LOW for a data abort. However, ESR_ELx_EC_SHIFT is missing from this condition. Signed-off-by: Matt Evans <matt.evans@arm.com> Acked-by: Marc Zyngier <marc.zyngier@arm.com> Cc: <stable@vger.kernel.org> Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
-rw-r--r--arch/arm64/kvm/inject_fault.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kvm/inject_fault.c b/arch/arm64/kvm/inject_fault.c
index 4d1ac81870d2..e9e0e6db73f6 100644
--- a/arch/arm64/kvm/inject_fault.c
+++ b/arch/arm64/kvm/inject_fault.c
@@ -162,7 +162,7 @@ static void inject_abt64(struct kvm_vcpu *vcpu, bool is_iabt, unsigned long addr
esr |= (ESR_ELx_EC_IABT_CUR << ESR_ELx_EC_SHIFT);
if (!is_iabt)
- esr |= ESR_ELx_EC_DABT_LOW;
+ esr |= ESR_ELx_EC_DABT_LOW << ESR_ELx_EC_SHIFT;
vcpu_sys_reg(vcpu, ESR_EL1) = esr | ESR_ELx_FSC_EXTABT;
}