MIPS: bitops: Use BIT_WORD() & BITS_PER_LONG

Rather than using custom SZLONG_LOG & SZLONG_MASK macros to shift & mask
a bit index to form word & bit offsets respectively, make use of the
standard BIT_WORD() & BITS_PER_LONG macros for the same purpose.

volatile is added to the definition of pointers to the long-sized word
we'll operate on, in order to prevent the compiler complaining that we
cast away the volatile qualifier of the addr argument. This should have
no effect on generated code, which in the LL/SC case is inline asm
anyway & in the non-LLSC case access is constrained by compiler barriers
provided by raw_local_irq_{save,restore}().

Signed-off-by: Paul Burton <paul.burton@mips.com>
Cc: linux-mips@vger.kernel.org
Cc: Huacai Chen <chenhc@lemote.com>
Cc: Jiaxun Yang <jiaxun.yang@flygoat.com>
Cc: linux-kernel@vger.kernel.org

diff --git a/arch/mips/include/asm/bitops.h b/arch/mips/include/asm/bitops.h
index fba0a84..d39fca2 100644 (file)
--- a/arch/mips/include/asm/bitops.h
+++ b/arch/mips/include/asm/bitops.h
@@ -87,8 +87,8 @@ int __mips_test_and_change_bit(unsigned long nr,
  */
 static inline void set_bit(unsigned long nr, volatile unsigned long *addr)
 {
-       unsigned long *m = ((unsigned long *)addr) + (nr >> SZLONG_LOG);
-       int bit = nr & SZLONG_MASK;
+       volatile unsigned long *m = &addr[BIT_WORD(nr)];
+       int bit = nr % BITS_PER_LONG;
 
        if (!kernel_uses_llsc) {
                __mips_set_bit(nr, addr);
@@ -117,8 +117,8 @@ static inline void set_bit(unsigned long nr, volatile unsigned long *addr)
  */
 static inline void clear_bit(unsigned long nr, volatile unsigned long *addr)
 {
-       unsigned long *m = ((unsigned long *)addr) + (nr >> SZLONG_LOG);
-       int bit = nr & SZLONG_MASK;
+       volatile unsigned long *m = &addr[BIT_WORD(nr)];
+       int bit = nr % BITS_PER_LONG;
 
        if (!kernel_uses_llsc) {
                __mips_clear_bit(nr, addr);
@@ -160,8 +160,8 @@ static inline void clear_bit_unlock(unsigned long nr, volatile unsigned long *ad
  */
 static inline void change_bit(unsigned long nr, volatile unsigned long *addr)
 {
-       unsigned long *m = ((unsigned long *)addr) + (nr >> SZLONG_LOG);
-       int bit = nr & SZLONG_MASK;
+       volatile unsigned long *m = &addr[BIT_WORD(nr)];
+       int bit = nr % BITS_PER_LONG;
 
        if (!kernel_uses_llsc) {
                __mips_change_bit(nr, addr);
@@ -183,8 +183,8 @@ static inline void change_bit(unsigned long nr, volatile unsigned long *addr)
 static inline int test_and_set_bit_lock(unsigned long nr,
        volatile unsigned long *addr)
 {
-       unsigned long *m = ((unsigned long *)addr) + (nr >> SZLONG_LOG);
-       int bit = nr & SZLONG_MASK;
+       volatile unsigned long *m = &addr[BIT_WORD(nr)];
+       int bit = nr % BITS_PER_LONG;
        unsigned long res, orig;
 
        if (!kernel_uses_llsc) {
@@ -228,8 +228,8 @@ static inline int test_and_set_bit(unsigned long nr,
 static inline int test_and_clear_bit(unsigned long nr,
        volatile unsigned long *addr)
 {
-       unsigned long *m = ((unsigned long *)addr) + (nr >> SZLONG_LOG);
-       int bit = nr & SZLONG_MASK;
+       volatile unsigned long *m = &addr[BIT_WORD(nr)];
+       int bit = nr % BITS_PER_LONG;
        unsigned long res, orig;
 
        smp_mb__before_llsc();
@@ -267,8 +267,8 @@ static inline int test_and_clear_bit(unsigned long nr,
 static inline int test_and_change_bit(unsigned long nr,
        volatile unsigned long *addr)
 {
-       unsigned long *m = ((unsigned long *)addr) + (nr >> SZLONG_LOG);
-       int bit = nr & SZLONG_MASK;
+       volatile unsigned long *m = &addr[BIT_WORD(nr)];
+       int bit = nr % BITS_PER_LONG;
        unsigned long res, orig;
 
        smp_mb__before_llsc();

diff --git a/arch/mips/include/asm/llsc.h b/arch/mips/include/asm/llsc.h
index d240a4a..c49738b 100644 (file)
--- a/arch/mips/include/asm/llsc.h
+++ b/arch/mips/include/asm/llsc.h
@@ -12,15 +12,11 @@
 #include <asm/isa-rev.h>
 
 #if _MIPS_SZLONG == 32
-#define SZLONG_LOG 5
-#define SZLONG_MASK 31UL
 #define __LL           "ll     "
 #define __SC           "sc     "
 #define __INS          "ins    "
 #define __EXT          "ext    "
 #elif _MIPS_SZLONG == 64
-#define SZLONG_LOG 6
-#define SZLONG_MASK 63UL
 #define __LL           "lld    "
 #define __SC           "scd    "
 #define __INS          "dins   "

diff --git a/arch/mips/lib/bitops.c b/arch/mips/lib/bitops.c
index fba402c..116d0bd 100644 (file)
--- a/arch/mips/lib/bitops.c
+++ b/arch/mips/lib/bitops.c
@@ -7,6 +7,7 @@
  * Copyright (c) 1999, 2000  Silicon Graphics, Inc.
  */
 #include <linux/bitops.h>
+#include <linux/bits.h>
 #include <linux/irqflags.h>
 #include <linux/export.h>
 
@@ -19,12 +20,11 @@
  */
 void __mips_set_bit(unsigned long nr, volatile unsigned long *addr)
 {
-       unsigned long *a = (unsigned long *)addr;
-       unsigned bit = nr & SZLONG_MASK;
+       volatile unsigned long *a = &addr[BIT_WORD(nr)];
+       unsigned int bit = nr % BITS_PER_LONG;
        unsigned long mask;
        unsigned long flags;
 
-       a += nr >> SZLONG_LOG;
        mask = 1UL << bit;
        raw_local_irq_save(flags);
        *a |= mask;
@@ -41,12 +41,11 @@ EXPORT_SYMBOL(__mips_set_bit);
  */
 void __mips_clear_bit(unsigned long nr, volatile unsigned long *addr)
 {
-       unsigned long *a = (unsigned long *)addr;
-       unsigned bit = nr & SZLONG_MASK;
+       volatile unsigned long *a = &addr[BIT_WORD(nr)];
+       unsigned int bit = nr % BITS_PER_LONG;
        unsigned long mask;
        unsigned long flags;
 
-       a += nr >> SZLONG_LOG;
        mask = 1UL << bit;
        raw_local_irq_save(flags);
        *a &= ~mask;
@@ -63,12 +62,11 @@ EXPORT_SYMBOL(__mips_clear_bit);
  */
 void __mips_change_bit(unsigned long nr, volatile unsigned long *addr)
 {
-       unsigned long *a = (unsigned long *)addr;
-       unsigned bit = nr & SZLONG_MASK;
+       volatile unsigned long *a = &addr[BIT_WORD(nr)];
+       unsigned int bit = nr % BITS_PER_LONG;
        unsigned long mask;
        unsigned long flags;
 
-       a += nr >> SZLONG_LOG;
        mask = 1UL << bit;
        raw_local_irq_save(flags);
        *a ^= mask;
@@ -86,13 +84,12 @@ EXPORT_SYMBOL(__mips_change_bit);
 int __mips_test_and_set_bit_lock(unsigned long nr,
                                 volatile unsigned long *addr)
 {
-       unsigned long *a = (unsigned long *)addr;
-       unsigned bit = nr & SZLONG_MASK;
+       volatile unsigned long *a = &addr[BIT_WORD(nr)];
+       unsigned int bit = nr % BITS_PER_LONG;
        unsigned long mask;
        unsigned long flags;
        int res;
 
-       a += nr >> SZLONG_LOG;
        mask = 1UL << bit;
        raw_local_irq_save(flags);
        res = (mask & *a) != 0;
@@ -111,13 +108,12 @@ EXPORT_SYMBOL(__mips_test_and_set_bit_lock);
  */
 int __mips_test_and_clear_bit(unsigned long nr, volatile unsigned long *addr)
 {
-       unsigned long *a = (unsigned long *)addr;
-       unsigned bit = nr & SZLONG_MASK;
+       volatile unsigned long *a = &addr[BIT_WORD(nr)];
+       unsigned int bit = nr % BITS_PER_LONG;
        unsigned long mask;
        unsigned long flags;
        int res;
 
-       a += nr >> SZLONG_LOG;
        mask = 1UL << bit;
        raw_local_irq_save(flags);
        res = (mask & *a) != 0;
@@ -136,13 +132,12 @@ EXPORT_SYMBOL(__mips_test_and_clear_bit);
  */
 int __mips_test_and_change_bit(unsigned long nr, volatile unsigned long *addr)
 {
-       unsigned long *a = (unsigned long *)addr;
-       unsigned bit = nr & SZLONG_MASK;
+       volatile unsigned long *a = &addr[BIT_WORD(nr)];
+       unsigned int bit = nr % BITS_PER_LONG;
        unsigned long mask;
        unsigned long flags;
        int res;
 
-       a += nr >> SZLONG_LOG;
        mask = 1UL << bit;
        raw_local_irq_save(flags);
        res = (mask & *a) != 0;