mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-30 10:39:04 +00:00
bcm47xx: remove old cache aliasing patches
Remove patches related to some ancient cache aliasing bugs that were fixed in earlier versions and are no longer relevant to us. Co-authored-by: Jiaxun Yang <jiaxun.yang@flygoat.com> Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com> Link: https://github.com/openwrt/openwrt/pull/15635 Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
Mieczyslaw Nalewaj
Robert Marko
parent
d836a688d1
commit
de223b5121
@ -1,69 +0,0 @@
|
|||||||
From: Jeff Hansen <jhansen@cardaccess-inc.com>
|
|
||||||
Subject: [PATCH] kmap_coherent
|
|
||||||
|
|
||||||
On ASUS WL-500gP there are some "Data bus error"s when executing simple
|
|
||||||
commands liks "ps" or "cat /proc/1/cmdline".
|
|
||||||
|
|
||||||
This fixes OpenWrt ticket #1485: https://dev.openwrt.org/ticket/1485
|
|
||||||
---
|
|
||||||
--- a/arch/mips/include/asm/cpu-features.h
|
|
||||||
+++ b/arch/mips/include/asm/cpu-features.h
|
|
||||||
@@ -257,6 +257,9 @@
|
|
||||||
#ifndef cpu_has_pindexed_dcache
|
|
||||||
#define cpu_has_pindexed_dcache (cpu_data[0].dcache.flags & MIPS_CACHE_PINDEX)
|
|
||||||
#endif
|
|
||||||
+#ifndef cpu_use_kmap_coherent
|
|
||||||
+#define cpu_use_kmap_coherent 1
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* I-Cache snoops remote store. This only matters on SMP. Some multiprocessors
|
|
||||||
--- a/arch/mips/include/asm/mach-bcm47xx/cpu-feature-overrides.h
|
|
||||||
+++ b/arch/mips/include/asm/mach-bcm47xx/cpu-feature-overrides.h
|
|
||||||
@@ -79,4 +79,6 @@
|
|
||||||
#define cpu_scache_line_size() 0
|
|
||||||
#define cpu_has_vz 0
|
|
||||||
|
|
||||||
+#define cpu_use_kmap_coherent 0
|
|
||||||
+
|
|
||||||
#endif /* __ASM_MACH_BCM47XX_CPU_FEATURE_OVERRIDES_H */
|
|
||||||
--- a/arch/mips/mm/c-r4k.c
|
|
||||||
+++ b/arch/mips/mm/c-r4k.c
|
|
||||||
@@ -618,7 +618,7 @@ static inline void local_r4k_flush_cache
|
|
||||||
}
|
|
||||||
|
|
||||||
if (vaddr) {
|
|
||||||
- if (map_coherent)
|
|
||||||
+ if (map_coherent && cpu_use_kmap_coherent)
|
|
||||||
kunmap_coherent();
|
|
||||||
else
|
|
||||||
kunmap_atomic(vaddr);
|
|
||||||
--- a/arch/mips/mm/init.c
|
|
||||||
+++ b/arch/mips/mm/init.c
|
|
||||||
@@ -173,7 +173,7 @@ void copy_user_highpage(struct page *to,
|
|
||||||
void *vfrom, *vto;
|
|
||||||
|
|
||||||
vto = kmap_atomic(to);
|
|
||||||
- if (cpu_has_dc_aliases &&
|
|
||||||
+ if (cpu_has_dc_aliases && cpu_use_kmap_coherent &&
|
|
||||||
folio_mapped(src) && !folio_test_dcache_dirty(src)) {
|
|
||||||
vfrom = kmap_coherent(from, vaddr);
|
|
||||||
copy_page(vto, vfrom);
|
|
||||||
@@ -197,7 +197,7 @@ void copy_to_user_page(struct vm_area_st
|
|
||||||
{
|
|
||||||
struct folio *folio = page_folio(page);
|
|
||||||
|
|
||||||
- if (cpu_has_dc_aliases &&
|
|
||||||
+ if (cpu_has_dc_aliases && cpu_use_kmap_coherent &&
|
|
||||||
folio_mapped(folio) && !folio_test_dcache_dirty(folio)) {
|
|
||||||
void *vto = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK);
|
|
||||||
memcpy(vto, src, len);
|
|
||||||
@@ -217,7 +217,7 @@ void copy_from_user_page(struct vm_area_
|
|
||||||
{
|
|
||||||
struct folio *folio = page_folio(page);
|
|
||||||
|
|
||||||
- if (cpu_has_dc_aliases &&
|
|
||||||
+ if (cpu_has_dc_aliases && cpu_use_kmap_coherent &&
|
|
||||||
folio_mapped(folio) && !folio_test_dcache_dirty(folio)) {
|
|
||||||
void *vfrom = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK);
|
|
||||||
memcpy(dst, vfrom, len);
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
From: Wolfram Joost <dbox2@frokaschwei.de>
|
|
||||||
Subject: [PATCH] fork_cacheflush
|
|
||||||
|
|
||||||
On ASUS WL-500gP there are many unexpected "Segmentation fault"s that
|
|
||||||
seem to be caused by a kernel. They can be avoided by:
|
|
||||||
1) Disabling highpage
|
|
||||||
2) Using flush_cache_mm in flush_cache_dup_mm
|
|
||||||
|
|
||||||
For details see OpenWrt ticket #2035 https://dev.openwrt.org/ticket/2035
|
|
||||||
---
|
|
||||||
--- a/arch/mips/include/asm/cacheflush.h
|
|
||||||
+++ b/arch/mips/include/asm/cacheflush.h
|
|
||||||
@@ -46,7 +46,7 @@
|
|
||||||
extern void (*flush_cache_all)(void);
|
|
||||||
extern void (*__flush_cache_all)(void);
|
|
||||||
extern void (*flush_cache_mm)(struct mm_struct *mm);
|
|
||||||
-#define flush_cache_dup_mm(mm) do { (void) (mm); } while (0)
|
|
||||||
+#define flush_cache_dup_mm(mm) flush_cache_mm(mm)
|
|
||||||
extern void (*flush_cache_range)(struct vm_area_struct *vma,
|
|
||||||
unsigned long start, unsigned long end);
|
|
||||||
extern void (*flush_cache_page)(struct vm_area_struct *vma, unsigned long page, unsigned long pfn);
|
|
||||||
@ -1,75 +0,0 @@
|
|||||||
From: Jeff Hansen <jhansen@cardaccess-inc.com>
|
|
||||||
Subject: [PATCH] no highpage
|
|
||||||
|
|
||||||
On ASUS WL-500gP there are many unexpected "Segmentation fault"s that
|
|
||||||
seem to be caused by a kernel. They can be avoided by:
|
|
||||||
1) Disabling highpage
|
|
||||||
2) Using flush_cache_mm in flush_cache_dup_mm
|
|
||||||
|
|
||||||
For details see OpenWrt ticket #2035 https://dev.openwrt.org/ticket/2035
|
|
||||||
---
|
|
||||||
--- a/arch/mips/include/asm/page.h
|
|
||||||
+++ b/arch/mips/include/asm/page.h
|
|
||||||
@@ -71,6 +71,7 @@ static inline unsigned int page_size_ftl
|
|
||||||
#endif /* CONFIG_MIPS_HUGE_TLB_SUPPORT */
|
|
||||||
|
|
||||||
#include <linux/pfn.h>
|
|
||||||
+#include <asm/cpu-features.h>
|
|
||||||
|
|
||||||
extern void build_clear_page(void);
|
|
||||||
extern void build_copy_page(void);
|
|
||||||
@@ -110,11 +111,16 @@ static inline void clear_user_page(void
|
|
||||||
flush_data_cache_page((unsigned long)addr);
|
|
||||||
}
|
|
||||||
|
|
||||||
-struct vm_area_struct;
|
|
||||||
-extern void copy_user_highpage(struct page *to, struct page *from,
|
|
||||||
- unsigned long vaddr, struct vm_area_struct *vma);
|
|
||||||
+static inline void copy_user_page(void *vto, void *vfrom, unsigned long vaddr,
|
|
||||||
+ struct page *to)
|
|
||||||
+{
|
|
||||||
+ extern void (*flush_data_cache_page)(unsigned long addr);
|
|
||||||
|
|
||||||
-#define __HAVE_ARCH_COPY_USER_HIGHPAGE
|
|
||||||
+ copy_page(vto, vfrom);
|
|
||||||
+ if (!cpu_has_ic_fills_f_dc ||
|
|
||||||
+ pages_do_alias((unsigned long)vto, vaddr & PAGE_MASK))
|
|
||||||
+ flush_data_cache_page((unsigned long)vto);
|
|
||||||
+}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* These are used to make use of C type-checking..
|
|
||||||
--- a/arch/mips/mm/init.c
|
|
||||||
+++ b/arch/mips/mm/init.c
|
|
||||||
@@ -166,31 +166,6 @@ void kunmap_coherent(void)
|
|
||||||
preempt_enable();
|
|
||||||
}
|
|
||||||
|
|
||||||
-void copy_user_highpage(struct page *to, struct page *from,
|
|
||||||
- unsigned long vaddr, struct vm_area_struct *vma)
|
|
||||||
-{
|
|
||||||
- struct folio *src = page_folio(from);
|
|
||||||
- void *vfrom, *vto;
|
|
||||||
-
|
|
||||||
- vto = kmap_atomic(to);
|
|
||||||
- if (cpu_has_dc_aliases && cpu_use_kmap_coherent &&
|
|
||||||
- folio_mapped(src) && !folio_test_dcache_dirty(src)) {
|
|
||||||
- vfrom = kmap_coherent(from, vaddr);
|
|
||||||
- copy_page(vto, vfrom);
|
|
||||||
- kunmap_coherent();
|
|
||||||
- } else {
|
|
||||||
- vfrom = kmap_atomic(from);
|
|
||||||
- copy_page(vto, vfrom);
|
|
||||||
- kunmap_atomic(vfrom);
|
|
||||||
- }
|
|
||||||
- if ((!cpu_has_ic_fills_f_dc) ||
|
|
||||||
- pages_do_alias((unsigned long)vto, vaddr & PAGE_MASK))
|
|
||||||
- flush_data_cache_page((unsigned long)vto);
|
|
||||||
- kunmap_atomic(vto);
|
|
||||||
- /* Make sure this page is cleared on other CPU's too before using it */
|
|
||||||
- smp_wmb();
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
void copy_to_user_page(struct vm_area_struct *vma,
|
|
||||||
struct page *page, unsigned long vaddr, void *dst, const void *src,
|
|
||||||
unsigned long len)
|
|
||||||
Loading…
Reference in New Issue
Block a user