From: John Crispin <john@phrozen.org>
Date: Thu, 24 Aug 2017 08:09:46 +0000 (+0200)
Subject: ramips: refresh kernel patches
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=a3f52f6165e1ce2a62d4cc8a7018ef8c804021e3;p=openwrt%2Fstaging%2Fblogic.git

ramips: refresh kernel patches

the reordering patch fixes random kernel hangs. bug/fix was reported by MTK/WCN.

Signed-off-by: John Crispin <john@phrozen.org>
---

diff --git a/target/linux/ramips/patches-4.9/0070-weak_reordering.patch b/target/linux/ramips/patches-4.9/0070-weak_reordering.patch
index 718304b7a7a7..5961c49f9511 100644
--- a/target/linux/ramips/patches-4.9/0070-weak_reordering.patch
+++ b/target/linux/ramips/patches-4.9/0070-weak_reordering.patch
@@ -2,10 +2,10 @@ Index: linux-4.9.44/arch/mips/ralink/Kconfig
 ===================================================================
 --- linux-4.9.44.orig/arch/mips/ralink/Kconfig
 +++ linux-4.9.44/arch/mips/ralink/Kconfig
-@@ -57,6 +57,7 @@ choice
+@@ -56,6 +56,7 @@ choice
+ 		select COMMON_CLK
  		select CLKSRC_MIPS_GIC
  		select HW_HAS_PCI
- 		select GENERIC_CLOCKEVENTS_BROADCAST
 +		select WEAK_REORDERING_BEYOND_LLSC
  endchoice
  
diff --git a/target/linux/ramips/patches-4.9/101-mt7621-timer.patch b/target/linux/ramips/patches-4.9/101-mt7621-timer.patch
index 02497bc1d2f4..9d02d0d7543b 100644
--- a/target/linux/ramips/patches-4.9/101-mt7621-timer.patch
+++ b/target/linux/ramips/patches-4.9/101-mt7621-timer.patch
@@ -1,5 +1,7 @@
---- a/arch/mips/ralink/mt7621.c
-+++ b/arch/mips/ralink/mt7621.c
+Index: linux-4.9.44/arch/mips/ralink/mt7621.c
+===================================================================
+--- linux-4.9.44.orig/arch/mips/ralink/mt7621.c
++++ linux-4.9.44/arch/mips/ralink/mt7621.c
 @@ -18,6 +18,7 @@
  #include <asm/mach-ralink/ralink_regs.h>
  #include <asm/mach-ralink/mt7621.h>
@@ -67,18 +69,22 @@
  void prom_soc_init(struct ralink_soc_info *soc_info)
  {
  	void __iomem *sysc = (void __iomem *) KSEG1ADDR(MT7621_SYSC_BASE);
---- a/arch/mips/ralink/Kconfig
-+++ b/arch/mips/ralink/Kconfig
-@@ -56,6 +56,7 @@ choice
- 		select COMMON_CLK
+Index: linux-4.9.44/arch/mips/ralink/Kconfig
+===================================================================
+--- linux-4.9.44.orig/arch/mips/ralink/Kconfig
++++ linux-4.9.44/arch/mips/ralink/Kconfig
+@@ -57,6 +57,7 @@ choice
  		select CLKSRC_MIPS_GIC
  		select HW_HAS_PCI
+ 		select WEAK_REORDERING_BEYOND_LLSC
 +		select GENERIC_CLOCKEVENTS_BROADCAST
  endchoice
  
  choice
---- a/arch/mips/ralink/timer-gic.c
-+++ b/arch/mips/ralink/timer-gic.c
+Index: linux-4.9.44/arch/mips/ralink/timer-gic.c
+===================================================================
+--- linux-4.9.44.orig/arch/mips/ralink/timer-gic.c
++++ linux-4.9.44/arch/mips/ralink/timer-gic.c
 @@ -12,6 +12,7 @@
  #include <linux/of.h>
  #include <linux/clk-provider.h>