| author | Christoffer Dall <christoffer.dall@linaro.org> | 2017-12-03 22:54:41 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-12-14 08:28:14 (GMT) |
| commit | cf6668d57a26e7d72d12117e9aba0c3c1578bfc5 (patch) | |
| tree | 1c6989049f1959f6acebb707e70b6043ffd33284 | |
| parent | 6ead44d4b5b8b1ecfcbd2302f15028dab7774da3 (diff) | |
| download | common-cf6668d57a26e7d72d12117e9aba0c3c1578bfc5.zip common-cf6668d57a26e7d72d12117e9aba0c3c1578bfc5.tar.gz common-cf6668d57a26e7d72d12117e9aba0c3c1578bfc5.tar.bz2 | |
KVM: arm/arm64: Fix broken GICH_ELRSR big endian conversion
commit fc396e066318c0a02208c1d3f0b62950a7714999 upstream.
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.
Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | virt/kvm/arm/hyp/vgic-v2-sr.c | 4 |
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 c8aeb7b..9502124 100644 --- a/virt/kvm/arm/hyp/vgic-v2-sr.c +++ b/virt/kvm/arm/hyp/vgic-v2-sr.c @@ -77,11 +77,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) |