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>
This commit is contained in:
John Crispin 2017-08-24 10:09:46 +02:00
parent 5889f92f7d
commit a3f52f6165
2 changed files with 16 additions and 10 deletions

View file

@ -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.orig/arch/mips/ralink/Kconfig
+++ linux-4.9.44/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 CLKSRC_MIPS_GIC
select HW_HAS_PCI select HW_HAS_PCI
select GENERIC_CLOCKEVENTS_BROADCAST
+ select WEAK_REORDERING_BEYOND_LLSC + select WEAK_REORDERING_BEYOND_LLSC
endchoice endchoice

View file

@ -1,5 +1,7 @@
--- a/arch/mips/ralink/mt7621.c Index: linux-4.9.44/arch/mips/ralink/mt7621.c
+++ b/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 @@ @@ -18,6 +18,7 @@
#include <asm/mach-ralink/ralink_regs.h> #include <asm/mach-ralink/ralink_regs.h>
#include <asm/mach-ralink/mt7621.h> #include <asm/mach-ralink/mt7621.h>
@ -67,18 +69,22 @@
void prom_soc_init(struct ralink_soc_info *soc_info) void prom_soc_init(struct ralink_soc_info *soc_info)
{ {
void __iomem *sysc = (void __iomem *) KSEG1ADDR(MT7621_SYSC_BASE); void __iomem *sysc = (void __iomem *) KSEG1ADDR(MT7621_SYSC_BASE);
--- a/arch/mips/ralink/Kconfig Index: linux-4.9.44/arch/mips/ralink/Kconfig
+++ b/arch/mips/ralink/Kconfig ===================================================================
@@ -56,6 +56,7 @@ choice --- linux-4.9.44.orig/arch/mips/ralink/Kconfig
select COMMON_CLK +++ linux-4.9.44/arch/mips/ralink/Kconfig
@@ -57,6 +57,7 @@ choice
select CLKSRC_MIPS_GIC select CLKSRC_MIPS_GIC
select HW_HAS_PCI select HW_HAS_PCI
select WEAK_REORDERING_BEYOND_LLSC
+ select GENERIC_CLOCKEVENTS_BROADCAST + select GENERIC_CLOCKEVENTS_BROADCAST
endchoice endchoice
choice choice
--- a/arch/mips/ralink/timer-gic.c Index: linux-4.9.44/arch/mips/ralink/timer-gic.c
+++ b/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 @@ @@ -12,6 +12,7 @@
#include <linux/of.h> #include <linux/of.h>
#include <linux/clk-provider.h> #include <linux/clk-provider.h>