From: Greg Kroah-Hartman Date: Wed, 8 Nov 2017 09:01:17 +0000 (+0100) Subject: 4.9-stable patches X-Git-Tag: v3.18.80~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=17f0ca13daa100eca9393aa3f3bd3dc175146f14;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: arm-dts-mvebu-pl310-cache-disable-double-linefill.patch --- diff --git a/queue-4.9/arm-dts-mvebu-pl310-cache-disable-double-linefill.patch b/queue-4.9/arm-dts-mvebu-pl310-cache-disable-double-linefill.patch new file mode 100644 index 00000000000..90a58e5ae4c --- /dev/null +++ b/queue-4.9/arm-dts-mvebu-pl310-cache-disable-double-linefill.patch @@ -0,0 +1,75 @@ +From cda80a82ac3e89309706c027ada6ab232be1d640 Mon Sep 17 00:00:00 2001 +From: Yan Markman +Date: Sun, 16 Oct 2016 00:22:32 +0300 +Subject: ARM: dts: mvebu: pl310-cache disable double-linefill + +From: Yan Markman + +commit cda80a82ac3e89309706c027ada6ab232be1d640 upstream. + +Under heavy system stress mvebu SoC using Cortex A9 sporadically +encountered instability issues. + +The "double linefill" feature of L2 cache was identified as causing +dependency between read and write which lead to the deadlock. + +Especially, it was the cause of deadlock seen under heavy PCIe traffic, +as this dependency violates PCIE overtaking rule. + +Fixes: c8f5a878e554 ("ARM: mvebu: use DT properties to fine-tune the L2 configuration") +Signed-off-by: Yan Markman +Signed-off-by: Igal Liberman +Signed-off-by: Nadav Haklai +[gregory.clement@free-electrons.com: reformulate commit log, add Armada +375 and add Fixes tag] +Signed-off-by: Gregory CLEMENT +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm/boot/dts/armada-375.dtsi | 4 ++-- + arch/arm/boot/dts/armada-38x.dtsi | 4 ++-- + arch/arm/boot/dts/armada-39x.dtsi | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +--- a/arch/arm/boot/dts/armada-375.dtsi ++++ b/arch/arm/boot/dts/armada-375.dtsi +@@ -176,9 +176,9 @@ + reg = <0x8000 0x1000>; + cache-unified; + cache-level = <2>; +- arm,double-linefill-incr = <1>; ++ arm,double-linefill-incr = <0>; + arm,double-linefill-wrap = <0>; +- arm,double-linefill = <1>; ++ arm,double-linefill = <0>; + prefetch-data = <1>; + }; + +--- a/arch/arm/boot/dts/armada-38x.dtsi ++++ b/arch/arm/boot/dts/armada-38x.dtsi +@@ -143,9 +143,9 @@ + reg = <0x8000 0x1000>; + cache-unified; + cache-level = <2>; +- arm,double-linefill-incr = <1>; ++ arm,double-linefill-incr = <0>; + arm,double-linefill-wrap = <0>; +- arm,double-linefill = <1>; ++ arm,double-linefill = <0>; + prefetch-data = <1>; + }; + +--- a/arch/arm/boot/dts/armada-39x.dtsi ++++ b/arch/arm/boot/dts/armada-39x.dtsi +@@ -111,9 +111,9 @@ + reg = <0x8000 0x1000>; + cache-unified; + cache-level = <2>; +- arm,double-linefill-incr = <1>; ++ arm,double-linefill-incr = <0>; + arm,double-linefill-wrap = <0>; +- arm,double-linefill = <1>; ++ arm,double-linefill = <0>; + prefetch-data = <1>; + }; + diff --git a/queue-4.9/series b/queue-4.9/series index c70ac63e1ba..7d7a0da8aa4 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -64,3 +64,4 @@ pci-avoid-possible-deadlock-on-pci_lock-and-p-pi_lock.patch powerpc-64-don-t-try-to-use-radix-mmu-under-a-hypervisor.patch xen-don-t-print-error-message-in-case-of-missing-xenstore-entry.patch staging-r8712u-fix-sparse-warning-in-rtl871x_xmit.c.patch +arm-dts-mvebu-pl310-cache-disable-double-linefill.patch