From: Zoltan HERPAI <wigyori@uid0.hu>
Date: Tue, 5 May 2020 15:07:30 +0000 (+0200)
Subject: ar71xx: bring back legacy flash locking mechanism
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=8ce90b3d9345e5143eb1b08a1ff2ea17aace78d5;p=openwrt%2Fstaging%2Fwigyori.git

ar71xx: bring back legacy flash locking mechanism

Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
---

diff --git a/target/linux/ar71xx/patches-4.14/526-MIPS-ath79-add-flash-acquire-release.patch b/target/linux/ar71xx/patches-4.14/526-MIPS-ath79-add-flash-acquire-release.patch
new file mode 100644
index 0000000000..757dce110f
--- /dev/null
+++ b/target/linux/ar71xx/patches-4.14/526-MIPS-ath79-add-flash-acquire-release.patch
@@ -0,0 +1,37 @@
+--- a/arch/mips/ath79/common.c
++++ b/arch/mips/ath79/common.c
+@@ -22,6 +22,7 @@
+ #include "common.h"
+ 
+ static DEFINE_SPINLOCK(ath79_device_reset_lock);
++static DEFINE_MUTEX(ath79_flash_mutex);
+ 
+ u32 ath79_cpu_freq;
+ EXPORT_SYMBOL_GPL(ath79_cpu_freq);
+@@ -111,3 +112,16 @@ void ath79_device_reset_clear(u32 mask)
+ 	return ret;
+ }
+ EXPORT_SYMBOL_GPL(ath79_device_reset_get);
++
++void ath79_flash_acquire(void)
++{
++	mutex_lock(&ath79_flash_mutex);
++}
++EXPORT_SYMBOL_GPL(ath79_flash_acquire);
++
++void ath79_flash_release(void)
++{
++	mutex_unlock(&ath79_flash_mutex);
++}
++EXPORT_SYMBOL_GPL(ath79_flash_release);
++
+--- a/arch/mips/include/asm/mach-ath79/ath79.h
++++ b/arch/mips/include/asm/mach-ath79/ath79.h
+@@ -143,4 +143,7 @@ static inline u32 ath79_reset_rr(unsigne
+ void ath79_device_reset_set(u32 mask);
+ void ath79_device_reset_clear(u32 mask);
+ 
++void ath79_flash_acquire(void);
++void ath79_flash_release(void);
++
+ #endif /* __ASM_MACH_ATH79_H */
diff --git a/target/linux/ar71xx/patches-4.14/527-MIPS-ath79-add-mutex-include.patch b/target/linux/ar71xx/patches-4.14/527-MIPS-ath79-add-mutex-include.patch
new file mode 100644
index 0000000000..b2cc44638e
--- /dev/null
+++ b/target/linux/ar71xx/patches-4.14/527-MIPS-ath79-add-mutex-include.patch
@@ -0,0 +1,11 @@
+diff -ruN a/arch/mips/ath79/common.c b/arch/mips/ath79/common.c
+--- a/arch/mips/ath79/common.c	2020-05-04 14:02:16.869044816 +0200
++++ b/arch/mips/ath79/common.c	2020-05-04 08:43:42.000000000 +0200
+@@ -16,6 +16,7 @@
+ #include <linux/export.h>
+ #include <linux/types.h>
+ #include <linux/spinlock.h>
++#include <linux/mutex.h>
+ 
+ #include <asm/mach-ath79/ath79.h>
+ #include <asm/mach-ath79/ar71xx_regs.h>