summaryrefslogtreecommitdiffstats
path: root/virt/kvm
diff options
context:
space:
mode:
authorChristoffer Dall <cdall@linaro.org>2017-06-04 22:17:02 +0200
committerChristoffer Dall <cdall@linaro.org>2017-06-06 10:16:53 +0200
commitd68356cc51e304ff9a389f006b6249d41f2c2319 (patch)
tree1b73905d348d12a65c425d38b5c2f0e3a3b17f19 /virt/kvm
parent28232a4317be7ad615f0f1b69dc8583fd580a8e3 (diff)
downloadlinux-stable-d68356cc51e304ff9a389f006b6249d41f2c2319.tar.gz
linux-stable-d68356cc51e304ff9a389f006b6249d41f2c2319.tar.bz2
linux-stable-d68356cc51e304ff9a389f006b6249d41f2c2319.zip
KVM: arm/arm64: vgic-v3: Fix nr_pre_bits bitfield extraction
We used to extract PRIbits from the ICH_VT_EL2 which was the upper field in the register word, so a mask wasn't necessary, but as we switched to looking at PREbits, which is bits 26 through 28 with the PRIbits field being potentially non-zero, we really need to mask off the field value, otherwise fun things may happen. Signed-off-by: Christoffer Dall <cdall@linaro.org> Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'virt/kvm')
-rw-r--r--virt/kvm/arm/hyp/vgic-v3-sr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/virt/kvm/arm/hyp/vgic-v3-sr.c b/virt/kvm/arm/hyp/vgic-v3-sr.c
index 32c3295929b0..87940364570b 100644
--- a/virt/kvm/arm/hyp/vgic-v3-sr.c
+++ b/virt/kvm/arm/hyp/vgic-v3-sr.c
@@ -22,7 +22,7 @@
#include <asm/kvm_hyp.h>
#define vtr_to_max_lr_idx(v) ((v) & 0xf)
-#define vtr_to_nr_pre_bits(v) (((u32)(v) >> 26) + 1)
+#define vtr_to_nr_pre_bits(v) ((((u32)(v) >> 26) & 7) + 1)
static u64 __hyp_text __gic_v3_get_lr(unsigned int lr)
{