diff options
Diffstat (limited to 'include/asm-sh')
-rw-r--r-- | include/asm-sh/cpu-sh2/shmparam.h | 16 | ||||
-rw-r--r-- | include/asm-sh/cpu-sh3/cacheflush.h | 48 | ||||
-rw-r--r-- | include/asm-sh/cpu-sh3/shmparam.h | 16 | ||||
-rw-r--r-- | include/asm-sh/cpu-sh4/shmparam.h | 19 | ||||
-rw-r--r-- | include/asm-sh/shmparam.h | 20 |
5 files changed, 38 insertions, 81 deletions
diff --git a/include/asm-sh/cpu-sh2/shmparam.h b/include/asm-sh/cpu-sh2/shmparam.h deleted file mode 100644 index 817c1821ee4b..000000000000 --- a/include/asm-sh/cpu-sh2/shmparam.h +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | /* | ||
2 | * include/asm-sh/cpu-sh2/shmparam.h | ||
3 | * | ||
4 | * Copyright (C) 2003 Paul Mundt | ||
5 | * | ||
6 | * This file is subject to the terms and conditions of the GNU General Public | ||
7 | * License. See the file "COPYING" in the main directory of this archive | ||
8 | * for more details. | ||
9 | */ | ||
10 | #ifndef __ASM_CPU_SH2_SHMPARAM_H | ||
11 | #define __ASM_CPU_SH2_SHMPARAM_H | ||
12 | |||
13 | #define SHMLBA PAGE_SIZE /* attach addr a multiple of this */ | ||
14 | |||
15 | #endif /* __ASM_CPU_SH2_SHMPARAM_H */ | ||
16 | |||
diff --git a/include/asm-sh/cpu-sh3/cacheflush.h b/include/asm-sh/cpu-sh3/cacheflush.h index db0cb071ea8e..97f5a64c2ab8 100644 --- a/include/asm-sh/cpu-sh3/cacheflush.h +++ b/include/asm-sh/cpu-sh3/cacheflush.h | |||
@@ -35,47 +35,41 @@ | |||
35 | /* 32KB cache, 4kb PAGE sizes need to check bit 12 */ | 35 | /* 32KB cache, 4kb PAGE sizes need to check bit 12 */ |
36 | #define CACHE_ALIAS 0x00001000 | 36 | #define CACHE_ALIAS 0x00001000 |
37 | 37 | ||
38 | extern void flush_cache_all(void); | ||
39 | extern void flush_cache_mm(struct mm_struct *mm); | ||
40 | extern void flush_cache_range(struct vm_area_struct *vma, unsigned long start, | ||
41 | unsigned long end); | ||
42 | extern void flush_cache_page(struct vm_area_struct *vma, unsigned long addr, unsigned long pfn); | ||
43 | extern void flush_dcache_page(struct page *pg); | ||
44 | extern void flush_icache_range(unsigned long start, unsigned long end); | ||
45 | extern void flush_icache_page(struct vm_area_struct *vma, struct page *page); | ||
46 | |||
47 | #define flush_dcache_mmap_lock(mapping) do { } while (0) | ||
48 | #define flush_dcache_mmap_unlock(mapping) do { } while (0) | ||
49 | |||
50 | /* SH3 has unified cache so no special action needed here */ | ||
51 | #define flush_cache_sigtramp(vaddr) do { } while (0) | ||
52 | #define flush_page_to_ram(page) do { } while (0) | ||
53 | #define flush_icache_user_range(vma,pg,adr,len) do { } while (0) | ||
54 | |||
55 | #define p3_cache_init() do { } while (0) | ||
56 | |||
57 | #define PG_mapped PG_arch_1 | 38 | #define PG_mapped PG_arch_1 |
58 | 39 | ||
59 | /* We provide our own get_unmapped_area to avoid cache alias issue */ | 40 | void flush_cache_all(void); |
60 | #define HAVE_ARCH_UNMAPPED_AREA | 41 | void flush_cache_mm(struct mm_struct *mm); |
61 | 42 | void flush_cache_range(struct vm_area_struct *vma, unsigned long start, | |
43 | unsigned long end); | ||
44 | void flush_cache_page(struct vm_area_struct *vma, unsigned long addr, unsigned long pfn); | ||
45 | void flush_dcache_page(struct page *pg); | ||
46 | void flush_icache_range(unsigned long start, unsigned long end); | ||
47 | void flush_icache_page(struct vm_area_struct *vma, struct page *page); | ||
62 | #else | 48 | #else |
63 | |||
64 | #define flush_cache_all() do { } while (0) | 49 | #define flush_cache_all() do { } while (0) |
65 | #define flush_cache_mm(mm) do { } while (0) | 50 | #define flush_cache_mm(mm) do { } while (0) |
66 | #define flush_cache_range(vma, start, end) do { } while (0) | 51 | #define flush_cache_range(vma, start, end) do { } while (0) |
67 | #define flush_cache_page(vma, vmaddr, pfn) do { } while (0) | 52 | #define flush_cache_page(vma, vmaddr, pfn) do { } while (0) |
68 | #define flush_dcache_page(page) do { } while (0) | 53 | #define flush_dcache_page(page) do { } while (0) |
69 | #define flush_dcache_mmap_lock(mapping) do { } while (0) | ||
70 | #define flush_dcache_mmap_unlock(mapping) do { } while (0) | ||
71 | #define flush_icache_range(start, end) do { } while (0) | 54 | #define flush_icache_range(start, end) do { } while (0) |
72 | #define flush_icache_page(vma,pg) do { } while (0) | 55 | #define flush_icache_page(vma,pg) do { } while (0) |
73 | #define flush_icache_user_range(vma,pg,adr,len) do { } while (0) | 56 | #endif |
57 | |||
58 | #define flush_dcache_mmap_lock(mapping) do { } while (0) | ||
59 | #define flush_dcache_mmap_unlock(mapping) do { } while (0) | ||
60 | |||
61 | /* SH3 has unified cache so no special action needed here */ | ||
74 | #define flush_cache_sigtramp(vaddr) do { } while (0) | 62 | #define flush_cache_sigtramp(vaddr) do { } while (0) |
63 | #define flush_icache_user_range(vma,pg,adr,len) do { } while (0) | ||
75 | 64 | ||
76 | #define p3_cache_init() do { } while (0) | 65 | #define p3_cache_init() do { } while (0) |
77 | 66 | ||
78 | #endif | 67 | /* |
68 | * We provide our own get_unmapped_area to avoid cache aliasing issues | ||
69 | * on SH7705 with a 32KB cache, and to page align addresses in the | ||
70 | * non-aliasing case. | ||
71 | */ | ||
72 | #define HAVE_ARCH_UNMAPPED_AREA | ||
79 | 73 | ||
80 | #endif /* __ASM_CPU_SH3_CACHEFLUSH_H */ | 74 | #endif /* __ASM_CPU_SH3_CACHEFLUSH_H */ |
81 | 75 | ||
diff --git a/include/asm-sh/cpu-sh3/shmparam.h b/include/asm-sh/cpu-sh3/shmparam.h deleted file mode 100644 index da5b5eec81ee..000000000000 --- a/include/asm-sh/cpu-sh3/shmparam.h +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | /* | ||
2 | * include/asm-sh/cpu-sh3/shmparam.h | ||
3 | * | ||
4 | * Copyright (C) 1999 Niibe Yutaka | ||
5 | * | ||
6 | * This file is subject to the terms and conditions of the GNU General Public | ||
7 | * License. See the file "COPYING" in the main directory of this archive | ||
8 | * for more details. | ||
9 | */ | ||
10 | #ifndef __ASM_CPU_SH3_SHMPARAM_H | ||
11 | #define __ASM_CPU_SH3_SHMPARAM_H | ||
12 | |||
13 | #define SHMLBA PAGE_SIZE /* attach addr a multiple of this */ | ||
14 | |||
15 | #endif /* __ASM_CPU_SH3_SHMPARAM_H */ | ||
16 | |||
diff --git a/include/asm-sh/cpu-sh4/shmparam.h b/include/asm-sh/cpu-sh4/shmparam.h deleted file mode 100644 index a5a0aa9425fe..000000000000 --- a/include/asm-sh/cpu-sh4/shmparam.h +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | /* | ||
2 | * include/asm-sh/cpu-sh4/shmparam.h | ||
3 | * | ||
4 | * Copyright (C) 1999 Niibe Yutaka | ||
5 | * | ||
6 | * This file is subject to the terms and conditions of the GNU General Public | ||
7 | * License. See the file "COPYING" in the main directory of this archive | ||
8 | * for more details. | ||
9 | */ | ||
10 | #ifndef __ASM_CPU_SH4_SHMPARAM_H | ||
11 | #define __ASM_CPU_SH4_SHMPARAM_H | ||
12 | |||
13 | /* | ||
14 | * SH-4 has D-cache alias issue | ||
15 | */ | ||
16 | #define SHMLBA (PAGE_SIZE*4) /* attach addr a multiple of this */ | ||
17 | |||
18 | #endif /* __ASM_CPU_SH4_SHMPARAM_H */ | ||
19 | |||
diff --git a/include/asm-sh/shmparam.h b/include/asm-sh/shmparam.h index 0a95604b9b66..ba1758d90106 100644 --- a/include/asm-sh/shmparam.h +++ b/include/asm-sh/shmparam.h | |||
@@ -1,8 +1,22 @@ | |||
1 | /* | ||
2 | * include/asm-sh/shmparam.h | ||
3 | * | ||
4 | * Copyright (C) 1999 Niibe Yutaka | ||
5 | * Copyright (C) 2006 Paul Mundt | ||
6 | * | ||
7 | * This file is subject to the terms and conditions of the GNU General Public | ||
8 | * License. See the file "COPYING" in the main directory of this archive | ||
9 | * for more details. | ||
10 | */ | ||
1 | #ifndef __ASM_SH_SHMPARAM_H | 11 | #ifndef __ASM_SH_SHMPARAM_H |
2 | #define __ASM_SH_SHMPARAM_H | 12 | #define __ASM_SH_SHMPARAM_H |
3 | #ifdef __KERNEL__ | ||
4 | 13 | ||
5 | #include <asm/cpu/shmparam.h> | 14 | /* |
15 | * SH-4 and SH-3 7705 have an aliasing dcache. Bump this up to a sensible value | ||
16 | * for everyone, and work out the specifics from the probed cache descriptor. | ||
17 | */ | ||
18 | #define SHMLBA 0x4000 /* attach addr a multiple of this */ | ||
19 | |||
20 | #define __ARCH_FORCE_SHMLBA | ||
6 | 21 | ||
7 | #endif /* __KERNEL__ */ | ||
8 | #endif /* __ASM_SH_SHMPARAM_H */ | 22 | #endif /* __ASM_SH_SHMPARAM_H */ |