Patch "irqchip/gic-v3: Fix ICC_SGI1R_EL1.INTID decoding mask" has been added to the 4.6-stable tree
From: <gregkh@linuxfoundation.org>
Date: 2016-06-18 17:02:57
This is a note to let you know that I've just added the patch titled
irqchip/gic-v3: Fix ICC_SGI1R_EL1.INTID decoding mask
to the 4.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
irqchip-gic-v3-fix-icc_sgi1r_el1.intid-decoding-mask.patch
and it can be found in the queue-4.6 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let [off-list ref] know about it.
From dd5f1b049dc139876801db3cdd0f20d21fd428cc Mon Sep 17 00:00:00 2001
From: Marc Zyngier <redacted> Date: Thu, 2 Jun 2016 09:00:28 +0100 Subject: irqchip/gic-v3: Fix ICC_SGI1R_EL1.INTID decoding mask From: Marc Zyngier <redacted> commit dd5f1b049dc139876801db3cdd0f20d21fd428cc upstream. The INTID mask is wrong, and is made a signed value, which has nteresting effects in the KVM emulation. Let's sanitize it. Signed-off-by: Marc Zyngier <redacted> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- include/linux/irqchip/arm-gic-v3.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/include/linux/irqchip/arm-gic-v3.h
+++ b/include/linux/irqchip/arm-gic-v3.h@@ -301,7 +301,7 @@ #define ICC_SGI1R_AFFINITY_1_SHIFT 16 #define ICC_SGI1R_AFFINITY_1_MASK (0xff << ICC_SGI1R_AFFINITY_1_SHIFT) #define ICC_SGI1R_SGI_ID_SHIFT 24 -#define ICC_SGI1R_SGI_ID_MASK (0xff << ICC_SGI1R_SGI_ID_SHIFT) +#define ICC_SGI1R_SGI_ID_MASK (0xfULL << ICC_SGI1R_SGI_ID_SHIFT) #define ICC_SGI1R_AFFINITY_2_SHIFT 32 #define ICC_SGI1R_AFFINITY_2_MASK (0xffULL << ICC_SGI1R_AFFINITY_1_SHIFT) #define ICC_SGI1R_IRQ_ROUTING_MODE_BIT 40
Patches currently in stable-queue which might be from marc.zyngier@arm.com are queue-4.6/kvm-arm-arm64-vgic-v2-clear-all-dirty-lrs.patch queue-4.6/kvm-arm-arm64-vgic-v3-clear-all-dirty-lrs.patch queue-4.6/irqchip-gic-v3-fix-icc_sgi1r_el1.intid-decoding-mask.patch