Firmware/opensbi
8
0
Fork 0
forked from Mirrors/opensbi
Code Pull Requests Activity

lib: sbi: Replace __atomic_op_bit_ord with __atomic intrinsics

Browse Source 
Simplify atomic-related bit operations through __atomic intrinsics.

Signed-off-by: Xiang W <wxjstz@126.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
This commit is contained in:
Anup Patel
2023-12-08 13:54:07 +05:30
parent 11bf49b444
commit 88398696c8
1 changed files with 6 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lib/sbi/riscv_atomic.c
View File

@@ -108,40 +108,18 @@ unsigned long atomic_raw_xchg_ulong(volatile unsigned long *ptr,
return axchg(ptr, newval); return axchg(ptr, newval);
} }
#if (__SIZEOF_POINTER__ == 8)
#define __AMO(op) "amo" #op ".d"
#elif (__SIZEOF_POINTER__ == 4)
#define __AMO(op) "amo" #op ".w"
#else
#error "Unexpected __SIZEOF_POINTER__"
#endif
#define __atomic_op_bit_ord(op, mod, nr, addr, ord) \
({ \
unsigned long __res, __mask; \
__mask = BIT_MASK(nr); \
__asm__ __volatile__(__AMO(op) #ord " %0, %2, %1" \
: "=r"(__res), "+A"(addr[BIT_WORD(nr)]) \
: "r"(mod(__mask)) \
: "memory"); \
__res & __mask ? 1 : 0; \
})
#define __atomic_op_bit(op, mod, nr, addr) \
__atomic_op_bit_ord(op, mod, nr, addr, .aqrl)
/* Bitmask modifiers */
#define __NOP(x) (x)
#define __NOT(x) (~(x))
int atomic_raw_set_bit(int nr, volatile unsigned long *addr) int atomic_raw_set_bit(int nr, volatile unsigned long *addr)
{ {
return __atomic_op_bit(or, __NOP, nr, addr); unsigned long res, mask = BIT_MASK(nr);
res = __atomic_fetch_or(&addr[BIT_WORD(nr)], mask, __ATOMIC_RELAXED);
return res & mask ? 1 : 0;
} }
int atomic_raw_clear_bit(int nr, volatile unsigned long *addr) int atomic_raw_clear_bit(int nr, volatile unsigned long *addr)
{ {
return __atomic_op_bit(and, __NOT, nr, addr); unsigned long res, mask = BIT_MASK(nr);
res = __atomic_fetch_and(&addr[BIT_WORD(nr)], ~mask, __ATOMIC_RELAXED);
return res & mask ? 1 : 0;
} }
int atomic_set_bit(int nr, atomic_t *atom) int atomic_set_bit(int nr, atomic_t *atom)