From 5b6957eed75ca7842861e0f6765d0f6a64408e05 Mon Sep 17 00:00:00 2001 From: Anup Patel Date: Thu, 26 Mar 2020 18:10:02 +0530 Subject: [PATCH] include: Use more consistent name for atomic xchg() and cmpxchg() We should remove the "arch_" prefix from atomic xchg() and cmpxchg() function names to have consistent naming of all atomic functions. Signed-off-by: Anup Patel Reviewed-by: Atish Patra --- include/sbi/riscv_atomic.h | 4 ++-- lib/sbi/riscv_atomic.c | 4 ++-- lib/sbi/sbi_hsm.c | 16 ++++++++-------- lib/sbi/sbi_init.c | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/sbi/riscv_atomic.h b/include/sbi/riscv_atomic.h index 8543f4d..3972e0b 100644 --- a/include/sbi/riscv_atomic.h +++ b/include/sbi/riscv_atomic.h @@ -29,9 +29,9 @@ long atomic_add_return(atomic_t *atom, long value); long atomic_sub_return(atomic_t *atom, long value); -long arch_atomic_cmpxchg(atomic_t *atom, long oldval, long newval); +long atomic_cmpxchg(atomic_t *atom, long oldval, long newval); -long arch_atomic_xchg(atomic_t *atom, long newval); +long atomic_xchg(atomic_t *atom, long newval); unsigned int atomic_raw_xchg_uint(volatile unsigned int *ptr, unsigned int newval); diff --git a/lib/sbi/riscv_atomic.c b/lib/sbi/riscv_atomic.c index fcf3ed1..558bca8 100644 --- a/lib/sbi/riscv_atomic.c +++ b/lib/sbi/riscv_atomic.c @@ -167,7 +167,7 @@ long atomic_sub_return(atomic_t *atom, long value) __cmpxchg((ptr), _o_, _n_, sizeof(*(ptr))); \ }) -long arch_atomic_cmpxchg(atomic_t *atom, long oldval, long newval) +long atomic_cmpxchg(atomic_t *atom, long oldval, long newval) { #ifdef __riscv_atomic return __sync_val_compare_and_swap(&atom->counter, oldval, newval); @@ -176,7 +176,7 @@ long arch_atomic_cmpxchg(atomic_t *atom, long oldval, long newval) #endif } -long arch_atomic_xchg(atomic_t *atom, long newval) +long atomic_xchg(atomic_t *atom, long newval) { /* Atomically set new value and return old value. */ #ifdef __riscv_atomic diff --git a/lib/sbi/sbi_hsm.c b/lib/sbi/sbi_hsm.c index c896f79..e7b2f04 100644 --- a/lib/sbi/sbi_hsm.c +++ b/lib/sbi/sbi_hsm.c @@ -110,8 +110,8 @@ void sbi_hsm_prepare_next_jump(struct sbi_scratch *scratch, u32 hartid) struct sbi_hsm_data *hdata = sbi_scratch_offset_ptr(scratch, hart_data_offset); - oldstate = arch_atomic_cmpxchg(&hdata->state, SBI_HART_STARTING, - SBI_HART_STARTED); + oldstate = atomic_cmpxchg(&hdata->state, SBI_HART_STARTING, + SBI_HART_STARTED); if (oldstate != SBI_HART_STARTING) sbi_hart_hang(); } @@ -178,8 +178,8 @@ void __noreturn sbi_hsm_exit(struct sbi_scratch *scratch) hart_data_offset); void (*jump_warmboot)(void) = (void (*)(void))scratch->warmboot_addr; - hstate = arch_atomic_cmpxchg(&hdata->state, SBI_HART_STOPPING, - SBI_HART_STOPPED); + hstate = atomic_cmpxchg(&hdata->state, SBI_HART_STOPPING, + SBI_HART_STOPPED); if (hstate != SBI_HART_STOPPING) goto fail_exit; @@ -216,8 +216,8 @@ int sbi_hsm_hart_start(struct sbi_scratch *scratch, u32 hartid, if (!rscratch) return SBI_EINVAL; hdata = sbi_scratch_offset_ptr(rscratch, hart_data_offset); - hstate = arch_atomic_cmpxchg(&hdata->state, SBI_HART_STOPPED, - SBI_HART_STARTING); + hstate = atomic_cmpxchg(&hdata->state, SBI_HART_STOPPED, + SBI_HART_STARTING); if (hstate == SBI_HART_STARTED) return SBI_EALREADY_STARTED; @@ -258,8 +258,8 @@ int sbi_hsm_hart_stop(struct sbi_scratch *scratch, bool exitnow) if (!sbi_hsm_hart_started(hartid)) return SBI_EINVAL; - oldstate = arch_atomic_cmpxchg(&hdata->state, SBI_HART_STARTED, - SBI_HART_STOPPING); + oldstate = atomic_cmpxchg(&hdata->state, SBI_HART_STARTED, + SBI_HART_STOPPING); if (oldstate != SBI_HART_STARTED) { sbi_printf("%s: ERR: The hart is in invalid state [%u]\n", __func__, oldstate); diff --git a/lib/sbi/sbi_init.c b/lib/sbi/sbi_init.c index 4e1699d..f0ce209 100644 --- a/lib/sbi/sbi_init.c +++ b/lib/sbi/sbi_init.c @@ -285,7 +285,7 @@ void __noreturn sbi_init(struct sbi_scratch *scratch) sbi_platform_hart_invalid(plat, hartid)) sbi_hart_hang(); - if (arch_atomic_xchg(&coldboot_lottery, 1) == 0) + if (atomic_xchg(&coldboot_lottery, 1) == 0) coldboot = TRUE; if (coldboot) -- 2.7.4