Re: [PATCH 16/33] locking/atomic: csky: move to ARCH_ATOMIC

[Guo Ren]

On Mon, May 10, 2021 at 5:41 PM Mark Rutland <mark.rutland@xxxxxxx> wrote:
>
> We'd like all architectures to convert to ARCH_ATOMIC, as once all
> architectures are converted it will be possible to make significant
> cleanups to the atomics headers, and this will make it much easier to
> generically enable atomic functionality (e.g. debug logic in the
> instrumented wrappers).
>
> As a step towards that, this patch migrates csky to ARCH_ATOMIC. The
> arch code provides arch_{atomic,atomic64,xchg,cmpxchg}*(), and common
> code wraps these with optional instrumentation to provide the regular
> functions.
>
> Signed-off-by: Mark Rutland <mark.rutland@xxxxxxx>
> Cc: Boqun Feng <boqun.feng@xxxxxxxxx>
> Cc: Guo Ren <guoren@xxxxxxxxxx>
> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
> Cc: Will Deacon <will@xxxxxxxxxx>
> ---
>  arch/csky/Kconfig               | 1 +
>  arch/csky/include/asm/cmpxchg.h | 8 ++++----
>  2 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/arch/csky/Kconfig b/arch/csky/Kconfig
> index 8de5b987edb9..3521f14bcd96 100644
> --- a/arch/csky/Kconfig
> +++ b/arch/csky/Kconfig
> @@ -2,6 +2,7 @@
>  config CSKY
>         def_bool y
>         select ARCH_32BIT_OFF_T
> +       select ARCH_ATOMIC
>         select ARCH_HAS_DMA_PREP_COHERENT
>         select ARCH_HAS_GCOV_PROFILE_ALL
>         select ARCH_HAS_SYNC_DMA_FOR_CPU
> diff --git a/arch/csky/include/asm/cmpxchg.h b/arch/csky/include/asm/cmpxchg.h
> index dabc8e46ce7b..d1bef11f8dc9 100644
> --- a/arch/csky/include/asm/cmpxchg.h
> +++ b/arch/csky/include/asm/cmpxchg.h
> @@ -31,7 +31,7 @@ extern void __bad_xchg(void);
>         __ret;                                                  \
>  })
>
> -#define xchg_relaxed(ptr, x) \
> +#define arch_xchg_relaxed(ptr, x) \
>                 (__xchg_relaxed((x), (ptr), sizeof(*(ptr))))
>
>  #define __cmpxchg_relaxed(ptr, old, new, size)                 \
> @@ -61,14 +61,14 @@ extern void __bad_xchg(void);
>         __ret;                                                  \
>  })
>
> -#define cmpxchg_relaxed(ptr, o, n) \
> +#define arch_cmpxchg_relaxed(ptr, o, n) \
>         (__cmpxchg_relaxed((ptr), (o), (n), sizeof(*(ptr))))
>
> -#define cmpxchg(ptr, o, n)                                     \
> +#define arch_cmpxchg(ptr, o, n)                                \
>  ({                                                             \
>         __typeof__(*(ptr)) __ret;                               \
>         __smp_release_fence();                                  \
> -       __ret = cmpxchg_relaxed(ptr, o, n);                     \
> +       __ret = arch_cmpxchg_relaxed(ptr, o, n);                \
>         __smp_acquire_fence();                                  \
>         __ret;                                                  \
>  })
> --
> 2.11.0
>
Acked-by: Guo Ren <guoren@xxxxxxxxxx>

-- 
Best Regards
 Guo Ren

ML: https://lore.kernel.org/linux-csky/