x86 bitops.h provides a __set_bit() but does not define PLATFORM__SET_BIT as a result generic_set_bit() is used instead of the architecturally provided __set_bit().

This patch defines PLATFORM__SET_BIT which means that __set_bit() in x86 bitops.h will be called whenever generic_set_bit() is called - as opposed to the default cross-platform generic_set_bit().

Signed-off-by: Bryan O'Donoghue pure.logic@nexus-software.ie Cc: Simon Glass sjg@chromium.org Cc: Bin Meng bmeng.cn@gmail.com --- arch/x86/include/asm/bitops.h | 2 ++ 1 file changed, 2 insertions(+)

diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h index f97dc66439..196fcf9d3f 100644 --- a/arch/x86/include/asm/bitops.h +++ b/arch/x86/include/asm/bitops.h @@ -61,6 +61,8 @@ static __inline__ void __set_bit(int nr, volatile void * addr) :"Ir" (nr)); }

+#define PLATFORM__SET_BIT + /** * clear_bit - Clears a bit in memory * @nr: Bit to clear

riscv bitops.h provides a __set_bit() but does not define PLATFORM__SET_BIT as a result generic_set_bit() is used instead of the architecturally provided __set_bit().

This patch defines PLATFORM__SET_BIT which means that __set_bit() in x86 bitops.h will be called whenever generic_set_bit() is called - as opposed to the default cross-platform generic_set_bit().

Signed-off-by: Bryan O'Donoghue pure.logic@nexus-software.ie Cc: Rick Chen rick@andestech.com Cc: Greentime Hu green.hu@gmail.com --- arch/riscv/include/asm/bitops.h | 2 ++ 1 file changed, 2 insertions(+)

diff --git a/arch/riscv/include/asm/bitops.h b/arch/riscv/include/asm/bitops.h index 55d420fdfb..0149e5c696 100644 --- a/arch/riscv/include/asm/bitops.h +++ b/arch/riscv/include/asm/bitops.h @@ -42,6 +42,8 @@ static inline void __set_bit(int nr, void *addr) *a |= mask; }

+#define PLATFORM__SET_BIT + static inline void __clear_bit(int nr, void *addr) { int *a = (int *)addr;

riscv bitops.h provides a __clear_bit() but does not define PLATFORM__CLEAR_BIT as a result generic_clear_bit() is used instead of the architecturally provided __clear_bit().

This patch defines PLATFORM__CLEAR_BIT which means that __clear_bit() in riscv bitops.h will be called whenever generic_clear_bit() is called - as opposed to the default cross-platform generic_clear_bit().

Signed-off-by: Bryan O'Donoghue pure.logic@nexus-software.ie Cc: Rick Chen rick@andestech.com Cc: Greentime Hu green.hu@gmail.com --- arch/riscv/include/asm/bitops.h | 2 ++ 1 file changed, 2 insertions(+)

diff --git a/arch/riscv/include/asm/bitops.h b/arch/riscv/include/asm/bitops.h index 0149e5c696..536629bbec 100644 --- a/arch/riscv/include/asm/bitops.h +++ b/arch/riscv/include/asm/bitops.h @@ -54,6 +54,8 @@ static inline void __clear_bit(int nr, void *addr) *a &= ~mask; }

+#define PLATFORM__CLEAR_BIT + static inline void __change_bit(int nr, void *addr) { int mask;

nios2 bitops.h provides a __set_bit() but does not define PLATFORM__SET_BIT as a result generic_set_bit() is used instead of the architecturally provided __set_bit().

This patch defines PLATFORM__SET_BIT which means that __set_bit() in nios2 bitops.h will be called whenever generic_set_bit() is called - as opposed to the default cross-platform generic_set_bit().

Signed-off-by: Bryan O'Donoghue pure.logic@nexus-software.ie Cc: Thomas Chou thomas@wytron.com.tw --- arch/nios2/include/asm/bitops/non-atomic.h | 2 ++ 1 file changed, 2 insertions(+)

diff --git a/arch/nios2/include/asm/bitops/non-atomic.h b/arch/nios2/include/asm/bitops/non-atomic.h index 697cc2b7e0..9dd9d923e1 100644 --- a/arch/nios2/include/asm/bitops/non-atomic.h +++ b/arch/nios2/include/asm/bitops/non-atomic.h @@ -20,6 +20,8 @@ static inline void __set_bit(int nr, volatile unsigned long *addr) *p |= mask; }

+#define PLATFORM__SET_BIT + static inline void __clear_bit(int nr, volatile unsigned long *addr) { unsigned long mask = BIT_MASK(nr);

nios2 bitops.h provides a __clear_bit() but does not define PLATFORM__CLEAR_BIT as a result generic_clear_bit() is used instead of the architecturally provided __clear_bit().

This patch defines PLATFORM__CLEAR_BIT which means that __clear_bit() in nios2 bitops.h will be called whenever generic_clear_bit() is called - as opposed to the default cross-platform generic_clear_bit().

Signed-off-by: Bryan O'Donoghue pure.logic@nexus-software.ie Cc: Thomas Chou thomas@wytron.com.tw --- arch/nios2/include/asm/bitops/non-atomic.h | 2 ++ 1 file changed, 2 insertions(+)

diff --git a/arch/nios2/include/asm/bitops/non-atomic.h b/arch/nios2/include/asm/bitops/non-atomic.h index 9dd9d923e1..f746819b43 100644 --- a/arch/nios2/include/asm/bitops/non-atomic.h +++ b/arch/nios2/include/asm/bitops/non-atomic.h @@ -30,6 +30,8 @@ static inline void __clear_bit(int nr, volatile unsigned long *addr) *p &= ~mask; }

+#define PLATFORM__CLEAR_BIT + /** * __change_bit - Toggle a bit in memory * @nr: the bit to change

nds32 bitops.h provides a __set_bit() but does not define PLATFORM__SET_BIT as a result generic_set_bit() is used instead of the architecturally provided __set_bit().

This patch defines PLATFORM__SET_BIT which means that __set_bit() in nds32 bitops.h will be called whenever generic_set_bit() is called - as opposed to the default cross-platform generic_set_bit().

Signed-off-by: Bryan O'Donoghue pure.logic@nexus-software.ie Cc: Macpaul Lin macpaul@andestech.com --- arch/nds32/include/asm/bitops.h | 2 ++ 1 file changed, 2 insertions(+)

diff --git a/arch/nds32/include/asm/bitops.h b/arch/nds32/include/asm/bitops.h index 7ee37c37bc..ecd0032664 100644 --- a/arch/nds32/include/asm/bitops.h +++ b/arch/nds32/include/asm/bitops.h @@ -44,6 +44,8 @@ static inline void __set_bit(int nr, void *addr) *a |= mask; }

+#define PLATFORM__SET_BIT + extern void clear_bit(int nr, void *addr);

static inline void __clear_bit(int nr, void *addr)

nds2 bitops.h provides a __clear_bit() but does not define PLATFORM__CLEAR_BIT as a result generic_clear_bit() is used instead of the architecturally provided __clear_bit().

This patch defines PLATFORM__CLEAR_BIT which means that __clear_bit() in nds32 bitops.h will be called whenever generic_clear_bit() is called - as opposed to the default cross-platform generic_clear_bit().

Signed-off-by: Bryan O'Donoghue pure.logic@nexus-software.ie Cc: Macpaul Lin macpaul@andestech.com --- arch/nds32/include/asm/bitops.h | 2 ++ 1 file changed, 2 insertions(+)

diff --git a/arch/nds32/include/asm/bitops.h b/arch/nds32/include/asm/bitops.h index ecd0032664..f1cdcf3e65 100644 --- a/arch/nds32/include/asm/bitops.h +++ b/arch/nds32/include/asm/bitops.h @@ -61,6 +61,8 @@ static inline void __clear_bit(int nr, void *addr) local_irq_restore(flags); }

+#define PLATFORM__CLEAR_BIT + extern void change_bit(int nr, void *addr);

static inline void __change_bit(int nr, void *addr)

Compiling the f_mass_storage driver for an x86 target results in a compilation error as set_bit and clear_bit are provided by bitops.h

Looking at the provenance of the current u-boot code and the git change history in the kernel, it looks like we have a local copy of set_bit and clear_bit as a hold-over from porting the Linux driver into u-boot.

These days __set_bit and __clear_bit are optionally provided by an arch and can be used as inputs to generic_bit_set and generic_bit_clear.

This patch switches over to generic_set_bit and generic_clear_bit to accommodate.

Tested on i.MX WaRP7 and Intel Edison

Signed-off-by: Bryan O'Donoghue pure.logic@nexus-software.ie Cc: Lukasz Majewski lukma@denx.de Cc: Marek Vasut marex@denx.de --- drivers/usb/gadget/f_mass_storage.c | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c index 1ecb92ac6b..209932df45 100644 --- a/drivers/usb/gadget/f_mass_storage.c +++ b/drivers/usb/gadget/f_mass_storage.c @@ -252,6 +252,7 @@ #include <usb_mass_storage.h>

#include <asm/unaligned.h> +#include <linux/bitops.h> #include <linux/usb/gadget.h> #include <linux/usb/gadget.h> #include <linux/usb/composite.h> @@ -283,26 +284,6 @@ static const char fsg_string_interface[] = "Mass Storage"; struct kref {int x; }; struct completion {int x; };

-inline void set_bit(int nr, volatile void *addr) -{ - int mask; - unsigned int *a = (unsigned int *) addr; - - a += nr >> 5; - mask = 1 << (nr & 0x1f); - *a |= mask; -} - -inline void clear_bit(int nr, volatile void *addr) -{ - int mask; - unsigned int *a = (unsigned int *) addr; - - a += nr >> 5; - mask = 1 << (nr & 0x1f); - *a &= ~mask; -} - struct fsg_dev; struct fsg_common;

@@ -2086,7 +2067,7 @@ static int received_cbw(struct fsg_dev *fsg, struct fsg_buffhd *bh) * we can simply accept and discard any data received * until the next reset. */ wedge_bulk_in_endpoint(fsg); - set_bit(IGNORE_BULK_OUT, &fsg->atomic_bitflags); + generic_set_bit(IGNORE_BULK_OUT, &fsg->atomic_bitflags); return -EINVAL; }

@@ -2250,7 +2231,7 @@ reset: fsg->bulk_out_enabled = 1; common->bulk_out_maxpacket = le16_to_cpu(get_unaligned(&d->wMaxPacketSize)); - clear_bit(IGNORE_BULK_OUT, &fsg->atomic_bitflags); + generic_clear_bit(IGNORE_BULK_OUT, &fsg->atomic_bitflags);

/* Allocate the requests */ for (i = 0; i < FSG_NUM_BUFFERS; ++i) {

Compiling the f_mass_storage driver for an x86 target results in a compilation error as set_bit and clear_bit are provided by bitops.h

To address that situation we discussed on the list moving to genetic_set_bit() instead.

Doing a quick grep for similar situations in drivers/usb shows that the composite device is using __set_bit().

This patch switches over to generic_set_bit to maintain consistency between the two gadget drivers.

Signed-off-by: Bryan O'Donoghue pure.logic@nexus-software.ie Cc: Lukasz Majewski lukma@denx.de Cc: Marek Vasut marex@denx.de --- drivers/usb/gadget/composite.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index a87639def9..9229d9ee30 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -379,7 +379,7 @@ static int set_config(struct usb_composite_dev *cdev, ep = (struct usb_endpoint_descriptor *)*descriptors; addr = ((ep->bEndpointAddress & 0x80) >> 3) | (ep->bEndpointAddress & 0x0f); - __set_bit(addr, f->endpoints); + generic_set_bit(addr, f->endpoints); }

result = f->set_alt(f, tmp, 0);