From: Greg Kroah-Hartman Date: Wed, 26 Oct 2016 09:38:33 +0000 (+0200) Subject: 4.4-stable patches X-Git-Tag: v4.8.5~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d0f4cb944f38c4eb34affc90c3906366c8387425;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 00000000000..f35e0160e26 --- /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 +Date: Mon, 17 Oct 2016 16:00:46 +0100 +Subject: irqchip/gic-v3-its: Fix entry size mask for GITS_BASER + +From: Vladimir Murzin + +commit 9224eb77e63f70f16c0b6b7a20ca7d395f3bc077 upstream. + +Entry Size in GITS_BASER occupies 5 bits [52:48], but we mask out 8 +bits. + +Fixes: cc2d3216f53c ("irqchip: GICv3: ITS command queue") +Signed-off-by: Vladimir Murzin +Signed-off-by: Marc Zyngier +Signed-off-by: Greg Kroah-Hartman + + +--- + 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 b91c7da0893..f82f28ac650 100644 --- 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