summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoffer Dall <christoffer.dall@linaro.org>2017-12-03 23:54:41 +0100
committerChristoffer Dall <christoffer.dall@linaro.org>2017-12-04 14:25:33 +0100
commitfc396e066318c0a02208c1d3f0b62950a7714999 (patch)
treecd64b6978477f80493dcd64cd2ddadbc584b944b
parent6b2ad81bcfedaf36ceb8e6e71a58ad4ebd716313 (diff)
downloadlinux-stable-fc396e066318c0a02208c1d3f0b62950a7714999.tar.gz
linux-stable-fc396e066318c0a02208c1d3f0b62950a7714999.tar.bz2
linux-stable-fc396e066318c0a02208c1d3f0b62950a7714999.zip
KVM: arm/arm64: Fix broken GICH_ELRSR big endian conversion
We are incorrectly rearranging 32-bit words inside a 64-bit typed value for big endian systems, which would result in never marking a virtual interrupt as inactive on big endian systems (assuming 32 or fewer LRs on the hardware). Fix this by not doing any word order manipulation for the typed values. Cc: <stable@vger.kernel.org> Acked-by: Christoffer Dall <christoffer.dall@linaro.org> Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
-rw-r--r--virt/kvm/arm/hyp/vgic-v2-sr.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/virt/kvm/arm/hyp/vgic-v2-sr.c b/virt/kvm/arm/hyp/vgic-v2-sr.c
index a3f18d362366..d7fd46fe9efb 100644
--- a/virt/kvm/arm/hyp/vgic-v2-sr.c
+++ b/virt/kvm/arm/hyp/vgic-v2-sr.c
@@ -34,11 +34,7 @@ static void __hyp_text save_elrsr(struct kvm_vcpu *vcpu, void __iomem *base)
else
elrsr1 = 0;
-#ifdef CONFIG_CPU_BIG_ENDIAN
- cpu_if->vgic_elrsr = ((u64)elrsr0 << 32) | elrsr1;
-#else
cpu_if->vgic_elrsr = ((u64)elrsr1 << 32) | elrsr0;
-#endif
}
static void __hyp_text save_lrs(struct kvm_vcpu *vcpu, void __iomem *base)