diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-06-29 04:40:28 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-06-29 04:40:28 -0400 |
commit | 99a0616bcdabec9005159e50af91a36cc3f8bda8 (patch) | |
tree | 4c5bb08f6b392ffbc8a07d3b1d900971c6776243 | |
parent | a839688362e32f01608838516036697e30618b39 (diff) | |
parent | 053a7b5b7617a72d7c61b6f84196d1c0f79b9849 (diff) |
Merge with ../linux-2.6-smp
-rw-r--r-- | arch/arm/kernel/smp.c | 123 | ||||
-rw-r--r-- | arch/arm/mm/init.c | 2 | ||||
-rw-r--r-- | arch/arm/mm/mm-armv.c | 2 | ||||
-rw-r--r-- | include/asm-arm/system.h | 12 | ||||
-rw-r--r-- | include/asm-arm/tlbflush.h | 28 |
5 files changed, 156 insertions, 11 deletions
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c index 34892758f098..a931409c8fe4 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c | |||
@@ -502,3 +502,126 @@ int __init setup_profiling_timer(unsigned int multiplier) | |||
502 | { | 502 | { |
503 | return -EINVAL; | 503 | return -EINVAL; |
504 | } | 504 | } |
505 | |||
506 | static int | ||
507 | on_each_cpu_mask(void (*func)(void *), void *info, int retry, int wait, | ||
508 | cpumask_t mask) | ||
509 | { | ||
510 | int ret = 0; | ||
511 | |||
512 | preempt_disable(); | ||
513 | |||
514 | ret = smp_call_function_on_cpu(func, info, retry, wait, mask); | ||
515 | if (cpu_isset(smp_processor_id(), mask)) | ||
516 | func(info); | ||
517 | |||
518 | preempt_enable(); | ||
519 | |||
520 | return ret; | ||
521 | } | ||
522 | |||
523 | /**********************************************************************/ | ||
524 | |||
525 | /* | ||
526 | * TLB operations | ||
527 | */ | ||
528 | struct tlb_args { | ||
529 | struct vm_area_struct *ta_vma; | ||
530 | unsigned long ta_start; | ||
531 | unsigned long ta_end; | ||
532 | }; | ||
533 | |||
534 | static inline void ipi_flush_tlb_all(void *ignored) | ||
535 | { | ||
536 | local_flush_tlb_all(); | ||
537 | } | ||
538 | |||
539 | static inline void ipi_flush_tlb_mm(void *arg) | ||
540 | { | ||
541 | struct mm_struct *mm = (struct mm_struct *)arg; | ||
542 | |||
543 | local_flush_tlb_mm(mm); | ||
544 | } | ||
545 | |||
546 | static inline void ipi_flush_tlb_page(void *arg) | ||
547 | { | ||
548 | struct tlb_args *ta = (struct tlb_args *)arg; | ||
549 | |||
550 | local_flush_tlb_page(ta->ta_vma, ta->ta_start); | ||
551 | } | ||
552 | |||
553 | static inline void ipi_flush_tlb_kernel_page(void *arg) | ||
554 | { | ||
555 | struct tlb_args *ta = (struct tlb_args *)arg; | ||
556 | |||
557 | local_flush_tlb_kernel_page(ta->ta_start); | ||
558 | } | ||
559 | |||
560 | static inline void ipi_flush_tlb_range(void *arg) | ||
561 | { | ||
562 | struct tlb_args *ta = (struct tlb_args *)arg; | ||
563 | |||
564 | local_flush_tlb_range(ta->ta_vma, ta->ta_start, ta->ta_end); | ||
565 | } | ||
566 | |||
567 | static inline void ipi_flush_tlb_kernel_range(void *arg) | ||
568 | { | ||
569 | struct tlb_args *ta = (struct tlb_args *)arg; | ||
570 | |||
571 | local_flush_tlb_kernel_range(ta->ta_start, ta->ta_end); | ||
572 | } | ||
573 | |||
574 | void flush_tlb_all(void) | ||
575 | { | ||
576 | on_each_cpu(ipi_flush_tlb_all, NULL, 1, 1); | ||
577 | } | ||
578 | |||
579 | void flush_tlb_mm(struct mm_struct *mm) | ||
580 | { | ||
581 | cpumask_t mask = mm->cpu_vm_mask; | ||
582 | |||
583 | on_each_cpu_mask(ipi_flush_tlb_mm, mm, 1, 1, mask); | ||
584 | } | ||
585 | |||
586 | void flush_tlb_page(struct vm_area_struct *vma, unsigned long uaddr) | ||
587 | { | ||
588 | cpumask_t mask = vma->vm_mm->cpu_vm_mask; | ||
589 | struct tlb_args ta; | ||
590 | |||
591 | ta.ta_vma = vma; | ||
592 | ta.ta_start = uaddr; | ||
593 | |||
594 | on_each_cpu_mask(ipi_flush_tlb_page, &ta, 1, 1, mask); | ||
595 | } | ||
596 | |||
597 | void flush_tlb_kernel_page(unsigned long kaddr) | ||
598 | { | ||
599 | struct tlb_args ta; | ||
600 | |||
601 | ta.ta_start = kaddr; | ||
602 | |||
603 | on_each_cpu(ipi_flush_tlb_kernel_page, &ta, 1, 1); | ||
604 | } | ||
605 | |||
606 | void flush_tlb_range(struct vm_area_struct *vma, | ||
607 | unsigned long start, unsigned long end) | ||
608 | { | ||
609 | cpumask_t mask = vma->vm_mm->cpu_vm_mask; | ||
610 | struct tlb_args ta; | ||
611 | |||
612 | ta.ta_vma = vma; | ||
613 | ta.ta_start = start; | ||
614 | ta.ta_end = end; | ||
615 | |||
616 | on_each_cpu_mask(ipi_flush_tlb_range, &ta, 1, 1, mask); | ||
617 | } | ||
618 | |||
619 | void flush_tlb_kernel_range(unsigned long start, unsigned long end) | ||
620 | { | ||
621 | struct tlb_args ta; | ||
622 | |||
623 | ta.ta_start = start; | ||
624 | ta.ta_end = end; | ||
625 | |||
626 | on_each_cpu(ipi_flush_tlb_kernel_range, &ta, 1, 1); | ||
627 | } | ||
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 6dcb23d64bf5..edffa47a4b2a 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c | |||
@@ -437,7 +437,7 @@ void __init paging_init(struct meminfo *mi, struct machine_desc *mdesc) | |||
437 | memtable_init(mi); | 437 | memtable_init(mi); |
438 | if (mdesc->map_io) | 438 | if (mdesc->map_io) |
439 | mdesc->map_io(); | 439 | mdesc->map_io(); |
440 | flush_tlb_all(); | 440 | local_flush_tlb_all(); |
441 | 441 | ||
442 | /* | 442 | /* |
443 | * initialise the zones within each node | 443 | * initialise the zones within each node |
diff --git a/arch/arm/mm/mm-armv.c b/arch/arm/mm/mm-armv.c index 052ab443ec4e..c3bd503b43a2 100644 --- a/arch/arm/mm/mm-armv.c +++ b/arch/arm/mm/mm-armv.c | |||
@@ -682,7 +682,7 @@ void __init memtable_init(struct meminfo *mi) | |||
682 | } | 682 | } |
683 | 683 | ||
684 | flush_cache_all(); | 684 | flush_cache_all(); |
685 | flush_tlb_all(); | 685 | local_flush_tlb_all(); |
686 | 686 | ||
687 | top_pmd = pmd_off_k(0xffff0000); | 687 | top_pmd = pmd_off_k(0xffff0000); |
688 | } | 688 | } |
diff --git a/include/asm-arm/system.h b/include/asm-arm/system.h index 3d0d2860b6db..cdf49f442fd2 100644 --- a/include/asm-arm/system.h +++ b/include/asm-arm/system.h | |||
@@ -290,7 +290,6 @@ do { \ | |||
290 | }) | 290 | }) |
291 | 291 | ||
292 | #ifdef CONFIG_SMP | 292 | #ifdef CONFIG_SMP |
293 | #error SMP not supported | ||
294 | 293 | ||
295 | #define smp_mb() mb() | 294 | #define smp_mb() mb() |
296 | #define smp_rmb() rmb() | 295 | #define smp_rmb() rmb() |
@@ -304,6 +303,8 @@ do { \ | |||
304 | #define smp_wmb() barrier() | 303 | #define smp_wmb() barrier() |
305 | #define smp_read_barrier_depends() do { } while(0) | 304 | #define smp_read_barrier_depends() do { } while(0) |
306 | 305 | ||
306 | #endif /* CONFIG_SMP */ | ||
307 | |||
307 | #if defined(CONFIG_CPU_SA1100) || defined(CONFIG_CPU_SA110) | 308 | #if defined(CONFIG_CPU_SA1100) || defined(CONFIG_CPU_SA110) |
308 | /* | 309 | /* |
309 | * On the StrongARM, "swp" is terminally broken since it bypasses the | 310 | * On the StrongARM, "swp" is terminally broken since it bypasses the |
@@ -316,9 +317,16 @@ do { \ | |||
316 | * | 317 | * |
317 | * We choose (1) since its the "easiest" to achieve here and is not | 318 | * We choose (1) since its the "easiest" to achieve here and is not |
318 | * dependent on the processor type. | 319 | * dependent on the processor type. |
320 | * | ||
321 | * NOTE that this solution won't work on an SMP system, so explcitly | ||
322 | * forbid it here. | ||
319 | */ | 323 | */ |
324 | #ifdef CONFIG_SMP | ||
325 | #error SMP is not supported on SA1100/SA110 | ||
326 | #else | ||
320 | #define swp_is_buggy | 327 | #define swp_is_buggy |
321 | #endif | 328 | #endif |
329 | #endif | ||
322 | 330 | ||
323 | static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size) | 331 | static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size) |
324 | { | 332 | { |
@@ -361,8 +369,6 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size | |||
361 | return ret; | 369 | return ret; |
362 | } | 370 | } |
363 | 371 | ||
364 | #endif /* CONFIG_SMP */ | ||
365 | |||
366 | #endif /* __ASSEMBLY__ */ | 372 | #endif /* __ASSEMBLY__ */ |
367 | 373 | ||
368 | #define arch_align_stack(x) (x) | 374 | #define arch_align_stack(x) (x) |
diff --git a/include/asm-arm/tlbflush.h b/include/asm-arm/tlbflush.h index 8a864b118569..9387a5e1ffe0 100644 --- a/include/asm-arm/tlbflush.h +++ b/include/asm-arm/tlbflush.h | |||
@@ -235,7 +235,7 @@ extern struct cpu_tlb_fns cpu_tlb; | |||
235 | 235 | ||
236 | #define tlb_flag(f) ((always_tlb_flags & (f)) || (__tlb_flag & possible_tlb_flags & (f))) | 236 | #define tlb_flag(f) ((always_tlb_flags & (f)) || (__tlb_flag & possible_tlb_flags & (f))) |
237 | 237 | ||
238 | static inline void flush_tlb_all(void) | 238 | static inline void local_flush_tlb_all(void) |
239 | { | 239 | { |
240 | const int zero = 0; | 240 | const int zero = 0; |
241 | const unsigned int __tlb_flag = __cpu_tlb_flags; | 241 | const unsigned int __tlb_flag = __cpu_tlb_flags; |
@@ -253,7 +253,7 @@ static inline void flush_tlb_all(void) | |||
253 | asm("mcr%? p15, 0, %0, c8, c5, 0" : : "r" (zero)); | 253 | asm("mcr%? p15, 0, %0, c8, c5, 0" : : "r" (zero)); |
254 | } | 254 | } |
255 | 255 | ||
256 | static inline void flush_tlb_mm(struct mm_struct *mm) | 256 | static inline void local_flush_tlb_mm(struct mm_struct *mm) |
257 | { | 257 | { |
258 | const int zero = 0; | 258 | const int zero = 0; |
259 | const int asid = ASID(mm); | 259 | const int asid = ASID(mm); |
@@ -282,7 +282,7 @@ static inline void flush_tlb_mm(struct mm_struct *mm) | |||
282 | } | 282 | } |
283 | 283 | ||
284 | static inline void | 284 | static inline void |
285 | flush_tlb_page(struct vm_area_struct *vma, unsigned long uaddr) | 285 | local_flush_tlb_page(struct vm_area_struct *vma, unsigned long uaddr) |
286 | { | 286 | { |
287 | const int zero = 0; | 287 | const int zero = 0; |
288 | const unsigned int __tlb_flag = __cpu_tlb_flags; | 288 | const unsigned int __tlb_flag = __cpu_tlb_flags; |
@@ -313,7 +313,7 @@ flush_tlb_page(struct vm_area_struct *vma, unsigned long uaddr) | |||
313 | asm("mcr%? p15, 0, %0, c8, c5, 1" : : "r" (uaddr)); | 313 | asm("mcr%? p15, 0, %0, c8, c5, 1" : : "r" (uaddr)); |
314 | } | 314 | } |
315 | 315 | ||
316 | static inline void flush_tlb_kernel_page(unsigned long kaddr) | 316 | static inline void local_flush_tlb_kernel_page(unsigned long kaddr) |
317 | { | 317 | { |
318 | const int zero = 0; | 318 | const int zero = 0; |
319 | const unsigned int __tlb_flag = __cpu_tlb_flags; | 319 | const unsigned int __tlb_flag = __cpu_tlb_flags; |
@@ -384,8 +384,24 @@ static inline void clean_pmd_entry(pmd_t *pmd) | |||
384 | /* | 384 | /* |
385 | * Convert calls to our calling convention. | 385 | * Convert calls to our calling convention. |
386 | */ | 386 | */ |
387 | #define flush_tlb_range(vma,start,end) __cpu_flush_user_tlb_range(start,end,vma) | 387 | #define local_flush_tlb_range(vma,start,end) __cpu_flush_user_tlb_range(start,end,vma) |
388 | #define flush_tlb_kernel_range(s,e) __cpu_flush_kern_tlb_range(s,e) | 388 | #define local_flush_tlb_kernel_range(s,e) __cpu_flush_kern_tlb_range(s,e) |
389 | |||
390 | #ifndef CONFIG_SMP | ||
391 | #define flush_tlb_all local_flush_tlb_all | ||
392 | #define flush_tlb_mm local_flush_tlb_mm | ||
393 | #define flush_tlb_page local_flush_tlb_page | ||
394 | #define flush_tlb_kernel_page local_flush_tlb_kernel_page | ||
395 | #define flush_tlb_range local_flush_tlb_range | ||
396 | #define flush_tlb_kernel_range local_flush_tlb_kernel_range | ||
397 | #else | ||
398 | extern void flush_tlb_all(void); | ||
399 | extern void flush_tlb_mm(struct mm_struct *mm); | ||
400 | extern void flush_tlb_page(struct vm_area_struct *vma, unsigned long uaddr); | ||
401 | extern void flush_tlb_kernel_page(unsigned long kaddr); | ||
402 | extern void flush_tlb_range(struct vm_area_struct *vma, unsigned long start, unsigned long end); | ||
403 | extern void flush_tlb_kernel_range(unsigned long start, unsigned long end); | ||
404 | #endif | ||
389 | 405 | ||
390 | /* | 406 | /* |
391 | * if PG_dcache_dirty is set for the page, we need to ensure that any | 407 | * if PG_dcache_dirty is set for the page, we need to ensure that any |