bcm47xx: Refresh patches
authorHauke Mehrtens <hauke@hauke-m.de>
Sun, 5 Mar 2023 17:42:49 +0000 (18:42 +0100)
committerHauke Mehrtens <hauke@hauke-m.de>
Sun, 5 Mar 2023 17:47:12 +0000 (18:47 +0100)
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>
target/linux/bcm47xx/patches-5.10/159-cpu_fixes.patch
target/linux/bcm47xx/patches-5.10/160-kmap_coherent.patch
target/linux/bcm47xx/patches-5.15/159-cpu_fixes.patch
target/linux/bcm47xx/patches-5.15/160-kmap_coherent.patch

index 0c9a9d6490e3bd52f9d9a9c3b5a66e6d84062343..eb4c0e6ac8f5ddbacf577d5e0c4f24bc6bd409e5 100644 (file)
        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()) {
        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;
  
        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);
  
index caa3d9816bf2dd9d9e6b27ea6fbb5bbce84b1f5d..c85fa0be4cfea63308d8740b77c56822826bf6d9 100644 (file)
@@ -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) {
index 88f2b9c684baa2d71e436a3421cb411bc150a504..fe7eff19113ee59001d5cf7a9ce69aaba893bd19 100644 (file)
        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()) {
        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;
  
        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);
  
index b716f0cbc8ebb80330a28be4274649c7ee6b6bf3..aedf6afa246531d3c698368268bf4d59a9629049 100644 (file)
@@ -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) {