summaryrefslogtreecommitdiffstats
path: root/arch/arc
diff options
context:
space:
mode:
authorVineet Gupta <vgupta@synopsys.com>2016-05-31 16:31:33 +0530
committerVineet Gupta <vgupta@synopsys.com>2016-06-02 10:59:22 +0530
commit42316a201a60be38b07db1ebc3a1633107ed7209 (patch)
treeabca1d4d5af079242c755149bc1411d3971f926c /arch/arc
parentd140b9bfcad9e53f1da67ad09dd5092b44d55c7b (diff)
downloadop-kernel-dev-42316a201a60be38b07db1ebc3a1633107ed7209.zip
op-kernel-dev-42316a201a60be38b07db1ebc3a1633107ed7209.tar.gz
Revert "ARCv2: spinlock/rwlock/atomics: reduce 1 instruction in exponential backoff"
This reverts commit 10971638701dedadb58c88ce4d31c9375b224ed6. The issue was fixed in hardware in HS2.1C release and there are no known external users of affected RTL - so revert thw whole delayed retry series ! Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
Diffstat (limited to 'arch/arc')
-rw-r--r--arch/arc/include/asm/atomic.h3
-rw-r--r--arch/arc/include/asm/spinlock.h3
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/arc/include/asm/atomic.h b/arch/arc/include/asm/atomic.h
index 5f3dcbb..75c8226 100644
--- a/arch/arc/include/asm/atomic.h
+++ b/arch/arc/include/asm/atomic.h
@@ -36,7 +36,8 @@
" mov %[tmp], %[delay] \n" /* tmp = delay */ \
"2: brne.d %[tmp], 0, 2b \n" /* while (tmp != 0) */ \
" sub %[tmp], %[tmp], 1 \n" /* tmp-- */ \
- " rol %[delay], %[delay] \n" /* delay *= 2 */ \
+ " asl.f %[delay], %[delay], 1 \n" /* delay *= 2 */ \
+ " mov.z %[delay], 1 \n" /* handle overflow */ \
" b 1b \n" /* start over */ \
"4: ; --- success --- \n" \
diff --git a/arch/arc/include/asm/spinlock.h b/arch/arc/include/asm/spinlock.h
index 800e7c4..a86cb84 100644
--- a/arch/arc/include/asm/spinlock.h
+++ b/arch/arc/include/asm/spinlock.h
@@ -260,7 +260,8 @@ static inline void arch_write_unlock(arch_rwlock_t *rw)
" mov %[tmp], %[delay] \n" /* tmp = delay */ \
"2: brne.d %[tmp], 0, 2b \n" /* while (tmp != 0) */ \
" sub %[tmp], %[tmp], 1 \n" /* tmp-- */ \
- " rol %[delay], %[delay] \n" /* delay *= 2 */ \
+ " asl.f %[delay], %[delay], 1 \n" /* delay *= 2 */ \
+ " mov.z %[delay], 1 \n" /* handle overflow */ \
" b 1b \n" /* start over */ \
" \n" \
"4: ; --- done --- \n" \
OpenPOWER on IntegriCloud