diff options
author | Dawid Niedzwiecki <dn@semihalf.com> | 2020-10-06 12:55:46 +0200 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2020-10-13 08:55:17 +0000 |
commit | 346dfd8a764d83f81a23c460586ea02e6ce7177d (patch) | |
tree | 900c22814cac59d47a1df43d3a3762bd327855f4 | |
parent | 8854567015d6f8f6c6edb8f10a33ebff4366369a (diff) | |
download | chrome-ec-346dfd8a764d83f81a23c460586ea02e6ce7177d.tar.gz |
core/host: add Zephyr compatible atomic functions
Add atomic functions with prototypes equal to the ones in Zephyr.
It is done as a part of porting to Zephyr, the next step is to use in
the code atomic_* instead of deprecated_atomic_*.
Some atomic functions in Zephyr return a value e.g. atomic_add - it
returns the value of the variable before the add operation.
Use __atomic insead of __sync atomic functions as it is a recommended
way (https://gcc.gnu.org/onlinedocs/gcc/_005f_005fatomic-Builtins.html).
BUG=b:169151160
BRANCH=none
TEST=buildall
Signed-off-by: Dawid Niedzwiecki <dn@semihalf.com>
Change-Id: I4617e2f4c4b9e7021f3df572ba98f1f52bcd8975
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2453253
Reviewed-by: Jett Rink <jettrink@chromium.org>
-rw-r--r-- | core/host/atomic.h | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/core/host/atomic.h b/core/host/atomic.h index 7f2e0ba16f..0e662c9106 100644 --- a/core/host/atomic.h +++ b/core/host/atomic.h @@ -10,6 +10,9 @@ #include "common.h" +typedef int atomic_t; +typedef atomic_t atomic_val_t; + /* * The atomic_* functions are marked as deprecated as a part of the process of * transaction to Zephyr compatible atomic functions. These prefixes will be @@ -22,25 +25,50 @@ static inline void deprecated_atomic_clear_bits(uint32_t volatile *addr, __sync_and_and_fetch(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) { __sync_or_and_fetch(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) { __sync_add_and_fetch(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_sub(uint32_t volatile *addr, uint32_t value) { __sync_sub_and_fetch(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) { return __sync_fetch_and_and(addr, 0); } + +static inline atomic_val_t atomic_read_clear(atomic_t *addr) +{ + return __atomic_exchange_n(addr, 0, __ATOMIC_SEQ_CST); +} #endif /* __CROS_EC_ATOMIC_H */ |