4.4-stable patches

added patches:
	irqchip-gic-v3-its-fix-entry-size-mask-for-gits_baser.patch

diff --git a/queue-4.4/irqchip-gic-v3-its-fix-entry-size-mask-for-gits_baser.patch b/queue-4.4/irqchip-gic-v3-its-fix-entry-size-mask-for-gits_baser.patch
new file mode 100644 (file)
index 0000000..f35e016
--- /dev/null
+++ b/queue-4.4/irqchip-gic-v3-its-fix-entry-size-mask-for-gits_baser.patch
@@ -0,0 +1,33 @@
+From 9224eb77e63f70f16c0b6b7a20ca7d395f3bc077 Mon Sep 17 00:00:00 2001
+From: Vladimir Murzin <vladimir.murzin@arm.com>
+Date: Mon, 17 Oct 2016 16:00:46 +0100
+Subject: irqchip/gic-v3-its: Fix entry size mask for GITS_BASER
+
+From: Vladimir Murzin <vladimir.murzin@arm.com>
+
+commit 9224eb77e63f70f16c0b6b7a20ca7d395f3bc077 upstream.
+
+Entry Size in GITS_BASER<n> occupies 5 bits [52:48], but we mask out 8
+bits.
+
+Fixes: cc2d3216f53c ("irqchip: GICv3: ITS command queue")
+Signed-off-by: Vladimir Murzin <vladimir.murzin@arm.com>
+Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
+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
+@@ -218,7 +218,7 @@
+ #define GITS_BASER_TYPE_SHIFT         (56)
+ #define GITS_BASER_TYPE(r)            (((r) >> GITS_BASER_TYPE_SHIFT) & 7)
+ #define GITS_BASER_ENTRY_SIZE_SHIFT   (48)
+-#define GITS_BASER_ENTRY_SIZE(r)      ((((r) >> GITS_BASER_ENTRY_SIZE_SHIFT) & 0xff) + 1)
++#define GITS_BASER_ENTRY_SIZE(r)      ((((r) >> GITS_BASER_ENTRY_SIZE_SHIFT) & 0x1f) + 1)
+ #define GITS_BASER_NonShareable               (0UL << 10)
+ #define GITS_BASER_InnerShareable     (1UL << 10)
+ #define GITS_BASER_OuterShareable     (2UL << 10)

diff --git a/queue-4.4/series b/queue-4.4/series
index b91c7da089399609f659244a420c05dadc9bd716..f82f28ac65064c2f89bb72314c1ec474655b1fcb 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -93,3 +93,4 @@ mm-workingset-fix-crash-in-shadow-node-shrinker-caused-by-replace_page_cache_pag
 mm-filemap-fix-mapping-nrpages-double-accounting-in-fuse.patch
 using-bug_on-as-an-assert-is-_never_-acceptable.patch
 s390-mm-fix-gmap-tlb-flush-issues.patch
+irqchip-gic-v3-its-fix-entry-size-mask-for-gits_baser.patch