Skip to content

L
linux
Commit 93eb95ed authored by Russell King's avatar Russell King
Browse files
Options

[ARM] Update ARM bitops to operate on unsigned long quantities. 

This cset removes some complexity that arose due to the endian issues
caused by using byte accesses in the bitops.  Since bitops are now
guaranteed to operate on unsigned long quantities, we can now use
word operations.  This means that bitops bit 0 naturally falls into
word 0 bit 0.
parent 48d7217f
Show whitespace changes
Inline Side-by-side
Showing with 94 additions and 90 deletions
include/asm-arm/bitops.h
View file @ 93eb95ed
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* Big endian support: Copyright 2001, Nicolas Pitre * Big endian support: Copyright 2001, Nicolas Pitre
* reworked by rmk. * reworked by rmk.
* *
* bit 0 is the LSB of addr; bit 32 is the LSB of (addr+1). * bit 0 is the LSB of an "unsigned long" quantity.
* *
* Please note that the code in this file should never be included * Please note that the code in this file should never be included
* from user space. Many of these are not implemented in assembler * from user space. Many of these are not implemented in assembler
...@@ -26,34 +26,39 @@ ...@@ -26,34 +26,39 @@
/* /*
* These functions are the basis of our bit ops. * These functions are the basis of our bit ops.
* First, the atomic bitops.
* *
* The endian issue for these functions is handled by the macros below. * First, the atomic bitops. These use native endian.
*/ */
static inline void static inline void ____atomic_set_bit(unsigned int bit, unsigned long *p)
____atomic_set_bit_mask(unsigned int mask, volatile unsigned char *p)
{ {
unsigned long flags; unsigned long flags;
unsigned long mask = 1UL << (bit & 31);
p += bit >> 5;
local_irq_save(flags); local_irq_save(flags);
*p |= mask; *p |= mask;
local_irq_restore(flags); local_irq_restore(flags);
} }
static inline void static inline void ____atomic_clear_bit(unsigned int bit, unsigned long *p)
____atomic_clear_bit_mask(unsigned int mask, volatile unsigned char *p)
{ {
unsigned long flags; unsigned long flags;
unsigned long mask = 1UL << (bit & 31);
p += bit >> 5;
local_irq_save(flags); local_irq_save(flags);
*p &= ~mask; *p &= ~mask;
local_irq_restore(flags); local_irq_restore(flags);
} }
static inline void static inline void ____atomic_change_bit(unsigned int bit, unsigned long *p)
____atomic_change_bit_mask(unsigned int mask, volatile unsigned char *p)
{ {
unsigned long flags; unsigned long flags;
unsigned long mask = 1UL << (bit & 31);
p += bit >> 5;
local_irq_save(flags); local_irq_save(flags);
*p ^= mask; *p ^= mask;
...@@ -61,10 +66,13 @@ ____atomic_change_bit_mask(unsigned int mask, volatile unsigned char *p) ...@@ -61,10 +66,13 @@ ____atomic_change_bit_mask(unsigned int mask, volatile unsigned char *p)
} }
static inline int static inline int
____atomic_test_and_set_bit_mask(unsigned int mask, volatile unsigned char *p) ____atomic_test_and_set_bit(unsigned int bit, unsigned long *p)
{ {
unsigned long flags; unsigned long flags;
unsigned int res; unsigned int res;
unsigned long mask = 1UL << (bit & 31);
p += bit >> 5;
local_irq_save(flags); local_irq_save(flags);
res = *p; res = *p;
...@@ -75,10 +83,13 @@ ____atomic_test_and_set_bit_mask(unsigned int mask, volatile unsigned char *p) ...@@ -75,10 +83,13 @@ ____atomic_test_and_set_bit_mask(unsigned int mask, volatile unsigned char *p)
} }
static inline int static inline int
____atomic_test_and_clear_bit_mask(unsigned int mask, volatile unsigned char *p) ____atomic_test_and_clear_bit(unsigned int bit, unsigned long *p)
{ {
unsigned long flags; unsigned long flags;
unsigned int res; unsigned int res;
unsigned long mask = 1UL << (bit & 31);
p += bit >> 5;
local_irq_save(flags); local_irq_save(flags);
res = *p; res = *p;
...@@ -89,10 +100,13 @@ ____atomic_test_and_clear_bit_mask(unsigned int mask, volatile unsigned char *p) ...@@ -89,10 +100,13 @@ ____atomic_test_and_clear_bit_mask(unsigned int mask, volatile unsigned char *p)
} }
static inline int static inline int
____atomic_test_and_change_bit_mask(unsigned int mask, volatile unsigned char *p) ____atomic_test_and_change_bit(unsigned int bit, unsigned long *p)
{ {
unsigned long flags; unsigned long flags;
unsigned int res; unsigned int res;
unsigned long mask = 1UL << (bit & 31);
p += bit >> 5;
local_irq_save(flags); local_irq_save(flags);
res = *p; res = *p;
...@@ -103,60 +117,63 @@ ____atomic_test_and_change_bit_mask(unsigned int mask, volatile unsigned char *p ...@@ -103,60 +117,63 @@ ____atomic_test_and_change_bit_mask(unsigned int mask, volatile unsigned char *p
} }
/* /*
* Now the non-atomic variants. We let the compiler handle all optimisations * Now the non-atomic variants. We let the compiler handle all
* for these. * optimisations for these. These are all _native_ endian.
*/ */
static inline void ____nonatomic_set_bit(int nr, volatile void *p) static inline void __set_bit(int nr, volatile unsigned long *p)
{ {
((unsigned char *) p)[nr >> 3] |= (1U << (nr & 7)); p[nr >> 5] |= (1UL << (nr & 31));
} }
static inline void ____nonatomic_clear_bit(int nr, volatile void *p) static inline void __clear_bit(int nr, volatile unsigned long *p)
{ {
((unsigned char *) p)[nr >> 3] &= ~(1U << (nr & 7)); p[nr >> 5] &= ~(1UL << (nr & 31));
} }
static inline void ____nonatomic_change_bit(int nr, volatile void *p) static inline void __change_bit(int nr, volatile unsigned long *p)
{ {
((unsigned char *) p)[nr >> 3] ^= (1U << (nr & 7)); p[nr >> 5] ^= (1UL << (nr & 31));
} }
static inline int ____nonatomic_test_and_set_bit(int nr, volatile void *p) static inline int __test_and_set_bit(int nr, volatile unsigned long *p)
{ {
unsigned int mask = 1 << (nr & 7); unsigned long oldval, mask = 1UL << (nr & 31);
unsigned int oldval;
p += nr >> 5;
oldval = ((unsigned char *) p)[nr >> 3]; oldval = *p;
((unsigned char *) p)[nr >> 3] = oldval | mask; *p = oldval | mask;
return oldval & mask; return oldval & mask;
} }
static inline int ____nonatomic_test_and_clear_bit(int nr, volatile void *p) static inline int __test_and_clear_bit(int nr, volatile unsigned long *p)
{ {
unsigned int mask = 1 << (nr & 7); unsigned long oldval, mask = 1UL << (nr & 31);
unsigned int oldval;
oldval = ((unsigned char *) p)[nr >> 3]; p += nr >> 5;
((unsigned char *) p)[nr >> 3] = oldval & ~mask;
oldval = *p;
*p = oldval & ~mask;
return oldval & mask; return oldval & mask;
} }
static inline int ____nonatomic_test_and_change_bit(int nr, volatile void *p) static inline int __test_and_change_bit(int nr, volatile unsigned long *p)
{ {
unsigned int mask = 1 << (nr & 7); unsigned long oldval, mask = 1UL << (nr & 31);
unsigned int oldval;
p += nr >> 5;
oldval = ((unsigned char *) p)[nr >> 3]; oldval = *p;
((unsigned char *) p)[nr >> 3] = oldval ^ mask; *p = oldval ^ mask;
return oldval & mask; return oldval & mask;
} }
/* /*
* This routine doesn't need to be atomic. * This routine doesn't need to be atomic.
*/ */
static inline int ____test_bit(int nr, const void * p) static inline int __test_bit(int nr, const unsigned long * p)
{ {
return ((volatile unsigned char *) p)[nr >> 3] & (1U << (nr & 7)); return p[nr >> 5] & (1UL << (nr & 31));
} }
/* /*
...@@ -187,24 +204,24 @@ static inline int ____test_bit(int nr, const void * p) ...@@ -187,24 +204,24 @@ static inline int ____test_bit(int nr, const void * p)
/* /*
* Little endian assembly bitops. nr = 0 -> byte 0 bit 0. * Little endian assembly bitops. nr = 0 -> byte 0 bit 0.
*/ */
extern void _set_bit_le(int nr, volatile void * p); extern void _set_bit_le(int nr, unsigned long * p);
extern void _clear_bit_le(int nr, volatile void * p); extern void _clear_bit_le(int nr, unsigned long * p);
extern void _change_bit_le(int nr, volatile void * p); extern void _change_bit_le(int nr, unsigned long * p);
extern int _test_and_set_bit_le(int nr, volatile void * p); extern int _test_and_set_bit_le(int nr, unsigned long * p);
extern int _test_and_clear_bit_le(int nr, volatile void * p); extern int _test_and_clear_bit_le(int nr, unsigned long * p);
extern int _test_and_change_bit_le(int nr, volatile void * p); extern int _test_and_change_bit_le(int nr, unsigned long * p);
extern int _find_first_zero_bit_le(void * p, unsigned size); extern int _find_first_zero_bit_le(void * p, unsigned size);
extern int _find_next_zero_bit_le(void * p, int size, int offset); extern int _find_next_zero_bit_le(void * p, int size, int offset);
/* /*
* Big endian assembly bitops. nr = 0 -> byte 3 bit 0. * Big endian assembly bitops. nr = 0 -> byte 3 bit 0.
*/ */
extern void _set_bit_be(int nr, volatile void * p); extern void _set_bit_be(int nr, unsigned long * p);
extern void _clear_bit_be(int nr, volatile void * p); extern void _clear_bit_be(int nr, unsigned long * p);
extern void _change_bit_be(int nr, volatile void * p); extern void _change_bit_be(int nr, unsigned long * p);
extern int _test_and_set_bit_be(int nr, volatile void * p); extern int _test_and_set_bit_be(int nr, unsigned long * p);
extern int _test_and_clear_bit_be(int nr, volatile void * p); extern int _test_and_clear_bit_be(int nr, unsigned long * p);
extern int _test_and_change_bit_be(int nr, volatile void * p); extern int _test_and_change_bit_be(int nr, unsigned long * p);
extern int _find_first_zero_bit_be(void * p, unsigned size); extern int _find_first_zero_bit_be(void * p, unsigned size);
extern int _find_next_zero_bit_be(void * p, int size, int offset); extern int _find_next_zero_bit_be(void * p, int size, int offset);
...@@ -214,22 +231,17 @@ extern int _find_next_zero_bit_be(void * p, int size, int offset); ...@@ -214,22 +231,17 @@ extern int _find_next_zero_bit_be(void * p, int size, int offset);
*/ */
#define ATOMIC_BITOP_LE(name,nr,p) \ #define ATOMIC_BITOP_LE(name,nr,p) \
(__builtin_constant_p(nr) ? \ (__builtin_constant_p(nr) ? \
____atomic_##name##_mask(1 << ((nr) & 7), \ ____atomic_##name(nr, p) : \
((unsigned char *)(p)) + ((nr) >> 3)) : \
_##name##_le(nr,p)) _##name##_le(nr,p))
#define ATOMIC_BITOP_BE(name,nr,p) \ #define ATOMIC_BITOP_BE(name,nr,p) \
(__builtin_constant_p(nr) ? \ (__builtin_constant_p(nr) ? \
____atomic_##name##_mask(1 << ((nr) & 7), \ ____atomic_##name(nr, p) : \
((unsigned char *)(p)) + (((nr) >> 3) ^ 3)) : \
_##name##_be(nr,p)) _##name##_be(nr,p))
#define NONATOMIC_BITOP_LE(name,nr,p) \ #define NONATOMIC_BITOP(name,nr,p) \
(____nonatomic_##name(nr, p)) (____nonatomic_##name(nr, p))
#define NONATOMIC_BITOP_BE(name,nr,p) \
(____nonatomic_##name(nr ^ 0x18, p))
#ifndef __ARMEB__ #ifndef __ARMEB__
/* /*
* These are the little endian, atomic definitions. * These are the little endian, atomic definitions.
...@@ -240,20 +252,11 @@ extern int _find_next_zero_bit_be(void * p, int size, int offset); ...@@ -240,20 +252,11 @@ extern int _find_next_zero_bit_be(void * p, int size, int offset);
#define test_and_set_bit(nr,p) ATOMIC_BITOP_LE(test_and_set_bit,nr,p) #define test_and_set_bit(nr,p) ATOMIC_BITOP_LE(test_and_set_bit,nr,p)
#define test_and_clear_bit(nr,p) ATOMIC_BITOP_LE(test_and_clear_bit,nr,p) #define test_and_clear_bit(nr,p) ATOMIC_BITOP_LE(test_and_clear_bit,nr,p)
#define test_and_change_bit(nr,p) ATOMIC_BITOP_LE(test_and_change_bit,nr,p) #define test_and_change_bit(nr,p) ATOMIC_BITOP_LE(test_and_change_bit,nr,p)
#define test_bit(nr,p) ____test_bit(nr,p) #define test_bit(nr,p) __test_bit(nr,p)
#define find_first_zero_bit(p,sz) _find_first_zero_bit_le(p,sz) #define find_first_zero_bit(p,sz) _find_first_zero_bit_le(p,sz)
#define find_next_zero_bit(p,sz,off) _find_next_zero_bit_le(p,sz,off) #define find_next_zero_bit(p,sz,off) _find_next_zero_bit_le(p,sz,off)
/* #define WORD_BITOFF_TO_LE(x) ((x))
* These are the little endian, non-atomic definitions.
*/
#define __set_bit(nr,p) NONATOMIC_BITOP_LE(set_bit,nr,p)
#define __clear_bit(nr,p) NONATOMIC_BITOP_LE(clear_bit,nr,p)
#define __change_bit(nr,p) NONATOMIC_BITOP_LE(change_bit,nr,p)
#define __test_and_set_bit(nr,p) NONATOMIC_BITOP_LE(test_and_set_bit,nr,p)
#define __test_and_clear_bit(nr,p) NONATOMIC_BITOP_LE(test_and_clear_bit,nr,p)
#define __test_and_change_bit(nr,p) NONATOMIC_BITOP_LE(test_and_change_bit,nr,p)
#define __test_bit(nr,p) ____test_bit(nr,p)
#else #else
...@@ -266,20 +269,11 @@ extern int _find_next_zero_bit_be(void * p, int size, int offset); ...@@ -266,20 +269,11 @@ extern int _find_next_zero_bit_be(void * p, int size, int offset);
#define test_and_set_bit(nr,p) ATOMIC_BITOP_BE(test_and_set_bit,nr,p) #define test_and_set_bit(nr,p) ATOMIC_BITOP_BE(test_and_set_bit,nr,p)
#define test_and_clear_bit(nr,p) ATOMIC_BITOP_BE(test_and_clear_bit,nr,p) #define test_and_clear_bit(nr,p) ATOMIC_BITOP_BE(test_and_clear_bit,nr,p)
#define test_and_change_bit(nr,p) ATOMIC_BITOP_BE(test_and_change_bit,nr,p) #define test_and_change_bit(nr,p) ATOMIC_BITOP_BE(test_and_change_bit,nr,p)
#define test_bit(nr,p) ____test_bit((nr) ^ 0x18, p) #define test_bit(nr,p) __test_bit(nr,p)
#define find_first_zero_bit(p,sz) _find_first_zero_bit_be(p,sz) #define find_first_zero_bit(p,sz) _find_first_zero_bit_be(p,sz)
#define find_next_zero_bit(p,sz,off) _find_next_zero_bit_be(p,sz,off) #define find_next_zero_bit(p,sz,off) _find_next_zero_bit_be(p,sz,off)
/* #define WORD_BITOFF_TO_LE(x) ((x) ^ 0x18)
* These are the big endian, non-atomic definitions.
*/
#define __set_bit(nr,p) NONATOMIC_BITOP_BE(set_bit,nr,p)
#define __clear_bit(nr,p) NONATOMIC_BITOP_BE(clear_bit,nr,p)
#define __change_bit(nr,p) NONATOMIC_BITOP_BE(change_bit,nr,p)
#define __test_and_set_bit(nr,p) NONATOMIC_BITOP_BE(test_and_set_bit,nr,p)
#define __test_and_clear_bit(nr,p) NONATOMIC_BITOP_BE(test_and_clear_bit,nr,p)
#define __test_and_change_bit(nr,p) NONATOMIC_BITOP_BE(test_and_change_bit,nr,p)
#define __test_bit(nr,p) ____test_bit((nr) ^ 0x18, p)
#endif #endif
...@@ -361,21 +355,31 @@ static inline int sched_find_first_bit(unsigned long *b) ...@@ -361,21 +355,31 @@ static inline int sched_find_first_bit(unsigned long *b)
* Ext2 is defined to use little-endian byte ordering. * Ext2 is defined to use little-endian byte ordering.
* These do not need to be atomic. * These do not need to be atomic.
*/ */
#define ext2_set_bit(nr,p) NONATOMIC_BITOP_LE(test_and_set_bit,nr,p) #define ext2_set_bit(nr,p) \
#define ext2_clear_bit(nr,p) NONATOMIC_BITOP_LE(test_and_clear_bit,nr,p) __test_and_set_bit(WORD_BITOFF_TO_LE(nr), (unsigned long *)(p))
#define ext2_test_bit(nr,p) __test_bit(nr,p) #define ext2_clear_bit(nr,p) \
#define ext2_find_first_zero_bit(p,sz) _find_first_zero_bit_le(p,sz) __test_and_clear_bit(WORD_BITOFF_TO_LE(nr), (unsigned long *)(p))
#define ext2_find_next_zero_bit(p,sz,off) _find_next_zero_bit_le(p,sz,off) #define ext2_test_bit(nr,p) \
__test_bit(WORD_BITOFF_TO_LE(nr), (unsigned long *)(p))
#define ext2_find_first_zero_bit(p,sz) \
_find_first_zero_bit_le(p,sz)
#define ext2_find_next_zero_bit(p,sz,off) \
_find_next_zero_bit_le(p,sz,off)
/* /*
* Minix is defined to use little-endian byte ordering. * Minix is defined to use little-endian byte ordering.
* These do not need to be atomic. * These do not need to be atomic.
*/ */
#define minix_set_bit(nr,p) NONATOMIC_BITOP_LE(set_bit,nr,p) #define minix_set_bit(nr,p) \
#define minix_test_bit(nr,p) __test_bit(nr,p) __set_bit(WORD_BITOFF_TO_LE(nr), (unsigned long *)(p))
#define minix_test_and_set_bit(nr,p) NONATOMIC_BITOP_LE(test_and_set_bit,nr,p) #define minix_test_bit(nr,p) \
#define minix_test_and_clear_bit(nr,p) NONATOMIC_BITOP_LE(test_and_clear_bit,nr,p) __test_bit(WORD_BITOFF_TO_LE(nr), (unsigned long *)(p))
#define minix_find_first_zero_bit(p,sz) _find_first_zero_bit_le(p,sz) #define minix_test_and_set_bit(nr,p) \
__test_and_set_bit(WORD_BITOFF_TO_LE(nr), (unsigned long *)(p))
#define minix_test_and_clear_bit(nr,p) \
__test_and_clear_bit(WORD_BITOFF_TO_LE(nr), (unsigned long *)(p))
#define minix_find_first_zero_bit(p,sz) \
_find_first_zero_bit_le(p,sz)
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7