aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRui Salvaterra <rsalvaterra@gmail.com>2021-03-30 23:59:48 +0100
committerDaniel Golle <daniel@makrotopia.org>2021-03-31 00:58:49 +0100
commit4b2e4518acaf1bed9c06fbd44a7f175e7fdb0a29 (patch)
tree001dff587354225b4f1050dc6f9d4bff3b6f1e6c
parent9bc6662deab04689a556455ac65c8752f27024e0 (diff)
downloadupstream-4b2e4518acaf1bed9c06fbd44a7f175e7fdb0a29.tar.gz
upstream-4b2e4518acaf1bed9c06fbd44a7f175e7fdb0a29.tar.bz2
upstream-4b2e4518acaf1bed9c06fbd44a7f175e7fdb0a29.zip
ramips/mt7621: drop the weak reordering patch
In order to fix random hangs on MT7621, we've been selecting WEAK_REORDERING_BEYOND_LLSC for years [1]. However, these random hangs have been most likely caused by an oversight in the MIPS implementation of the kernel memory consistency model, which has already been fixed for some time (and backported to stable) [2]. Manually refreshed: 321-mt7621-timer.patch [1] https://git.openwrt.org/?p=openwrt/openwrt.git;a=commitdiff;h=5c971cd6fdd7298a2017bdb6bea870088eddb8b9 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/arch/mips?h=linux-5.4.y&id=42344113ba7a1ed7b5654cd5270af0d5698d8521 Suggested-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com> Tested-by: Donald Hoskins <grommish@gmail.com> Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
-rw-r--r--target/linux/ramips/patches-5.10/202-weak_reordering.patch10
-rw-r--r--target/linux/ramips/patches-5.10/321-mt7621-timer.patch4
2 files changed, 2 insertions, 12 deletions
diff --git a/target/linux/ramips/patches-5.10/202-weak_reordering.patch b/target/linux/ramips/patches-5.10/202-weak_reordering.patch
deleted file mode 100644
index 074e16642f..0000000000
--- a/target/linux/ramips/patches-5.10/202-weak_reordering.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/arch/mips/ralink/Kconfig
-+++ b/arch/mips/ralink/Kconfig
-@@ -57,6 +57,7 @@ choice
- select CLKSRC_MIPS_GIC
- select HAVE_PCI if PCI_MT7621
- select SOC_BUS
-+ select WEAK_REORDERING_BEYOND_LLSC
- endchoice
-
- choice
diff --git a/target/linux/ramips/patches-5.10/321-mt7621-timer.patch b/target/linux/ramips/patches-5.10/321-mt7621-timer.patch
index 91e14ad63b..08d5935eb0 100644
--- a/target/linux/ramips/patches-5.10/321-mt7621-timer.patch
+++ b/target/linux/ramips/patches-5.10/321-mt7621-timer.patch
@@ -77,10 +77,10 @@
void __iomem *sysc = (void __iomem *) KSEG1ADDR(MT7621_SYSC_BASE);
--- a/arch/mips/ralink/Kconfig
+++ b/arch/mips/ralink/Kconfig
-@@ -63,6 +63,7 @@ choice
+@@ -62,6 +62,7 @@ choice
+ select CLKSRC_MIPS_GIC
select HAVE_PCI if PCI_MT7621
select SOC_BUS
- select WEAK_REORDERING_BEYOND_LLSC
+ select GENERIC_CLOCKEVENTS_BROADCAST
endchoice