diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2005-10-01 06:14:17 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2005-10-29 14:32:31 -0400 |
commit | f5cfa980e535e1f77038f8037422594592208695 (patch) | |
tree | 108a922c864f5b95de9ff5f72235aaf43755f536 | |
parent | c5c96e13790122095fdf2ea74a8131e5f6b60c03 (diff) |
Use R4000 TLB routines for SB1 also.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | arch/mips/mm/Makefile | 2 | ||||
-rw-r--r-- | arch/mips/mm/tlb-sb1.c | 385 | ||||
-rw-r--r-- | include/asm-mips/hazards.h | 6 |
3 files changed, 5 insertions, 388 deletions
diff --git a/arch/mips/mm/Makefile b/arch/mips/mm/Makefile index 74fea868af33..0b738ad60fb9 100644 --- a/arch/mips/mm/Makefile +++ b/arch/mips/mm/Makefile | |||
@@ -22,7 +22,7 @@ obj-$(CONFIG_CPU_R8000) += c-r4k.o cex-gen.o pg-r4k.o tlb-r8k.o | |||
22 | obj-$(CONFIG_CPU_RM7000) += c-r4k.o cex-gen.o pg-r4k.o tlb-r4k.o | 22 | obj-$(CONFIG_CPU_RM7000) += c-r4k.o cex-gen.o pg-r4k.o tlb-r4k.o |
23 | obj-$(CONFIG_CPU_RM9000) += c-r4k.o cex-gen.o pg-r4k.o tlb-r4k.o | 23 | obj-$(CONFIG_CPU_RM9000) += c-r4k.o cex-gen.o pg-r4k.o tlb-r4k.o |
24 | obj-$(CONFIG_CPU_SB1) += c-sb1.o cerr-sb1.o cex-sb1.o pg-sb1.o \ | 24 | obj-$(CONFIG_CPU_SB1) += c-sb1.o cerr-sb1.o cex-sb1.o pg-sb1.o \ |
25 | tlb-sb1.o | 25 | tlb-r4k.o |
26 | obj-$(CONFIG_CPU_TX39XX) += c-tx39.o pg-r4k.o tlb-r3k.o | 26 | obj-$(CONFIG_CPU_TX39XX) += c-tx39.o pg-r4k.o tlb-r3k.o |
27 | obj-$(CONFIG_CPU_TX49XX) += c-r4k.o cex-gen.o pg-r4k.o tlb-r4k.o | 27 | obj-$(CONFIG_CPU_TX49XX) += c-r4k.o cex-gen.o pg-r4k.o tlb-r4k.o |
28 | obj-$(CONFIG_CPU_VR41XX) += c-r4k.o cex-gen.o pg-r4k.o tlb-r4k.o | 28 | obj-$(CONFIG_CPU_VR41XX) += c-r4k.o cex-gen.o pg-r4k.o tlb-r4k.o |
diff --git a/arch/mips/mm/tlb-sb1.c b/arch/mips/mm/tlb-sb1.c deleted file mode 100644 index f55fbbe473a5..000000000000 --- a/arch/mips/mm/tlb-sb1.c +++ /dev/null | |||
@@ -1,385 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) | ||
3 | * Copyright (C) 1997, 2001 Ralf Baechle (ralf@gnu.org) | ||
4 | * Copyright (C) 2000, 2001, 2002, 2003 Broadcom Corporation | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or | ||
7 | * modify it under the terms of the GNU General Public License | ||
8 | * as published by the Free Software Foundation; either version 2 | ||
9 | * of the License, or (at your option) any later version. | ||
10 | * | ||
11 | * This program is distributed in the hope that it will be useful, | ||
12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
14 | * GNU General Public License for more details. | ||
15 | * | ||
16 | * You should have received a copy of the GNU General Public License | ||
17 | * along with this program; if not, write to the Free Software | ||
18 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | ||
19 | */ | ||
20 | #include <linux/init.h> | ||
21 | #include <asm/mmu_context.h> | ||
22 | #include <asm/bootinfo.h> | ||
23 | #include <asm/cpu.h> | ||
24 | |||
25 | extern void build_tlb_refill_handler(void); | ||
26 | |||
27 | #define UNIQUE_ENTRYHI(idx) (CKSEG0 + ((idx) << (PAGE_SHIFT + 1))) | ||
28 | |||
29 | /* Dump the current entry* and pagemask registers */ | ||
30 | static inline void dump_cur_tlb_regs(void) | ||
31 | { | ||
32 | unsigned int entryhihi, entryhilo, entrylo0hi, entrylo0lo, entrylo1hi; | ||
33 | unsigned int entrylo1lo, pagemask; | ||
34 | |||
35 | __asm__ __volatile__ ( | ||
36 | ".set push \n" | ||
37 | ".set noreorder \n" | ||
38 | ".set mips64 \n" | ||
39 | ".set noat \n" | ||
40 | " tlbr \n" | ||
41 | " dmfc0 $1, $10 \n" | ||
42 | " dsrl32 %0, $1, 0 \n" | ||
43 | " sll %1, $1, 0 \n" | ||
44 | " dmfc0 $1, $2 \n" | ||
45 | " dsrl32 %2, $1, 0 \n" | ||
46 | " sll %3, $1, 0 \n" | ||
47 | " dmfc0 $1, $3 \n" | ||
48 | " dsrl32 %4, $1, 0 \n" | ||
49 | " sll %5, $1, 0 \n" | ||
50 | " mfc0 %6, $5 \n" | ||
51 | ".set pop \n" | ||
52 | : "=r" (entryhihi), "=r" (entryhilo), | ||
53 | "=r" (entrylo0hi), "=r" (entrylo0lo), | ||
54 | "=r" (entrylo1hi), "=r" (entrylo1lo), | ||
55 | "=r" (pagemask)); | ||
56 | |||
57 | printk("%08X%08X %08X%08X %08X%08X %08X", | ||
58 | entryhihi, entryhilo, | ||
59 | entrylo0hi, entrylo0lo, | ||
60 | entrylo1hi, entrylo1lo, | ||
61 | pagemask); | ||
62 | } | ||
63 | |||
64 | void sb1_dump_tlb(void) | ||
65 | { | ||
66 | unsigned long old_ctx; | ||
67 | unsigned long flags; | ||
68 | int entry; | ||
69 | local_irq_save(flags); | ||
70 | old_ctx = read_c0_entryhi(); | ||
71 | printk("Current TLB registers state:\n" | ||
72 | " EntryHi EntryLo0 EntryLo1 PageMask Index\n" | ||
73 | "--------------------------------------------------------------------\n"); | ||
74 | dump_cur_tlb_regs(); | ||
75 | printk(" %08X\n", read_c0_index()); | ||
76 | printk("\n\nFull TLB Dump:\n" | ||
77 | "Idx EntryHi EntryLo0 EntryLo1 PageMask\n" | ||
78 | "--------------------------------------------------------------\n"); | ||
79 | for (entry = 0; entry < current_cpu_data.tlbsize; entry++) { | ||
80 | write_c0_index(entry); | ||
81 | printk("\n%02i ", entry); | ||
82 | dump_cur_tlb_regs(); | ||
83 | } | ||
84 | printk("\n"); | ||
85 | write_c0_entryhi(old_ctx); | ||
86 | local_irq_restore(flags); | ||
87 | } | ||
88 | |||
89 | void local_flush_tlb_all(void) | ||
90 | { | ||
91 | unsigned long flags; | ||
92 | unsigned long old_ctx; | ||
93 | int entry; | ||
94 | |||
95 | local_irq_save(flags); | ||
96 | /* Save old context and create impossible VPN2 value */ | ||
97 | old_ctx = read_c0_entryhi(); | ||
98 | write_c0_entrylo0(0); | ||
99 | write_c0_entrylo1(0); | ||
100 | |||
101 | entry = read_c0_wired(); | ||
102 | while (entry < current_cpu_data.tlbsize) { | ||
103 | write_c0_entryhi(UNIQUE_ENTRYHI(entry)); | ||
104 | write_c0_index(entry); | ||
105 | tlb_write_indexed(); | ||
106 | entry++; | ||
107 | } | ||
108 | write_c0_entryhi(old_ctx); | ||
109 | local_irq_restore(flags); | ||
110 | } | ||
111 | |||
112 | |||
113 | /* | ||
114 | * Use a bogus region of memory (starting at 0) to sanitize the TLB's. | ||
115 | * Use increments of the maximum page size (16MB), and check for duplicate | ||
116 | * entries before doing a given write. Then, when we're safe from collisions | ||
117 | * with the firmware, go back and give all the entries invalid addresses with | ||
118 | * the normal flush routine. Wired entries will be killed as well! | ||
119 | */ | ||
120 | static void __init sb1_sanitize_tlb(void) | ||
121 | { | ||
122 | int entry; | ||
123 | long addr = 0; | ||
124 | |||
125 | long inc = 1<<24; /* 16MB */ | ||
126 | /* Save old context and create impossible VPN2 value */ | ||
127 | write_c0_entrylo0(0); | ||
128 | write_c0_entrylo1(0); | ||
129 | for (entry = 0; entry < current_cpu_data.tlbsize; entry++) { | ||
130 | do { | ||
131 | addr += inc; | ||
132 | write_c0_entryhi(addr); | ||
133 | tlb_probe(); | ||
134 | } while ((int)(read_c0_index()) >= 0); | ||
135 | write_c0_index(entry); | ||
136 | tlb_write_indexed(); | ||
137 | } | ||
138 | /* Now that we know we're safe from collisions, we can safely flush | ||
139 | the TLB with the "normal" routine. */ | ||
140 | local_flush_tlb_all(); | ||
141 | } | ||
142 | |||
143 | void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start, | ||
144 | unsigned long end) | ||
145 | { | ||
146 | struct mm_struct *mm = vma->vm_mm; | ||
147 | int cpu = smp_processor_id(); | ||
148 | |||
149 | if (cpu_context(cpu, mm) != 0) { | ||
150 | unsigned long flags; | ||
151 | int size; | ||
152 | |||
153 | size = (end - start + (PAGE_SIZE - 1)) >> PAGE_SHIFT; | ||
154 | size = (size + 1) >> 1; | ||
155 | local_irq_save(flags); | ||
156 | if (size <= (current_cpu_data.tlbsize/2)) { | ||
157 | int oldpid = read_c0_entryhi(); | ||
158 | int newpid = cpu_asid(cpu, mm); | ||
159 | |||
160 | start &= (PAGE_MASK << 1); | ||
161 | end += ((PAGE_SIZE << 1) - 1); | ||
162 | end &= (PAGE_MASK << 1); | ||
163 | while (start < end) { | ||
164 | int idx; | ||
165 | |||
166 | write_c0_entryhi(start | newpid); | ||
167 | start += (PAGE_SIZE << 1); | ||
168 | tlb_probe(); | ||
169 | idx = read_c0_index(); | ||
170 | write_c0_entrylo0(0); | ||
171 | write_c0_entrylo1(0); | ||
172 | if (idx < 0) | ||
173 | continue; | ||
174 | write_c0_entryhi(UNIQUE_ENTRYHI(idx)); | ||
175 | tlb_write_indexed(); | ||
176 | } | ||
177 | write_c0_entryhi(oldpid); | ||
178 | } else { | ||
179 | drop_mmu_context(mm, cpu); | ||
180 | } | ||
181 | local_irq_restore(flags); | ||
182 | } | ||
183 | } | ||
184 | |||
185 | void local_flush_tlb_kernel_range(unsigned long start, unsigned long end) | ||
186 | { | ||
187 | unsigned long flags; | ||
188 | int size; | ||
189 | |||
190 | size = (end - start + (PAGE_SIZE - 1)) >> PAGE_SHIFT; | ||
191 | size = (size + 1) >> 1; | ||
192 | local_irq_save(flags); | ||
193 | if (size <= (current_cpu_data.tlbsize/2)) { | ||
194 | int pid = read_c0_entryhi(); | ||
195 | |||
196 | start &= (PAGE_MASK << 1); | ||
197 | end += ((PAGE_SIZE << 1) - 1); | ||
198 | end &= (PAGE_MASK << 1); | ||
199 | |||
200 | while (start < end) { | ||
201 | int idx; | ||
202 | |||
203 | write_c0_entryhi(start); | ||
204 | start += (PAGE_SIZE << 1); | ||
205 | tlb_probe(); | ||
206 | idx = read_c0_index(); | ||
207 | write_c0_entrylo0(0); | ||
208 | write_c0_entrylo1(0); | ||
209 | if (idx < 0) | ||
210 | continue; | ||
211 | write_c0_entryhi(UNIQUE_ENTRYHI(idx)); | ||
212 | tlb_write_indexed(); | ||
213 | } | ||
214 | write_c0_entryhi(pid); | ||
215 | } else { | ||
216 | local_flush_tlb_all(); | ||
217 | } | ||
218 | local_irq_restore(flags); | ||
219 | } | ||
220 | |||
221 | void local_flush_tlb_page(struct vm_area_struct *vma, unsigned long page) | ||
222 | { | ||
223 | int cpu = smp_processor_id(); | ||
224 | |||
225 | if (cpu_context(cpu, vma->vm_mm) != 0) { | ||
226 | unsigned long flags; | ||
227 | int oldpid, newpid, idx; | ||
228 | |||
229 | newpid = cpu_asid(cpu, vma->vm_mm); | ||
230 | page &= (PAGE_MASK << 1); | ||
231 | local_irq_save(flags); | ||
232 | oldpid = read_c0_entryhi(); | ||
233 | write_c0_entryhi(page | newpid); | ||
234 | tlb_probe(); | ||
235 | idx = read_c0_index(); | ||
236 | write_c0_entrylo0(0); | ||
237 | write_c0_entrylo1(0); | ||
238 | if (idx < 0) | ||
239 | goto finish; | ||
240 | /* Make sure all entries differ. */ | ||
241 | write_c0_entryhi(UNIQUE_ENTRYHI(idx)); | ||
242 | tlb_write_indexed(); | ||
243 | |||
244 | finish: | ||
245 | write_c0_entryhi(oldpid); | ||
246 | local_irq_restore(flags); | ||
247 | } | ||
248 | } | ||
249 | |||
250 | /* | ||
251 | * Remove one kernel space TLB entry. This entry is assumed to be marked | ||
252 | * global so we don't do the ASID thing. | ||
253 | */ | ||
254 | void local_flush_tlb_one(unsigned long page) | ||
255 | { | ||
256 | unsigned long flags; | ||
257 | int oldpid, idx; | ||
258 | |||
259 | local_irq_save(flags); | ||
260 | oldpid = read_c0_entryhi(); | ||
261 | page &= (PAGE_MASK << 1); | ||
262 | write_c0_entryhi(page); | ||
263 | tlb_probe(); | ||
264 | idx = read_c0_index(); | ||
265 | write_c0_entrylo0(0); | ||
266 | write_c0_entrylo1(0); | ||
267 | if (idx >= 0) { | ||
268 | /* Make sure all entries differ. */ | ||
269 | write_c0_entryhi(UNIQUE_ENTRYHI(idx)); | ||
270 | tlb_write_indexed(); | ||
271 | } | ||
272 | |||
273 | write_c0_entryhi(oldpid); | ||
274 | local_irq_restore(flags); | ||
275 | } | ||
276 | |||
277 | /* All entries common to a mm share an asid. To effectively flush | ||
278 | these entries, we just bump the asid. */ | ||
279 | void local_flush_tlb_mm(struct mm_struct *mm) | ||
280 | { | ||
281 | int cpu; | ||
282 | |||
283 | preempt_disable(); | ||
284 | |||
285 | cpu = smp_processor_id(); | ||
286 | |||
287 | if (cpu_context(cpu, mm) != 0) { | ||
288 | drop_mmu_context(mm, cpu); | ||
289 | } | ||
290 | |||
291 | preempt_enable(); | ||
292 | } | ||
293 | |||
294 | /* Stolen from mips32 routines */ | ||
295 | |||
296 | void __update_tlb(struct vm_area_struct *vma, unsigned long address, pte_t pte) | ||
297 | { | ||
298 | unsigned long flags; | ||
299 | pgd_t *pgdp; | ||
300 | pud_t *pudp; | ||
301 | pmd_t *pmdp; | ||
302 | pte_t *ptep; | ||
303 | int idx, pid; | ||
304 | |||
305 | /* | ||
306 | * Handle debugger faulting in for debugee. | ||
307 | */ | ||
308 | if (current->active_mm != vma->vm_mm) | ||
309 | return; | ||
310 | |||
311 | local_irq_save(flags); | ||
312 | |||
313 | pid = read_c0_entryhi() & ASID_MASK; | ||
314 | address &= (PAGE_MASK << 1); | ||
315 | write_c0_entryhi(address | pid); | ||
316 | pgdp = pgd_offset(vma->vm_mm, address); | ||
317 | tlb_probe(); | ||
318 | pudp = pud_offset(pgdp, address); | ||
319 | pmdp = pmd_offset(pudp, address); | ||
320 | idx = read_c0_index(); | ||
321 | ptep = pte_offset_map(pmdp, address); | ||
322 | |||
323 | #if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32_R1) | ||
324 | write_c0_entrylo0(ptep->pte_high); | ||
325 | ptep++; | ||
326 | write_c0_entrylo1(ptep->pte_high); | ||
327 | #else | ||
328 | write_c0_entrylo0(pte_val(*ptep++) >> 6); | ||
329 | write_c0_entrylo1(pte_val(*ptep) >> 6); | ||
330 | #endif | ||
331 | if (idx < 0) | ||
332 | tlb_write_random(); | ||
333 | else | ||
334 | tlb_write_indexed(); | ||
335 | local_irq_restore(flags); | ||
336 | } | ||
337 | |||
338 | void __init add_wired_entry(unsigned long entrylo0, unsigned long entrylo1, | ||
339 | unsigned long entryhi, unsigned long pagemask) | ||
340 | { | ||
341 | unsigned long flags; | ||
342 | unsigned long wired; | ||
343 | unsigned long old_pagemask; | ||
344 | unsigned long old_ctx; | ||
345 | |||
346 | local_irq_save(flags); | ||
347 | /* Save old context and create impossible VPN2 value */ | ||
348 | old_ctx = read_c0_entryhi(); | ||
349 | old_pagemask = read_c0_pagemask(); | ||
350 | wired = read_c0_wired(); | ||
351 | write_c0_wired(wired + 1); | ||
352 | write_c0_index(wired); | ||
353 | |||
354 | write_c0_pagemask(pagemask); | ||
355 | write_c0_entryhi(entryhi); | ||
356 | write_c0_entrylo0(entrylo0); | ||
357 | write_c0_entrylo1(entrylo1); | ||
358 | tlb_write_indexed(); | ||
359 | |||
360 | write_c0_entryhi(old_ctx); | ||
361 | write_c0_pagemask(old_pagemask); | ||
362 | |||
363 | local_flush_tlb_all(); | ||
364 | local_irq_restore(flags); | ||
365 | } | ||
366 | |||
367 | /* | ||
368 | * This is called from loadmmu.c. We have to set up all the | ||
369 | * memory management function pointers, as well as initialize | ||
370 | * the caches and tlbs | ||
371 | */ | ||
372 | void tlb_init(void) | ||
373 | { | ||
374 | write_c0_pagemask(PM_DEFAULT_MASK); | ||
375 | write_c0_wired(0); | ||
376 | |||
377 | /* | ||
378 | * We don't know what state the firmware left the TLB's in, so this is | ||
379 | * the ultra-conservative way to flush the TLB's and avoid machine | ||
380 | * check exceptions due to duplicate TLB entries | ||
381 | */ | ||
382 | sb1_sanitize_tlb(); | ||
383 | |||
384 | build_tlb_refill_handler(); | ||
385 | } | ||
diff --git a/include/asm-mips/hazards.h b/include/asm-mips/hazards.h index 6bd265b34a4c..5250231e936e 100644 --- a/include/asm-mips/hazards.h +++ b/include/asm-mips/hazards.h | |||
@@ -74,7 +74,8 @@ | |||
74 | #define irq_disable_hazard | 74 | #define irq_disable_hazard |
75 | _ehb | 75 | _ehb |
76 | 76 | ||
77 | #elif defined(CONFIG_CPU_R10000) || defined(CONFIG_CPU_RM9000) | 77 | #elif defined(CONFIG_CPU_R10000) || defined(CONFIG_CPU_RM9000) || \ |
78 | defined(CONFIG_CPU_SB1) | ||
78 | 79 | ||
79 | /* | 80 | /* |
80 | * R10000 rocks - all hazards handled in hardware, so this becomes a nobrainer. | 81 | * R10000 rocks - all hazards handled in hardware, so this becomes a nobrainer. |
@@ -180,7 +181,8 @@ __asm__( | |||
180 | __asm__ __volatile__( \ | 181 | __asm__ __volatile__( \ |
181 | "back_to_back_c0_hazard") | 182 | "back_to_back_c0_hazard") |
182 | 183 | ||
183 | #elif defined(CONFIG_CPU_R10000) || defined(CONFIG_CPU_RM9000) | 184 | #elif defined(CONFIG_CPU_R10000) || defined(CONFIG_CPU_RM9000) || \ |
185 | defined(CONFIG_CPU_SB1) | ||
184 | 186 | ||
185 | /* | 187 | /* |
186 | * R10000 rocks - all hazards handled in hardware, so this becomes a nobrainer. | 188 | * R10000 rocks - all hazards handled in hardware, so this becomes a nobrainer. |