Showing the changes to include (2 of 6 files). Show all
Unified · Split
| @@ -47,11 +47,6 @@ static inline void init_MUTEX_LOCKED(struct semaphore *sem) · 46 unmodified lines | ||
| 47 | 47 | sema_init(sem, 0); |
| 48 | 48 | } |
| 49 | 49 | |
| 50 | −static inline int sema_count(struct semaphore *sem) | |
| 51 | −{ | |
| 52 | − return atomic_read(&sem->count); | |
| 53 | −} | |
| 54 | − | |
| 55 | 50 | /* |
| 56 | 51 | * special register calling convention |
| 57 | 52 | */ |
| @@ -30,6 +30,9 @@ static inline void __raw_spin_lock(raw_spinlock_t *lock) · 29 unmodified lines | ||
| 30 | 30 | __asm__ __volatile__( |
| 31 | 31 | "1: ldrex %0, [%1]\n" |
| 32 | 32 | " teq %0, #0\n" |
| 33 | +#ifdef CONFIG_CPU_32v6K | |
| 34 | +" wfene\n" | |
| 35 | +#endif | |
| 33 | 36 | " strexeq %0, %2, [%1]\n" |
| 34 | 37 | " teqeq %0, #0\n" |
| 35 | 38 | " bne 1b" |
| @@ -65,7 +68,11 @@ static inline void __raw_spin_unlock(raw_spinlock_t *lock) · 29 unmodified lines | ||
| 65 | 68 | smp_mb(); |
| 66 | 69 | |
| 67 | 70 | __asm__ __volatile__( |
| 68 | −" str %1, [%0]" | |
| 71 | +" str %1, [%0]\n" | |
| 72 | +#ifdef CONFIG_CPU_32v6K | |
| 73 | +" mcr p15, 0, %1, c7, c10, 4\n" /* DSB */ | |
| 74 | +" sev" | |
| 75 | +#endif | |
| 69 | 76 | : |
| 70 | 77 | : "r" (&lock->lock), "r" (0) |
| 71 | 78 | : "cc"); |
| @@ -87,6 +94,9 @@ static inline void __raw_write_lock(raw_rwlock_t *rw) · 15 unmodified lines | ||
| 87 | 94 | __asm__ __volatile__( |
| 88 | 95 | "1: ldrex %0, [%1]\n" |
| 89 | 96 | " teq %0, #0\n" |
| 97 | +#ifdef CONFIG_CPU_32v6K | |
| 98 | +" wfene\n" | |
| 99 | +#endif | |
| 90 | 100 | " strexeq %0, %2, [%1]\n" |
| 91 | 101 | " teq %0, #0\n" |
| 92 | 102 | " bne 1b" |
| @@ -122,7 +132,11 @@ static inline void __raw_write_unlock(raw_rwlock_t *rw) · 29 unmodified lines | ||
| 122 | 132 | smp_mb(); |
| 123 | 133 | |
| 124 | 134 | __asm__ __volatile__( |
| 125 | − "str %1, [%0]" | |
| 135 | + "str %1, [%0]\n" | |
| 136 | +#ifdef CONFIG_CPU_32v6K | |
| 137 | +" mcr p15, 0, %1, c7, c10, 4\n" /* DSB */ | |
| 138 | +" sev\n" | |
| 139 | +#endif | |
| 126 | 140 | : |
| 127 | 141 | : "r" (&rw->lock), "r" (0) |
| 128 | 142 | : "cc"); |
| @@ -148,6 +162,9 @@ static inline void __raw_read_lock(raw_rwlock_t *rw) · 19 unmodified lines | ||
| 148 | 162 | "1: ldrex %0, [%2]\n" |
| 149 | 163 | " adds %0, %0, #1\n" |
| 150 | 164 | " strexpl %1, %0, [%2]\n" |
| 165 | +#ifdef CONFIG_CPU_32v6K | |
| 166 | +" wfemi\n" | |
| 167 | +#endif | |
| 151 | 168 | " rsbpls %0, %1, #0\n" |
| 152 | 169 | " bmi 1b" |
| 153 | 170 | : "=&r" (tmp), "=&r" (tmp2) |
| @@ -169,6 +186,11 @@ static inline void __raw_read_unlock(raw_rwlock_t *rw) · 15 unmodified lines | ||
| 169 | 186 | " strex %1, %0, [%2]\n" |
| 170 | 187 | " teq %1, #0\n" |
| 171 | 188 | " bne 1b" |
| 189 | +#ifdef CONFIG_CPU_32v6K | |
| 190 | +"\n cmp %0, #0\n" | |
| 191 | +" mcreq p15, 0, %0, c7, c10, 4\n" | |
| 192 | +" seveq" | |
| 193 | +#endif | |
| 172 | 194 | : "=&r" (tmp), "=&r" (tmp2) |
| 173 | 195 | : "r" (&rw->lock) |
| 174 | 196 | : "cc"); |