mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 15:02:32 +00:00
29aa1a94c4
Refresh kernel patches. Remove patches already included in the kernel. Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com> Link: https://github.com/openwrt/openwrt/pull/15010 Signed-off-by: Robert Marko <robimarko@gmail.com>
70 lines
2.2 KiB
Diff
70 lines
2.2 KiB
Diff
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);
|