forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[PATCH] CRIS update: SMP

Browse source 
Patches to support SMP.

* Each CPU has its own current_pgd.
* flush_tlb_range is implemented as flush_tlb_mm.
* Atomic operations implemented with spinlocks.
* Semaphores implemented with spinlocks.

Signed-off-by: Mikael Starvik <starvik@axis.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Mikael Starvik 2005-07-27 11:44:42 -07:00 • committed by Linus Torvalds
parent 21783c9746
commit 8d20a541b0
10 changed files with 69 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

7
include/asm-cris/arch-v10/atomic.h Normal file
View file

@ -0,0 +1,7 @@
#ifndef __ASM_CRIS_ARCH_ATOMIC__
#define __ASM_CRIS_ARCH_ATOMIC__
#define cris_atomic_save(addr, flags) local_irq_save(flags);
#define cris_atomic_restore(addr, flags) local_irq_restore(flags);
#endif

66
include/asm-cris/atomic.h
View file

@ -4,21 +4,14 @@
#define __ASM_CRIS_ATOMIC__
#include <asm/system.h>
#include <asm/arch/atomic.h>
/*
* Atomic operations that C can't guarantee us. Useful for
* resource counting etc..
*/
/*
* Make sure gcc doesn't try to be clever and move things around
* on us. We need to use _exactly_ the address the user gave us,
* not some alias that contains the same information.
*/
#define __atomic_fool_gcc(x) (*(struct { int a[100]; } *)x)
typedef struct { int counter; } atomic_t;
typedef struct { volatile int counter; } atomic_t;
#define ATOMIC_INIT(i) { (i) }
@ -30,29 +23,26 @@ typedef struct { int counter; } atomic_t;
extern __inline__ void atomic_add(int i, volatile atomic_t *v)
{
unsigned long flags;
local_save_flags(flags);
local_irq_disable();
cris_atomic_save(v, flags);
v->counter += i;
local_irq_restore(flags);
cris_atomic_restore(v, flags);
}
extern __inline__ void atomic_sub(int i, volatile atomic_t *v)
{
unsigned long flags;
local_save_flags(flags);
local_irq_disable();
cris_atomic_save(v, flags);
v->counter -= i;
local_irq_restore(flags);
cris_atomic_restore(v, flags);
}
extern __inline__ int atomic_add_return(int i, volatile atomic_t *v)
{
unsigned long flags;
int retval;
local_save_flags(flags);
local_irq_disable();
cris_atomic_save(v, flags);
retval = (v->counter += i);
local_irq_restore(flags);
cris_atomic_restore(v, flags);
return retval;
}
@ -62,10 +52,9 @@ extern __inline__ int atomic_sub_return(int i, volatile atomic_t *v)
{
unsigned long flags;
int retval;
local_save_flags(flags);
local_irq_disable();
cris_atomic_save(v, flags);
retval = (v->counter -= i);
local_irq_restore(flags);
cris_atomic_restore(v, flags);
return retval;
}
@ -73,39 +62,35 @@ extern __inline__ int atomic_sub_and_test(int i, volatile atomic_t *v)
{
int retval;
unsigned long flags;
local_save_flags(flags);
local_irq_disable();
cris_atomic_save(v, flags);
retval = (v->counter -= i) == 0;
local_irq_restore(flags);
cris_atomic_restore(v, flags);
return retval;
}
extern __inline__ void atomic_inc(volatile atomic_t *v)
{
unsigned long flags;
local_save_flags(flags);
local_irq_disable();
cris_atomic_save(v, flags);
(v->counter)++;
local_irq_restore(flags);
cris_atomic_restore(v, flags);
}
extern __inline__ void atomic_dec(volatile atomic_t *v)
{
unsigned long flags;
local_save_flags(flags);
local_irq_disable();
cris_atomic_save(v, flags);
(v->counter)--;
local_irq_restore(flags);
cris_atomic_restore(v, flags);
}
extern __inline__ int atomic_inc_return(volatile atomic_t *v)
{
unsigned long flags;
int retval;
local_save_flags(flags);
local_irq_disable();
cris_atomic_save(v, flags);
retval = (v->counter)++;
local_irq_restore(flags);
cris_atomic_restore(v, flags);
return retval;
}
@ -113,20 +98,18 @@ extern __inline__ int atomic_dec_return(volatile atomic_t *v)
{
unsigned long flags;
int retval;
local_save_flags(flags);
local_irq_disable();
cris_atomic_save(v, flags);
retval = (v->counter)--;
local_irq_restore(flags);
cris_atomic_restore(v, flags);
return retval;
}
extern __inline__ int atomic_dec_and_test(volatile atomic_t *v)
{
int retval;
unsigned long flags;
local_save_flags(flags);
local_irq_disable();
cris_atomic_save(v, flags);
retval = --(v->counter) == 0;
local_irq_restore(flags);
cris_atomic_restore(v, flags);
return retval;
}
@ -134,10 +117,9 @@ extern __inline__ int atomic_inc_and_test(volatile atomic_t *v)
{
int retval;
unsigned long flags;
local_save_flags(flags);
local_irq_disable();
cris_atomic_save(v, flags);
retval = ++(v->counter) == 0;
local_irq_restore(flags);
cris_atomic_restore(v, flags);
return retval;
}

2
include/asm-cris/mmu_context.h
View file

@ -15,7 +15,7 @@ extern void switch_mm(struct mm_struct *prev, struct mm_struct *next,
* registers like cr3 on the i386
*/
extern volatile pgd_t *current_pgd; /* defined in arch/cris/mm/fault.c */
extern volatile DEFINE_PER_CPU(pgd_t *,current_pgd); /* defined in arch/cris/mm/fault.c */
static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
{

21
include/asm-cris/semaphore.h
View file

@ -72,10 +72,9 @@ extern inline void down(struct semaphore * sem)
might_sleep();
/* atomically decrement the semaphores count, and if its negative, we wait */
local_save_flags(flags);
local_irq_disable();
cris_atomic_save(sem, flags);
failed = --(sem->count.counter) < 0;
local_irq_restore(flags);
cris_atomic_restore(sem, flags);
if(failed) {
__down(sem);
}
@ -95,10 +94,9 @@ extern inline int down_interruptible(struct semaphore * sem)
might_sleep();
/* atomically decrement the semaphores count, and if its negative, we wait */
local_save_flags(flags);
local_irq_disable();
cris_atomic_save(sem, flags);
failed = --(sem->count.counter) < 0;
local_irq_restore(flags);
cris_atomic_restore(sem, flags);
if(failed)
failed = __down_interruptible(sem);
return(failed);
@ -109,13 +107,13 @@ extern inline int down_trylock(struct semaphore * sem)
unsigned long flags;
int failed;
local_save_flags(flags);
local_irq_disable();
cris_atomic_save(sem, flags);
failed = --(sem->count.counter) < 0;
local_irq_restore(flags);
cris_atomic_restore(sem, flags);
if(failed)
failed = __down_trylock(sem);
return(failed);
}
/*
@ -130,10 +128,9 @@ extern inline void up(struct semaphore * sem)
int wakeup;
/* atomically increment the semaphores count, and if it was negative, we wake people */
local_save_flags(flags);
local_irq_disable();
cris_atomic_save(sem, flags);
wakeup = ++(sem->count.counter) <= 0;
local_irq_restore(flags);
cris_atomic_restore(sem, flags);
if(wakeup) {
__up(sem);
}

7
include/asm-cris/smp.h
View file

@ -1,4 +1,11 @@
#ifndef __ASM_SMP_H
#define __ASM_SMP_H
#include <linux/cpumask.h>
extern cpumask_t phys_cpu_present_map;
#define cpu_possible_map phys_cpu_present_map
#define __smp_processor_id() (current_thread_info()->cpu)
#endif

1
include/asm-cris/spinlock.h Normal file
View file

@ -0,0 +1 @@
#include <asm/arch/spinlock.h>

19
include/asm-cris/tlbflush.h
View file

@ -18,13 +18,26 @@
*
*/
extern void __flush_tlb_all(void);
extern void __flush_tlb_mm(struct mm_struct *mm);
extern void __flush_tlb_page(struct vm_area_struct *vma,
unsigned long addr);
#ifdef CONFIG_SMP
extern void flush_tlb_all(void);
extern void flush_tlb_mm(struct mm_struct *mm);
extern void flush_tlb_page(struct vm_area_struct *vma,
unsigned long addr);
extern void flush_tlb_range(struct vm_area_struct *vma,
unsigned long start,
unsigned long end);
#else
#define flush_tlb_all __flush_tlb_all
#define flush_tlb_mm __flush_tlb_mm
#define flush_tlb_page __flush_tlb_page
#endif
static inline void flush_tlb_range(struct vm_area_struct * vma, unsigned long start, unsigned long end)
{
flush_tlb_mm(vma->vm_mm);
}
extern inline void flush_tlb_pgtables(struct mm_struct *mm,
unsigned long start, unsigned long end)