Rationalise atomic.h implementations
Subsystems (5)
cover Rationalise atomic.h implementations
This series applies on top of https://patchwork.ozlabs.org/patch/958286/
The intention is to rationalise most of the current implementations of atomic.h. x86 remains as having an arch specific implementation which I don't intend to touch.
Chris Packham (4):
Add include/asm-generic/atomic.h
ARM: use asm-generic/atomic.h
mips: use asm-generic/atomic.h
xtensa: use asm-generic/atomic.h
arch/arm/include/asm/atomic.h | 147 +----------------------------- arch/mips/include/asm/atomic.h | 44 +-------- arch/xtensa/include/asm/atomic.h | 44 +-------- include/asm-generic/atomic.h | 150 +++++++++++++++++++++++++++++++ 4 files changed, 153 insertions(+), 232 deletions(-) create mode 100644 include/asm-generic/atomic.h
Signature · 1 line
2.18.0
PATCH 1/4 Add include/asm-generic/atomic.h
The arm, xtensa and mips version of atomic.h were already very similar (the mips one was a copy of xtensa). Combine these implementations together to produce a generic atomic.h that can be included by these architectures (and any others that need it in future).
---
include/asm-generic/atomic.h | 150 +++++++++++++++++++++++++++++++++++ 1 file changed, 150 insertions(+) create mode 100644 include/asm-generic/atomic.h
include/asm-generic/atomic.h new file +150 -0
@@ -0,0 +1,150 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ + +#ifndef _ASM_GENERIC_ATOMIC_H +#define _ASM_GENERIC_ATOMIC_H + +typedef struct {volatile int counter; }atomic_t ; +#if BITS_PER_LONG ==32 +typedef struct {volatile long long counter; }atomic64_t ; +#else /* BIT_PER_LONG == 32 */ +typedef struct {volatile long counter; }atomic64_t ; +#endif + +#define ATOMIC_INIT (i) { (i) } + +#define atomic_read (v) ((v)->counter) +#define atomic_set (v, i) ((v)->counter = (i)) +#define atomic64_read (v) atomic_read(v) +#define atomic64_set (v, i) atomic_set(v, i) + +static inline void atomic_add (int i,atomic_t *v) +{ +unsigned long flags =0 ; + +local_irq_save (flags); + v->counter += i; +local_irq_restore (flags); +} + +static inline void atomic_sub (int i,atomic_t *v) +{ +unsigned long flags =0 ; + +local_irq_save (flags); + v->counter -= i; +local_irq_restore (flags); +} + +static inline void atomic_inc (atomic_t *v) +{ +unsigned long flags =0 ; + +local_irq_save (flags); + ++v->counter; +local_irq_restore (flags); +} + +static inline void atomic_dec (atomic_t *v) +{ +unsigned long flags =0 ; + +local_irq_save (flags); + --v->counter; +local_irq_restore (flags); +} + +static inline int atomic_dec_and_test (volatile atomic_t *v) +{ +unsigned long flags =0 ; +int val; + +local_irq_save (flags); + val = v->counter; + v->counter = val -=1 ; +local_irq_restore (flags); + +return val ==0 ; +} + +static inline int atomic_add_negative (int i,volatile atomic_t *v) +{ +unsigned long flags =0 ; +int val; + +local_irq_save (flags); + val = v->counter; + v->counter = val += i; +local_irq_restore (flags); + +return val <0 ; +} + +static inline void atomic_clear_mask (unsigned long mask,unsigned long *addr) +{ +unsigned long flags =0 ; + +local_irq_save (flags); + *addr &= ~mask; +local_irq_restore (flags); +} + +#if BITS_PER_LONG ==32 + +static inline void atomic64_add (long long i,volatile atomic64_t *v) +{ +unsigned long flags =0 ; + +local_irq_save (flags); + v->counter += i; +local_irq_restore (flags); +} + +static inline void atomic64_sub (long long i,volatile atomic64_t *v) +{ +unsigned long flags =0 ; + +local_irq_save (flags); + v->counter -= i; +local_irq_restore (flags); +} + +#else /* BIT_PER_LONG == 32 */ + +static inline void atomic64_add (long i,volatile atomic64_t *v) +{ +unsigned long flags =0 ; + +local_irq_save (flags); + v->counter += i; +local_irq_restore (flags); +} + +static inline void atomic64_sub (long i,volatile atomic64_t *v) +{ +unsigned long flags =0 ; + +local_irq_save (flags); + v->counter -= i; +local_irq_restore (flags); +} +#endif + +static inline void atomic64_inc (volatile atomic64_t *v) +{ +unsigned long flags =0 ; + +local_irq_save (flags); + v->counter +=1 ; +local_irq_restore (flags); +} + +static inline void atomic64_dec (volatile atomic64_t *v) +{ +unsigned long flags =0 ; + +local_irq_save (flags); + v->counter -=1 ; +local_irq_restore (flags); +} + +#endif
Signature · 1 line
2.18.0
PATCH 1/4 Add include/asm-generic/atomic.h
Quoted 6 lines · Chris Packham
The arm, xtensa and mips version of
atomic.hwere already very similar (the mips one was a copy of xtensa). Combine these implementations together to produce a genericatomic.hthat can be included by these architectures (and any others that need it in future).Signed-off-by Chris Packham <[email protected]>
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180909/023ca8c2/attachment.sig>
PATCH 1/4 Add include/asm-generic/atomic.h
In reply to Chris PackhamQuoted 7 lines · Chris Packham
The arm, xtensa and mips version of
atomic.hwere already very similar (the mips one was a copy of xtensa). Combine these implementations together to produce a genericatomic.hthat can be included by these architectures (and any others that need it in future).Signed-off-by Chris Packham <[email protected]>Reviewed-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180926/6fbaa62b/attachment.sig>
PATCH 2/4 ARM: use asm-generic/atomic.h
In reply to Chris PackhamMake use of asm-generic/atomic.h retaining the smp_mb_... definitions.
---
arch/arm/include/asm/atomic.h | 147 +--------------------------------- 1 file changed, 1 insertion(+), 146 deletions(-)
arch/arm/include/asm/atomic.h +1 -146
@@ -20,152 +20,8 @@#error SMP not supported#endif -typedef struct {volatile int counter; }atomic_t ; -#if BITS_PER_LONG ==32 -typedef struct {volatile long long counter; }atomic64_t ; -#else /* BIT_PER_LONG == 32 */ -typedef struct {volatile long counter; }atomic64_t ; -#endif - -#define ATOMIC_INIT (i) { (i) } - -#ifdef __KERNEL__#include <asm/proc-armv/system.h> - -#define atomic_read (v) ((v)->counter) -#define atomic_set (v, i) (((v)->counter) = (i)) -#define atomic64_read (v) atomic_read(v) -#define atomic64_set (v, i) atomic_set(v, i) - -static inline void atomic_add (int i,volatile atomic_t *v) -{ -unsigned long flags =0 ; - -local_irq_save (flags); - v->counter += i; -local_irq_restore (flags); -} - -static inline void atomic_sub (int i,volatile atomic_t *v) -{ -unsigned long flags =0 ; - -local_irq_save (flags); - v->counter -= i; -local_irq_restore (flags); -} - -static inline void atomic_inc (volatile atomic_t *v) -{ -unsigned long flags =0 ; - -local_irq_save (flags); - v->counter +=1 ; -local_irq_restore (flags); -} - -static inline void atomic_dec (volatile atomic_t *v) -{ -unsigned long flags =0 ; - -local_irq_save (flags); - v->counter -=1 ; -local_irq_restore (flags); -} - -static inline int atomic_dec_and_test (volatile atomic_t *v) -{ -unsigned long flags =0 ; -int val; - -local_irq_save (flags); - val = v->counter; - v->counter = val -=1 ; -local_irq_restore (flags); - -return val ==0 ; -} - -static inline int atomic_add_negative (int i,volatile atomic_t *v) -{ -unsigned long flags =0 ; -int val; - -local_irq_save (flags); - val = v->counter; - v->counter = val += i; -local_irq_restore (flags); - -return val <0 ; -} - -static inline void atomic_clear_mask (unsigned long mask,unsigned long *addr) -{ -unsigned long flags =0 ; - -local_irq_save (flags); - *addr &= ~mask; -local_irq_restore (flags); -} - -#if BITS_PER_LONG ==32 - -static inline void atomic64_add (long long i,volatile atomic64_t *v) -{ -unsigned long flags =0 ; - -local_irq_save (flags); - v->counter += i; -local_irq_restore (flags); -} - -static inline void atomic64_sub (long long i,volatile atomic64_t *v) -{ -unsigned long flags =0 ; - -local_irq_save (flags); - v->counter -= i; -local_irq_restore (flags); -} - -#else /* BIT_PER_LONG == 32 */ - -static inline void atomic64_add (long i,volatile atomic64_t *v) -{ -unsigned long flags =0 ; - -local_irq_save (flags); - v->counter += i; -local_irq_restore (flags); -} - -static inline void atomic64_sub (long i,volatile atomic64_t *v) -{ -unsigned long flags =0 ; - -local_irq_save (flags); - v->counter -= i; -local_irq_restore (flags); -} -#endif - -static inline void atomic64_inc (volatile atomic64_t *v) -{ -unsigned long flags =0 ; - -local_irq_save (flags); - v->counter +=1 ; -local_irq_restore (flags); -} - -static inline void atomic64_dec (volatile atomic64_t *v) -{ -unsigned long flags =0 ; - -local_irq_save (flags); - v->counter -=1 ; -local_irq_restore (flags); -} +#include <asm-generic/atomic.h> /* Atomic operations are already serializing on ARM */ #define smp_mb__before_atomic_dec () barrier()
@@ -174,4 +30,3 @@ static inline void atomic64_dec(volatile atomic64_t *v)#define smp_mb__after_atomic_inc () barrier()#endif -#endif
Signature · 1 line
2.18.0
PATCH 2/4 ARM: use asm-generic/atomic.h
Quoted 3 lines · Chris Packham
Make use of
asm-generic/atomic.hretaining thesmp_mb_... definitions.Signed-off-by Chris Packham <[email protected]>
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180909/ce62a2d5/attachment.sig>
PATCH 2/4 ARM: use asm-generic/atomic.h
In reply to Chris PackhamQuoted 4 lines · Chris Packham
Make use of
asm-generic/atomic.hretaining thesmp_mb_... definitions.Signed-off-by Chris Packham <[email protected]>Reviewed-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180926/e9a85a74/attachment.sig>
PATCH 3/4 mips: use asm-generic/atomic.h
In reply to Chris PackhamMake use of asm-generic/atomic.h.
---
arch/mips/include/asm/atomic.h | 44 +--------------------------------- 1 file changed, 1 insertion(+), 43 deletions(-)
arch/mips/include/asm/atomic.h +1 -43
@@ -7,48 +7,6 @@#define _MIPS_ATOMIC_H#include <asm/system.h> - -typedef struct {volatile int counter; }atomic_t ; - -#define ATOMIC_INIT (i) { (i) } - -#define atomic_read (v) ((v)->counter) -#define atomic_set (v, i) ((v)->counter = (i)) - -static inline void atomic_add (int i,atomic_t *v) -{ -unsigned long flags; - -local_irq_save (flags); - v->counter += i; -local_irq_restore (flags); -} - -static inline void atomic_sub (int i,atomic_t *v) -{ -unsigned long flags; - -local_irq_save (flags); - v->counter -= i; -local_irq_restore (flags); -} - -static inline void atomic_inc (atomic_t *v) -{ -unsigned long flags; - -local_irq_save (flags); - ++v->counter; -local_irq_restore (flags); -} - -static inline void atomic_dec (atomic_t *v) -{ -unsigned long flags; - -local_irq_save (flags); - --v->counter; -local_irq_restore (flags); -} +#include <asm-generic/atomic.h> #endif
Signature · 1 line
2.18.0
PATCH 3/4 mips: use asm-generic/atomic.h
Quoted 3 lines · Chris Packham
Make use of
asm-generic/atomic.h.Signed-off-by Chris Packham <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180926/3fd58a41/attachment.sig>
PATCH 4/4 xtensa: use asm-generic/atomic.h
In reply to Chris PackhamMake use of asm-generic/atomic.h.
---
arch/xtensa/include/asm/atomic.h | 44 +------------------------------- 1 file changed, 1 insertion(+), 43 deletions(-)
arch/xtensa/include/asm/atomic.h +1 -43
@@ -7,48 +7,6 @@#define _XTENSA_ATOMIC_H#include <asm/system.h> - -typedef struct {volatile int counter; }atomic_t ; - -#define ATOMIC_INIT (i) { (i) } - -#define atomic_read (v) ((v)->counter) -#define atomic_set (v, i) ((v)->counter = (i)) - -static inline void atomic_add (int i,atomic_t *v) -{ -unsigned long flags; - -local_irq_save (flags); - v->counter += i; -local_irq_restore (flags); -} - -static inline void atomic_sub (int i,atomic_t *v) -{ -unsigned long flags; - -local_irq_save (flags); - v->counter -= i; -local_irq_restore (flags); -} - -static inline void atomic_inc (atomic_t *v) -{ -unsigned long flags; - -local_irq_save (flags); - ++v->counter; -local_irq_restore (flags); -} - -static inline void atomic_dec (atomic_t *v) -{ -unsigned long flags; - -local_irq_save (flags); - --v->counter; -local_irq_restore (flags); -} +#include <asm-generic/atomic.h> #endif
Signature · 1 line
2.18.0
Max Filippov
maintainerPATCH 4/4 xtensa: use asm-generic/atomic.h
Quoted 7 lines · Chris Packham
Make use of
asm-generic/atomic.h.Signed-off-by Chris Packham <[email protected]>---
arch/xtensa/include/asm/atomic.h | 44 +------------------------------- 1 file changed, 1 insertion(+), 43 deletions(-)
Signature · 2 lines
Thanks. -- Max
PATCH 4/4 xtensa: use asm-generic/atomic.h
In reply to Chris PackhamQuoted 4 lines · Chris Packham
Make use of
asm-generic/atomic.h.Signed-off-by Chris Packham <[email protected]>Acked-by Max Filippov <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180926/7a01bfed/attachment.sig>
cover Rationalise atomic.h implementations
In reply to Chris PackhamQuoted 12 lines · Chris Packham
This series applies on top of https://patchwork.ozlabs.org/patch/958286/
The intention is to rationalise most of the current implementations of
atomic.h. x86 remains as having an arch specific implementation which I don't intend to touch.Chris Packham (4):
Addinclude/asm-generic/atomic.h
ARM: useasm-generic/atomic.h
mips: useasm-generic/atomic.h
xtensa: useasm-generic/atomic.h
Quoted 7 lines
arch/arm/include/asm/atomic.h | 147 +----------------------------- arch/mips/include/asm/atomic.h | 44 +-------- arch/xtensa/include/asm/atomic.h | 44 +-------- include/asm-generic/atomic.h | 150 +++++++++++++++++++++++++++++++ 4 files changed, 153 insertions(+), 232 deletions(-)create mode 100644
include/asm-generic/atomic.h
Thanks Chris for taking care of this. For the whole series:
Thanks,
Stefan