summaryrefslogtreecommitdiff
path: root/core/minute-ia
diff options
context:
space:
mode:
authorDawid Niedzwiecki <dn@semihalf.com>2020-10-28 09:40:57 +0100
committerCommit Bot <commit-bot@chromium.org>2020-10-30 07:03:12 +0000
commit9b1733d659d764140c825c0f32dab43de27410be (patch)
tree79774bb583961265bde08fb6cf710af170143e33 /core/minute-ia
parentdeef4e1aa7c347740e6c12e2ca3d6893ec19c2fb (diff)
downloadchrome-ec-9b1733d659d764140c825c0f32dab43de27410be.tar.gz
atomic: remove deprecated atomic functions
Remove deprecated_atomic_* functions since only atomic_* are now used. BUG=b:169151160 BRANCH=none TEST=buildall Signed-off-by: Dawid Niedzwiecki <dn@semihalf.com> Change-Id: I6b25cc81aec126662ed779cf0f9309dcb77a754e Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2505142 Reviewed-by: Jett Rink <jettrink@chromium.org> Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Diffstat (limited to 'core/minute-ia')
-rw-r--r--core/minute-ia/atomic.h67
1 files changed, 0 insertions, 67 deletions
diff --git a/core/minute-ia/atomic.h b/core/minute-ia/atomic.h
index f55018d445..7c63268963 100644
--- a/core/minute-ia/atomic.h
+++ b/core/minute-ia/atomic.h
@@ -14,14 +14,6 @@
typedef int atomic_t;
typedef atomic_t atomic_val_t;
-#define ATOMIC_OP(asm_op, a, v) do { \
- __asm__ __volatile__ ( \
- ASM_LOCK_PREFIX #asm_op " %1, %0\n" \
- : "+m" (*a) \
- : "ir" (v) \
- : "memory"); \
-} while (0)
-
static inline int bool_compare_and_swap_u32(uint32_t *var, uint32_t old_value,
uint32_t new_value)
{
@@ -35,100 +27,41 @@ static inline int bool_compare_and_swap_u32(uint32_t *var, uint32_t old_value,
return (_old_value == old_value);
}
-/*
- * The atomic_* functions are marked as deprecated as a part of the process of
- * transaction to Zephyr compatible atomic functions. These prefixes will be
- * removed in the following patches. Please see b:169151160 for more details.
- */
-
-static inline void deprecated_atomic_or_u8(uint8_t *addr, uint8_t bits)
-{
- ATOMIC_OP(or, addr, bits);
-}
-
static inline atomic_val_t atomic_or_u8(uint8_t *addr, uint8_t bits)
{
return __atomic_fetch_or(addr, bits, __ATOMIC_SEQ_CST);
}
-static inline void deprecated_atomic_and_u8(uint8_t *addr, uint8_t bits)
-{
- ATOMIC_OP(and, addr, bits);
-}
-
static inline atomic_val_t atomic_and_u8(uint8_t *addr, uint8_t bits)
{
return __atomic_fetch_and(addr, bits, __ATOMIC_SEQ_CST);
}
-static inline void deprecated_atomic_clear_bits(uint32_t volatile *addr,
- uint32_t bits)
-{
- ATOMIC_OP(andl, addr, ~bits);
-}
-
static inline void atomic_clear_bits(atomic_t *addr, atomic_val_t bits)
{
__atomic_fetch_and(addr, ~bits, __ATOMIC_SEQ_CST);
}
-static inline void deprecated_atomic_or(uint32_t volatile *addr, uint32_t bits)
-{
- ATOMIC_OP(orl, addr, bits);
-}
-
static inline atomic_val_t atomic_or(atomic_t *addr, atomic_val_t bits)
{
return __atomic_fetch_or(addr, bits, __ATOMIC_SEQ_CST);
}
-static inline void deprecated_atomic_add(uint32_t volatile *addr,
- uint32_t value)
-{
- ATOMIC_OP(addl, addr, value);
-}
-
static inline atomic_val_t atomic_add(atomic_t *addr, atomic_val_t value)
{
return __atomic_fetch_add(addr, value, __ATOMIC_SEQ_CST);
}
-static inline void deprecated_atomic_and(uint32_t volatile *addr,
- uint32_t value)
-{
- ATOMIC_OP(andl, addr, value);
-}
-
static inline atomic_val_t atomic_and(atomic_t *addr, atomic_val_t bits)
{
return __atomic_fetch_and(addr, bits, __ATOMIC_SEQ_CST);
}
-static inline void deprecated_atomic_sub(uint32_t volatile *addr,
- uint32_t value)
-{
- ATOMIC_OP(subl, addr, value);
-}
-
static inline atomic_val_t atomic_sub(atomic_t *addr, atomic_val_t value)
{
return __atomic_fetch_sub(addr, value, __ATOMIC_SEQ_CST);
}
-static inline uint32_t deprecated_atomic_read_clear(uint32_t volatile *addr)
-{
- int ret = 0;
-
- if (*addr == 0)
- return 0;
-
- asm volatile(ASM_LOCK_PREFIX "xchgl %0, %1\n"
- : "+r" (ret), "+m" (*addr)
- : : "memory", "cc");
-
- return ret;
-}
-
static inline atomic_val_t atomic_read_clear(atomic_t *addr)
{
return __atomic_exchange_n(addr, 0, __ATOMIC_SEQ_CST);