diff options
Diffstat (limited to 'arch/arm/include/asm/spinlock.h')
-rw-r--r-- | arch/arm/include/asm/spinlock.h | 36 |
1 files changed, 23 insertions, 13 deletions
diff --git a/arch/arm/include/asm/spinlock.h b/arch/arm/include/asm/spinlock.h index c91c64cab922..17eb355707dd 100644 --- a/arch/arm/include/asm/spinlock.h +++ b/arch/arm/include/asm/spinlock.h | |||
@@ -5,6 +5,22 @@ | |||
5 | #error SMP not supported on pre-ARMv6 CPUs | 5 | #error SMP not supported on pre-ARMv6 CPUs |
6 | #endif | 6 | #endif |
7 | 7 | ||
8 | static inline void dsb_sev(void) | ||
9 | { | ||
10 | #if __LINUX_ARM_ARCH__ >= 7 | ||
11 | __asm__ __volatile__ ( | ||
12 | "dsb\n" | ||
13 | "sev" | ||
14 | ); | ||
15 | #elif defined(CONFIG_CPU_32v6K) | ||
16 | __asm__ __volatile__ ( | ||
17 | "mcr p15, 0, %0, c7, c10, 4\n" | ||
18 | "sev" | ||
19 | : : "r" (0) | ||
20 | ); | ||
21 | #endif | ||
22 | } | ||
23 | |||
8 | /* | 24 | /* |
9 | * ARMv6 Spin-locking. | 25 | * ARMv6 Spin-locking. |
10 | * | 26 | * |
@@ -69,13 +85,11 @@ static inline void arch_spin_unlock(arch_spinlock_t *lock) | |||
69 | 85 | ||
70 | __asm__ __volatile__( | 86 | __asm__ __volatile__( |
71 | " str %1, [%0]\n" | 87 | " str %1, [%0]\n" |
72 | #ifdef CONFIG_CPU_32v6K | ||
73 | " mcr p15, 0, %1, c7, c10, 4\n" /* DSB */ | ||
74 | " sev" | ||
75 | #endif | ||
76 | : | 88 | : |
77 | : "r" (&lock->lock), "r" (0) | 89 | : "r" (&lock->lock), "r" (0) |
78 | : "cc"); | 90 | : "cc"); |
91 | |||
92 | dsb_sev(); | ||
79 | } | 93 | } |
80 | 94 | ||
81 | /* | 95 | /* |
@@ -132,13 +146,11 @@ static inline void arch_write_unlock(arch_rwlock_t *rw) | |||
132 | 146 | ||
133 | __asm__ __volatile__( | 147 | __asm__ __volatile__( |
134 | "str %1, [%0]\n" | 148 | "str %1, [%0]\n" |
135 | #ifdef CONFIG_CPU_32v6K | ||
136 | " mcr p15, 0, %1, c7, c10, 4\n" /* DSB */ | ||
137 | " sev\n" | ||
138 | #endif | ||
139 | : | 149 | : |
140 | : "r" (&rw->lock), "r" (0) | 150 | : "r" (&rw->lock), "r" (0) |
141 | : "cc"); | 151 | : "cc"); |
152 | |||
153 | dsb_sev(); | ||
142 | } | 154 | } |
143 | 155 | ||
144 | /* write_can_lock - would write_trylock() succeed? */ | 156 | /* write_can_lock - would write_trylock() succeed? */ |
@@ -188,14 +200,12 @@ static inline void arch_read_unlock(arch_rwlock_t *rw) | |||
188 | " strex %1, %0, [%2]\n" | 200 | " strex %1, %0, [%2]\n" |
189 | " teq %1, #0\n" | 201 | " teq %1, #0\n" |
190 | " bne 1b" | 202 | " bne 1b" |
191 | #ifdef CONFIG_CPU_32v6K | ||
192 | "\n cmp %0, #0\n" | ||
193 | " mcreq p15, 0, %0, c7, c10, 4\n" | ||
194 | " seveq" | ||
195 | #endif | ||
196 | : "=&r" (tmp), "=&r" (tmp2) | 203 | : "=&r" (tmp), "=&r" (tmp2) |
197 | : "r" (&rw->lock) | 204 | : "r" (&rw->lock) |
198 | : "cc"); | 205 | : "cc"); |
206 | |||
207 | if (tmp == 0) | ||
208 | dsb_sev(); | ||
199 | } | 209 | } |
200 | 210 | ||
201 | static inline int arch_read_trylock(arch_rwlock_t *rw) | 211 | static inline int arch_read_trylock(arch_rwlock_t *rw) |