From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sun, 5 Mar 2023 17:42:49 +0000 (+0100)
Subject: bcm47xx: Refresh patches
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a7e05caaf3e215981dde82881259465c682df039;p=openwrt%2Fstaging%2Fstintel.git

bcm47xx: Refresh patches

The kernel patches did not apply cleanly any more, refresh them
automatically.

Fixes: 26bc8f68767e ("generic: MIPS: Add barriers between dcache & icache flushes")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---

diff --git a/target/linux/bcm47xx/patches-5.10/159-cpu_fixes.patch b/target/linux/bcm47xx/patches-5.10/159-cpu_fixes.patch
index 0c9a9d6490..eb4c0e6ac8 100644
--- a/target/linux/bcm47xx/patches-5.10/159-cpu_fixes.patch
+++ b/target/linux/bcm47xx/patches-5.10/159-cpu_fixes.patch
@@ -389,7 +389,7 @@
  	if (dc_lsize == 0)
  		r4k_blast_dcache = (void *)cache_noop;
  	else if (dc_lsize == 16)
-@@ -1818,6 +1830,17 @@ static void coherency_setup(void)
+@@ -1827,6 +1839,17 @@ static void coherency_setup(void)
  	 * silly idea of putting something else there ...
  	 */
  	switch (current_cpu_type()) {
@@ -407,7 +407,7 @@
  	case CPU_R4000PC:
  	case CPU_R4000SC:
  	case CPU_R4000MC:
-@@ -1864,6 +1887,15 @@ void r4k_cache_init(void)
+@@ -1873,6 +1896,15 @@ void r4k_cache_init(void)
  	extern void build_copy_page(void);
  	struct cpuinfo_mips *c = &current_cpu_data;
  
@@ -423,7 +423,7 @@
  	probe_pcache();
  	probe_vcache();
  	setup_scache();
-@@ -1940,7 +1972,15 @@ void r4k_cache_init(void)
+@@ -1949,7 +1981,15 @@ void r4k_cache_init(void)
  	 */
  	local_r4k___flush_cache_all(NULL);
  
diff --git a/target/linux/bcm47xx/patches-5.10/160-kmap_coherent.patch b/target/linux/bcm47xx/patches-5.10/160-kmap_coherent.patch
index caa3d9816b..c85fa0be4c 100644
--- a/target/linux/bcm47xx/patches-5.10/160-kmap_coherent.patch
+++ b/target/linux/bcm47xx/patches-5.10/160-kmap_coherent.patch
@@ -29,7 +29,7 @@ This fixes OpenWrt ticket #1485: https://dev.openwrt.org/ticket/1485
  #endif /* __ASM_MACH_BCM47XX_CPU_FEATURE_OVERRIDES_H */
 --- a/arch/mips/mm/c-r4k.c
 +++ b/arch/mips/mm/c-r4k.c
-@@ -699,7 +699,7 @@ static inline void local_r4k_flush_cache
+@@ -702,7 +702,7 @@ static inline void local_r4k_flush_cache
  		map_coherent = (cpu_has_dc_aliases &&
  				page_mapcount(page) &&
  				!Page_dcache_dirty(page));
@@ -38,7 +38,7 @@ This fixes OpenWrt ticket #1485: https://dev.openwrt.org/ticket/1485
  			vaddr = kmap_coherent(page, addr);
  		else
  			vaddr = kmap_atomic(page);
-@@ -721,7 +721,7 @@ static inline void local_r4k_flush_cache
+@@ -729,7 +729,7 @@ static inline void local_r4k_flush_cache
  	}
  
  	if (vaddr) {
diff --git a/target/linux/bcm47xx/patches-5.15/159-cpu_fixes.patch b/target/linux/bcm47xx/patches-5.15/159-cpu_fixes.patch
index 88f2b9c684..fe7eff1911 100644
--- a/target/linux/bcm47xx/patches-5.15/159-cpu_fixes.patch
+++ b/target/linux/bcm47xx/patches-5.15/159-cpu_fixes.patch
@@ -380,7 +380,7 @@
  	if (dc_lsize == 0)
  		r4k_blast_dcache = (void *)cache_noop;
  	else if (dc_lsize == 16)
-@@ -1817,6 +1829,17 @@ static void coherency_setup(void)
+@@ -1826,6 +1838,17 @@ static void coherency_setup(void)
  	 * silly idea of putting something else there ...
  	 */
  	switch (current_cpu_type()) {
@@ -398,7 +398,7 @@
  	case CPU_R4000PC:
  	case CPU_R4000SC:
  	case CPU_R4000MC:
-@@ -1863,6 +1886,15 @@ void r4k_cache_init(void)
+@@ -1872,6 +1895,15 @@ void r4k_cache_init(void)
  	extern void build_copy_page(void);
  	struct cpuinfo_mips *c = &current_cpu_data;
  
@@ -414,7 +414,7 @@
  	probe_pcache();
  	probe_vcache();
  	setup_scache();
-@@ -1935,7 +1967,15 @@ void r4k_cache_init(void)
+@@ -1944,7 +1976,15 @@ void r4k_cache_init(void)
  	 */
  	local_r4k___flush_cache_all(NULL);
  
diff --git a/target/linux/bcm47xx/patches-5.15/160-kmap_coherent.patch b/target/linux/bcm47xx/patches-5.15/160-kmap_coherent.patch
index b716f0cbc8..aedf6afa24 100644
--- a/target/linux/bcm47xx/patches-5.15/160-kmap_coherent.patch
+++ b/target/linux/bcm47xx/patches-5.15/160-kmap_coherent.patch
@@ -29,7 +29,7 @@ This fixes OpenWrt ticket #1485: https://dev.openwrt.org/ticket/1485
  #endif /* __ASM_MACH_BCM47XX_CPU_FEATURE_OVERRIDES_H */
 --- a/arch/mips/mm/c-r4k.c
 +++ b/arch/mips/mm/c-r4k.c
-@@ -699,7 +699,7 @@ static inline void local_r4k_flush_cache
+@@ -702,7 +702,7 @@ static inline void local_r4k_flush_cache
  		map_coherent = (cpu_has_dc_aliases &&
  				page_mapcount(page) &&
  				!Page_dcache_dirty(page));
@@ -38,7 +38,7 @@ This fixes OpenWrt ticket #1485: https://dev.openwrt.org/ticket/1485
  			vaddr = kmap_coherent(page, addr);
  		else
  			vaddr = kmap_atomic(page);
-@@ -721,7 +721,7 @@ static inline void local_r4k_flush_cache
+@@ -729,7 +729,7 @@ static inline void local_r4k_flush_cache
  	}
  
  	if (vaddr) {