Skip to content

L
linux-davinci
Commit 2fa9e7e2 authored by David Howells's avatar David Howells Committed by Linus Torvalds
Browse files
Options

[PATCH] frv: drop 8/16-bit xchg and cmpxchg 

Drop support for 8-bit and 16-bit xchg and cmpxchg emulation and implements
32-bit xchg with the SWAP/SWAPI instruction.
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2919b510
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 183 deletions
arch/frv/lib/atomic-ops.S
View file @ 2fa9e7e2
...@@ -127,48 +127,6 @@ atomic_sub_return: ...@@ -127,48 +127,6 @@ atomic_sub_return:
.size atomic_sub_return, .-atomic_sub_return .size atomic_sub_return, .-atomic_sub_return
###############################################################################
#
# uint8_t __xchg_8(uint8_t i, uint8_t *v)
#
###############################################################################
.globl __xchg_8
.type __xchg_8,@function
__xchg_8:
or.p gr8,gr8,gr10
0:
orcc gr0,gr0,gr0,icc3 /* set ICC3.Z */
ckeq icc3,cc7
ldub.p @(gr9,gr0),gr8 /* LD.P/ORCR must be atomic */
orcr cc7,cc7,cc3 /* set CC3 to true */
cstb.p gr10,@(gr9,gr0) ,cc3,#1
corcc gr29,gr29,gr0 ,cc3,#1 /* clear ICC3.Z if store happens */
beq icc3,#0,0b
bralr
.size __xchg_8, .-__xchg_8
###############################################################################
#
# uint16_t __xchg_16(uint16_t i, uint16_t *v)
#
###############################################################################
.globl __xchg_16
.type __xchg_16,@function
__xchg_16:
or.p gr8,gr8,gr10
0:
orcc gr0,gr0,gr0,icc3 /* set ICC3.Z */
ckeq icc3,cc7
lduh.p @(gr9,gr0),gr8 /* LD.P/ORCR must be atomic */
orcr cc7,cc7,cc3 /* set CC3 to true */
csth.p gr10,@(gr9,gr0) ,cc3,#1
corcc gr29,gr29,gr0 ,cc3,#1 /* clear ICC3.Z if store happens */
beq icc3,#0,0b
bralr
.size __xchg_16, .-__xchg_16
############################################################################### ###############################################################################
# #
# uint32_t __xchg_32(uint32_t i, uint32_t *v) # uint32_t __xchg_32(uint32_t i, uint32_t *v)
...@@ -190,56 +148,6 @@ __xchg_32: ...@@ -190,56 +148,6 @@ __xchg_32:
.size __xchg_32, .-__xchg_32 .size __xchg_32, .-__xchg_32
###############################################################################
#
# uint8_t __cmpxchg_8(uint8_t *v, uint8_t test, uint8_t new)
#
###############################################################################
.globl __cmpxchg_8
.type __cmpxchg_8,@function
__cmpxchg_8:
or.p gr8,gr8,gr11
0:
orcc gr0,gr0,gr0,icc3
ckeq icc3,cc7
ldub.p @(gr11,gr0),gr8
orcr cc7,cc7,cc3
sub gr8,gr9,gr7
sllicc gr7,#24,gr0,icc0
bne icc0,#0,1f
cstb.p gr10,@(gr11,gr0) ,cc3,#1
corcc gr29,gr29,gr0 ,cc3,#1
beq icc3,#0,0b
1:
bralr
.size __cmpxchg_8, .-__cmpxchg_8
###############################################################################
#
# uint16_t __cmpxchg_16(uint16_t *v, uint16_t test, uint16_t new)
#
###############################################################################
.globl __cmpxchg_16
.type __cmpxchg_16,@function
__cmpxchg_16:
or.p gr8,gr8,gr11
0:
orcc gr0,gr0,gr0,icc3
ckeq icc3,cc7
lduh.p @(gr11,gr0),gr8
orcr cc7,cc7,cc3
sub gr8,gr9,gr7
sllicc gr7,#16,gr0,icc0
bne icc0,#0,1f
csth.p gr10,@(gr11,gr0) ,cc3,#1
corcc gr29,gr29,gr0 ,cc3,#1
beq icc3,#0,0b
1:
bralr
.size __cmpxchg_16, .-__cmpxchg_16
############################################################################### ###############################################################################
# #
# uint32_t __cmpxchg_32(uint32_t *v, uint32_t test, uint32_t new) # uint32_t __cmpxchg_32(uint32_t *v, uint32_t test, uint32_t new)
......
include/asm-frv/atomic.h
View file @ 2fa9e7e2
...@@ -218,51 +218,12 @@ extern unsigned long atomic_test_and_XOR_mask(unsigned long mask, volatile unsig ...@@ -218,51 +218,12 @@ extern unsigned long atomic_test_and_XOR_mask(unsigned long mask, volatile unsig
__typeof__(*(ptr)) __xg_orig; \ __typeof__(*(ptr)) __xg_orig; \
\ \
switch (sizeof(__xg_orig)) { \ switch (sizeof(__xg_orig)) { \
case 1: \
asm volatile( \
"0: \n" \
" orcc gr0,gr0,gr0,icc3 \n" \
" ckeq icc3,cc7 \n" \
" ldub.p %M0,%1 \n" \
" orcr cc7,cc7,cc3 \n" \
" cstb.p %2,%M0 ,cc3,#1 \n" \
" corcc gr29,gr29,gr0 ,cc3,#1 \n" \
" beq icc3,#0,0b \n" \
: "+U"(*__xg_ptr), "=&r"(__xg_orig) \
: "r"(x) \
: "memory", "cc7", "cc3", "icc3" \
); \
break; \
\
case 2: \
asm volatile( \
"0: \n" \
" orcc gr0,gr0,gr0,icc3 \n" \
" ckeq icc3,cc7 \n" \
" lduh.p %M0,%1 \n" \
" orcr cc7,cc7,cc3 \n" \
" csth.p %2,%M0 ,cc3,#1 \n" \
" corcc gr29,gr29,gr0 ,cc3,#1 \n" \
" beq icc3,#0,0b \n" \
: "+U"(*__xg_ptr), "=&r"(__xg_orig) \
: "r"(x) \
: "memory", "cc7", "cc3", "icc3" \
); \
break; \
\
case 4: \ case 4: \
asm volatile( \ asm volatile( \
"0: \n" \ "swap%I0 %2,%M0" \
" orcc gr0,gr0,gr0,icc3 \n" \ : "+m"(*__xg_ptr), "=&r"(__xg_orig) \
" ckeq icc3,cc7 \n" \
" ld.p %M0,%1 \n" \
" orcr cc7,cc7,cc3 \n" \
" cst.p %2,%M0 ,cc3,#1 \n" \
" corcc gr29,gr29,gr0 ,cc3,#1 \n" \
" beq icc3,#0,0b \n" \
: "+U"(*__xg_ptr), "=&r"(__xg_orig) \
: "r"(x) \ : "r"(x) \
: "memory", "cc7", "cc3", "icc3" \ : "memory" \
); \ ); \
break; \ break; \
\ \
...@@ -277,8 +238,6 @@ extern unsigned long atomic_test_and_XOR_mask(unsigned long mask, volatile unsig ...@@ -277,8 +238,6 @@ extern unsigned long atomic_test_and_XOR_mask(unsigned long mask, volatile unsig
#else #else
extern uint8_t __xchg_8 (uint8_t i, volatile void *v);
extern uint16_t __xchg_16(uint16_t i, volatile void *v);
extern uint32_t __xchg_32(uint32_t i, volatile void *v); extern uint32_t __xchg_32(uint32_t i, volatile void *v);
#define xchg(ptr, x) \ #define xchg(ptr, x) \
...@@ -287,8 +246,6 @@ extern uint32_t __xchg_32(uint32_t i, volatile void *v); ...@@ -287,8 +246,6 @@ extern uint32_t __xchg_32(uint32_t i, volatile void *v);
__typeof__(*(ptr)) __xg_orig; \ __typeof__(*(ptr)) __xg_orig; \
\ \
switch (sizeof(__xg_orig)) { \ switch (sizeof(__xg_orig)) { \
case 1: __xg_orig = (__typeof__(*(ptr))) __xchg_8 ((uint8_t) x, __xg_ptr); break; \
case 2: __xg_orig = (__typeof__(*(ptr))) __xchg_16((uint16_t) x, __xg_ptr); break; \
case 4: __xg_orig = (__typeof__(*(ptr))) __xchg_32((uint32_t) x, __xg_ptr); break; \ case 4: __xg_orig = (__typeof__(*(ptr))) __xchg_32((uint32_t) x, __xg_ptr); break; \
default: \ default: \
__xg_orig = 0; \ __xg_orig = 0; \
...@@ -318,46 +275,6 @@ extern uint32_t __xchg_32(uint32_t i, volatile void *v); ...@@ -318,46 +275,6 @@ extern uint32_t __xchg_32(uint32_t i, volatile void *v);
__typeof__(*(ptr)) __xg_new = (new); \ __typeof__(*(ptr)) __xg_new = (new); \
\ \
switch (sizeof(__xg_orig)) { \ switch (sizeof(__xg_orig)) { \
case 1: \
asm volatile( \
"0: \n" \
" orcc gr0,gr0,gr0,icc3 \n" \
" ckeq icc3,cc7 \n" \
" ldub.p %M0,%1 \n" \
" orcr cc7,cc7,cc3 \n" \
" sub%I4 %1,%4,%2 \n" \
" sllcc %2,#24,gr0,icc0 \n" \
" bne icc0,#0,1f \n" \
" cstb.p %3,%M0 ,cc3,#1 \n" \
" corcc gr29,gr29,gr0 ,cc3,#1 \n" \
" beq icc3,#0,0b \n" \
"1: \n" \
: "+U"(*__xg_ptr), "=&r"(__xg_orig), "=&r"(__xg_tmp) \
: "r"(__xg_new), "NPr"(__xg_test) \
: "memory", "cc7", "cc3", "icc3", "icc0" \
); \
break; \
\
case 2: \
asm volatile( \
"0: \n" \
" orcc gr0,gr0,gr0,icc3 \n" \
" ckeq icc3,cc7 \n" \
" lduh.p %M0,%1 \n" \
" orcr cc7,cc7,cc3 \n" \
" sub%I4 %1,%4,%2 \n" \
" sllcc %2,#16,gr0,icc0 \n" \
" bne icc0,#0,1f \n" \
" csth.p %3,%M0 ,cc3,#1 \n" \
" corcc gr29,gr29,gr0 ,cc3,#1 \n" \
" beq icc3,#0,0b \n" \
"1: \n" \
: "+U"(*__xg_ptr), "=&r"(__xg_orig), "=&r"(__xg_tmp) \
: "r"(__xg_new), "NPr"(__xg_test) \
: "memory", "cc7", "cc3", "icc3", "icc0" \
); \
break; \
\
case 4: \ case 4: \
asm volatile( \ asm volatile( \
"0: \n" \ "0: \n" \
...@@ -388,8 +305,6 @@ extern uint32_t __xchg_32(uint32_t i, volatile void *v); ...@@ -388,8 +305,6 @@ extern uint32_t __xchg_32(uint32_t i, volatile void *v);
#else #else
extern uint8_t __cmpxchg_8 (uint8_t *v, uint8_t test, uint8_t new);
extern uint16_t __cmpxchg_16(uint16_t *v, uint16_t test, uint16_t new);
extern uint32_t __cmpxchg_32(uint32_t *v, uint32_t test, uint32_t new); extern uint32_t __cmpxchg_32(uint32_t *v, uint32_t test, uint32_t new);
#define cmpxchg(ptr, test, new) \ #define cmpxchg(ptr, test, new) \
...@@ -400,8 +315,6 @@ extern uint32_t __cmpxchg_32(uint32_t *v, uint32_t test, uint32_t new); ...@@ -400,8 +315,6 @@ extern uint32_t __cmpxchg_32(uint32_t *v, uint32_t test, uint32_t new);
__typeof__(*(ptr)) __xg_new = (new); \ __typeof__(*(ptr)) __xg_new = (new); \
\ \
switch (sizeof(__xg_orig)) { \ switch (sizeof(__xg_orig)) { \
case 1: __xg_orig = __cmpxchg_8 (__xg_ptr, __xg_test, __xg_new); break; \
case 2: __xg_orig = __cmpxchg_16(__xg_ptr, __xg_test, __xg_new); break; \
case 4: __xg_orig = __cmpxchg_32(__xg_ptr, __xg_test, __xg_new); break; \ case 4: __xg_orig = __cmpxchg_32(__xg_ptr, __xg_test, __xg_new); break; \
default: \ default: \
__xg_orig = 0; \ __xg_orig = 0; \
...@@ -414,7 +327,7 @@ extern uint32_t __cmpxchg_32(uint32_t *v, uint32_t test, uint32_t new); ...@@ -414,7 +327,7 @@ extern uint32_t __cmpxchg_32(uint32_t *v, uint32_t test, uint32_t new);
#endif #endif
#define atomic_cmpxchg(v, old, new) ((int)cmpxchg(&((v)->counter), old, new)) #define atomic_cmpxchg(v, old, new) (cmpxchg(&((v)->counter), old, new))
#define atomic_add_unless(v, a, u) \ #define atomic_add_unless(v, a, u) \
({ \ ({ \
...@@ -424,6 +337,7 @@ extern uint32_t __cmpxchg_32(uint32_t *v, uint32_t test, uint32_t new); ...@@ -424,6 +337,7 @@ extern uint32_t __cmpxchg_32(uint32_t *v, uint32_t test, uint32_t new);
c = old; \ c = old; \
c != (u); \ c != (u); \
}) })
#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
#include <asm-generic/atomic.h> #include <asm-generic/atomic.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment