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>

2 files changed, 4 insertions, 2 deletions

diff --git a/arch/arc/include/asm/atomic.h b/arch/arc/include/asm/atomic.h
index 5f3dcbbc0cc9..75c8226317f4 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 800e7c430ca5..a86cb84fad2a 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"                             \