mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
25ca004f24
bcm47xx misses cpu overwrites for the features of the CPUs used in these SoCs. Instead of manually checking, it is now known at compile time for some options and the compiler is able to remove the checks and optimize the code. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 38974
71 lines
2.3 KiB
Diff
71 lines
2.3 KiB
Diff
--- a/arch/mips/include/asm/cpu-features.h
|
|
+++ b/arch/mips/include/asm/cpu-features.h
|
|
@@ -120,6 +120,9 @@
|
|
#ifndef cpu_has_local_ebase
|
|
#define cpu_has_local_ebase 1
|
|
#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
|
|
@@ -509,7 +509,7 @@ static inline void local_r4k_flush_cache
|
|
*/
|
|
map_coherent = (cpu_has_dc_aliases &&
|
|
page_mapped(page) && !Page_dcache_dirty(page));
|
|
- if (map_coherent)
|
|
+ if (map_coherent && cpu_use_kmap_coherent)
|
|
vaddr = kmap_coherent(page, addr);
|
|
else
|
|
vaddr = kmap_atomic(page);
|
|
@@ -532,7 +532,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
|
|
@@ -203,7 +203,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 &&
|
|
page_mapped(from) && !Page_dcache_dirty(from)) {
|
|
vfrom = kmap_coherent(from, vaddr);
|
|
copy_page(vto, vfrom);
|
|
@@ -225,7 +225,7 @@ void copy_to_user_page(struct vm_area_st
|
|
struct page *page, unsigned long vaddr, void *dst, const void *src,
|
|
unsigned long len)
|
|
{
|
|
- if (cpu_has_dc_aliases &&
|
|
+ if (cpu_has_dc_aliases && cpu_use_kmap_coherent &&
|
|
page_mapped(page) && !Page_dcache_dirty(page)) {
|
|
void *vto = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK);
|
|
memcpy(vto, src, len);
|
|
@@ -243,7 +243,7 @@ void copy_from_user_page(struct vm_area_
|
|
struct page *page, unsigned long vaddr, void *dst, const void *src,
|
|
unsigned long len)
|
|
{
|
|
- if (cpu_has_dc_aliases &&
|
|
+ if (cpu_has_dc_aliases && cpu_use_kmap_coherent &&
|
|
page_mapped(page) && !Page_dcache_dirty(page)) {
|
|
void *vfrom = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK);
|
|
memcpy(dst, vfrom, len);
|