Introduce the for_each_set_clump macro
Subsystems (16)
v2 cover Introduce the for_each_set_clump macro
This patchset introduces a new generic version of for_each_set_clump. The previous version of for_each_set_clump8 used a fixed size 8-bit clump, but the new generic version can work with clump of any size but less than or equal to BITS_PER_LONG. The patchset utilizes the new macro in several GPIO drivers.
The earlier 8-bit for_each_set_clump8 facilitated a
for-loop syntax that iterates over a memory region entire groups of set bits at a time.
For example, suppose you would like to iterate over a 32-bit integer 8 bits at a time, skipping over 8-bit groups with no set bit, where XXXXXXXX represents the current 8-bit group:
Example: 10111110 00000000 11111111 00110011
First loop: 10111110 00000000 11111111 XXXXXXXX
Second loop: 10111110 00000000 XXXXXXXX 00110011
Third loop: XXXXXXXX 00000000 11111111 00110011Each iteration of the loop returns the next 8-bit group that has at least one set bit.
But with the new for_each_set_clump the clump size can be different from 8 bits. Moreover, the clump can be split at word boundary in situations where word size is not multiple of clump size. Following are examples showing the working of new macro for clump sizes of 24 bits and 6 bits.
Example 1:
clump size: 24 bits, Number of clumps (or ports): 10
bitmap stores the bit information from where successive clumps are retrieved.
/* bitmap memory region */
0x00aa0000ff000000; /* Most significant bits */
0xaaaaaa0000ff0000;
0x000000aa000000aa;
0xbbbbabcdeffedcba; /* Least significant bits */Different iterations of for_each_set_clump:-
'offset' is the bit position and 'clump' is the 24 bit clump from the above bitmap.
Iteration first: offset: 0 clump: 0xfedcba Iteration second: offset: 24 clump: 0xabcdef Iteration third: offset: 48 clump: 0xaabbbb Iteration fourth: offset: 96 clump: 0xaa Iteration fifth: offset: 144 clump: 0xff Iteration sixth: offset: 168 clump: 0xaaaaaa Iteration seventh: offset: 216 clump: 0xff
Loop breaks because in the end the remaining bits (0x00aa) size was less than clump size of 24 bits.
In above example it can be seen that in iteration third, the 24 bit clump that was retrieved was split between bitmap[0] and bitmap[1]. This example also shows that 24 bit zeroes if present in between, were skipped (preserving the previous for_each_set_macro8 behaviour).
Example 2:
clump size = 6 bits, Number of clumps (or ports) = 3.
/* bitmap memory region */
0x00aa0000ff000000; /* Most significant bits */
0xaaaaaa0000ff0000;
0x0f00000000000000;
0x0000000000000ac0; /* Least significant bits */Different iterations of for_each_set_clump:
'offset' is the bit position and 'clump' is the 6 bit clump from the above bitmap.
Iteration first: offset: 6 clump: 0x2b
Loop breaks because 6 * 3 = 18 bits traversed in bitmap. Here 6 * 3 is clump size * no. of clumps.
Syed Nayyar Waris (6):
bitops: Introduce the the for_each_set_clump macro lib/test_bitmap.c: Add for_each_set_clump test cases
gpio: thermal: Utilize for_each_set_clump macro
bitops: Remove code related to for_each_set_clump8
gpio: thunderx: Utilize for_each_set_clump macro
gpio: xilinx: Utilize for_each_set_clump macro
drivers/gpio/gpio-104-dio-48e.c | 8 +-- drivers/gpio/gpio-104-idi-48.c | 4 +- drivers/gpio/gpio-74x164.c | 4 +- drivers/gpio/gpio-gpio-mm.c | 8 +-- drivers/gpio/gpio-max3191x.c | 4 +- drivers/gpio/gpio-pca953x.c | 4 +- drivers/gpio/gpio-pci-idio-16.c | 8 +-- drivers/gpio/gpio-pcie-idio-24.c | 8 +-- drivers/gpio/gpio-pisosr.c | 4 +- drivers/gpio/gpio-thunderx.c | 12 ++-- drivers/gpio/gpio-uniphier.c | 4 +- drivers/gpio/gpio-ws16c48.c | 8 +-- drivers/gpio/gpio-xilinx.c | 64 +++++++++-------- drivers/thermal/intel/intel_soc_dts_iosf.c | 6 +- include/asm-generic/bitops/find.h | 12 ++-- include/linux/bitmap.h | 60 +++++++++++----- include/linux/bitops.h | 9 +-- lib/find_bit.c | 12 ++-- lib/test_bitmap.c | 108 ++++++++++++++++++++++------- 19 files changed, 220 insertions(+), 127 deletions(-)
Signature · 1 line
2.7.4
PATCH v2 1/6 bitops: Introduce the the for_each_set_clump macro
This macro iterates for each group of bits (clump) with set bits, within a bitmap memory region. For each iteration, "start" is set to the bit offset of the found clump, while the respective clump value is stored to the location pointed by "clump". Additionally, the bitmap_get_value and bitmap_set_value functions are introduced to respectively get and set a value of n-bits in a bitmap memory region. The n-bits can have any size less than or equal to BITS_PER_LONG. Moreover, during setting value of n-bit in bitmap, if a situation arise that the width of next n-bit is exceeding the word boundary, then it will divide itself such that some portion of it is stored in that word, while the remaining portion is stored in the next higher word. Similar situation occurs while retrieving value of n-bits from bitmap.
---
Changes in v2:
- No change
include/asm-generic/bitops/find.h | 19 ++++++++++++ include/linux/bitmap.h | 61 +++++++++++++++++++++++++++++++++++++++ include/linux/bitops.h | 13 +++++++++ lib/find_bit.c | 14 +++++++++ 4 files changed, 107 insertions(+)
include/asm-generic/bitops/find.h +19 -0
@@ -97,4 +97,23 @@ extern unsigned long find_next_clump8(unsigned long *clump,#define find_first_clump8 (clump, bits, size) \ find_next_clump8((clump), (bits), (size), 0) +/** +* find_next_clump - find next clump with set bits in a memory region +* @clump: location to store copy of found clump +* @addr: address to base the search on +* @size: bitmap size in number of bits +* @offset: bit offset at which to start searching +* @clump_size: clump size in bits +* +* Returns the bit offset for the next set clump; the found clump value is +* copied to the location pointed by @clump. If no bits are set, returns @size. +*/ +extern unsigned long find_next_clump (unsigned long *clump, +const unsigned long *addr, +unsigned long size,unsigned long offset, +unsigned long clump_size); + +#define find_first_clump (clump, bits, size, clump_size) \ + find_next_clump((clump), (bits), (size), 0, (clump_size)) +#endif /*_ASM_GENERIC_BITOPS_FIND_H_ */
include/linux/bitmap.h +61 -0
80 lines not on this page · raw message
include/linux/bitops.h +13 -0
@@ -62,6 +62,19 @@ extern unsigned long __sw_hweight64(__u64 w); (start) < (size); \ (start) = find_next_clump8(&(clump), (bits), (size), (start) + 8)) +/** +* for_each_set_clump - iterate over bitmap for each clump with set bits +* @start: bit offset to start search and to store the current iteration offset +* @clump: location to store copy of current 8-bit clump +* @bits: bitmap address to base the search on +* @size: bitmap size in number of bits +* @clump_size: clump size in bits +*/ +#define for_each_set_clump (start, clump, bits, size, clump_size) \ + for ((start) = find_first_clump(&(clump), (bits), (size), (clump_size)); \ + (start) < (size); \ + (start) = find_next_clump(&(clump), (bits), (size), (start) + (clump_size), (clump_size))) +static inline int get_bitmask_order (unsigned int count) {int order;
lib/find_bit.c +14 -0
@@ -190,3 +190,17 @@ unsigned long find_next_clump8(unsigned long *clump, const unsigned long *addr,return offset; }EXPORT_SYMBOL (find_next_clump8); + +unsigned long find_next_clump (unsigned long *clump,const unsigned long *addr, +unsigned long size,unsigned long offset, +unsigned long clump_size) +{ + offset =find_next_bit (addr, size, offset); +if (offset == size) +return size; + + offset =rounddown (offset, clump_size); + *clump =bitmap_get_value (addr, offset, clump_size); +return offset; +} +EXPORT_SYMBOL (find_next_clump);
Signature · 1 line
2.7.4
PATCH v2 2/6 lib/test_bitmap.c: Add for_each_set_clump test cases
In reply to Syed Nayyar WarisThe introduction of the generic for_each_set_clump macro need test cases to verify the implementation. This patch adds test cases for scenarios in which clump sizes are 8 bits, 24 bits, 30 bits and 6 bits. The cases contain situations where clump is getting split at the word boundary and also when zeroes are present in the start and middle of bitmap.
---
Changes in v2:
- Unify different tests for 'for_each_set_clump'. Pass test data as function parameters.
- Remove unnecessary bitmap_zero calls.
lib/test_bitmap.c | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+)
lib/test_bitmap.c +121 -0
@@ -155,6 +155,38 @@ static bool __init __check_eq_clump8(const char *srcfile, unsigned int line,return true; } +static bool __init __check_eq_clump (const char *srcfile,unsigned int line, +const unsigned int offset, +const unsigned int size, +const unsigned long *const clump_exp, +const unsigned long *const clump, +const unsigned long clump_size) +{ +unsigned long exp; + +if (offset >= size) { +pr_warn ("[%s:%u] bit offset for clump out-of-bounds: expected less than %u, got %u\n" , + srcfile, line, size, offset); +return false; + } + + exp = clump_exp[offset / clump_size]; +if (!exp) { +pr_warn ("[%s:%u] bit offset for zero clump: expected nonzero clump, got bit offset %u with clump value 0" , + srcfile, line, offset); +return false; + } + +if (*clump != exp) { +pr_warn ("[%s:%u] expected clump value of 0x%lX, got clump value of 0x%lX" , + srcfile, line, exp, *clump); +return false; + } + +return true; +} + +#define __expect_eq (suffix, ...) \ ({ \ int result = 0; \
@@ -172,6 +204,7 @@ static bool __init __check_eq_clump8(const char *srcfile, unsigned int line,#define expect_eq_pbl (...) __expect_eq(pbl, ##__VA_ARGS__)#define expect_eq_u32_array (...) __expect_eq(u32_array, ##__VA_ARGS__)#define expect_eq_clump8 (...) __expect_eq(clump8, ##__VA_ARGS__) +#define expect_eq_clump (...) __expect_eq(clump, ##__VA_ARGS__)static void __init test_zero_clear (void ) {
@@ -588,6 +621,46 @@ static const unsigned char clump_exp[] __initconst = { 0x05, /* non-adjacent 2 bits set */ }; +static const unsigned long clump_exp1[]__initconst = { +0x01 ,/* 1 bit set */ +0x02 ,/* non-edge 1 bit set */ +0x00 ,/* zero bits set */ +0x38 ,/* 3 bits set across 4-bit boundary */ +0x38 ,/* Repeated clump */ +0x0F ,/* 4 bits set */ +0xFF ,/* all bits set */ +0x05 ,/* non-adjacent 2 bits set */ +}; + +static const unsigned long clump_exp2[]__initconst = { +0xfedcba ,/* 24 bits */ +0xabcdef , +0xaabbbb ,/* Clump split between 2 words */ +0x000000 ,/* zeroes in between */ +0x0000aa , +0x000000 , +0x0000ff , +0xaaaaaa , +0x000000 , +0x0000ff , +}; + +static const unsigned long clump_exp3[]__initconst = { +0x00000000 ,/* starting with 0s*/ +0x00000000 ,/* All 0s */ +0x00000000 , +0x00000000 , +0x3f00000f ,/* Non zero set */ +0x2aa80003 , +0x00000aaa , +0x00003fc0 , +}; + +static const unsigned long clump_exp4[]__initconst = { +0x00 , +0x2b , +}; +static void __init test_for_each_set_clump8 (void ) {#define CLUMP_EXP_NUMBITS 64
@@ -610,6 +683,53 @@ static void __init test_for_each_set_clump8(void)expect_eq_clump8 (start,CLUMP_EXP_NUMBITS , clump_exp, &clump); } +static void __init execute_for_each_set_clump (unsigned long *bits, +unsigned long size, +const unsigned long *clump_exp, +unsigned long clump_size) +{ +unsigned long start, clump; + +for_each_set_clump (start, clump, bits, size, clump_size) +expect_eq_clump (start, size, clump_exp, &clump, clump_size); +} + +static void __init test_for_each_set_clump (void ) +{ +/* common bitmap of max size for different tests */ +DECLARE_BITMAP (bits,256 ); + +/* set bitmap for test case 1 with clump size as 8 bits */ +bitmap_set_value (bits,0x38000201 ,0 ,32 ); +bitmap_set_value (bits,0x05ff0f38 ,32 ,32 ); + +execute_for_each_set_clump (bits,64 , clump_exp1,8 ); + +/* set bitmap for test case 2 with clump size as 24 bits */ +bitmap_set_value (bits,0xeffedcba ,0 ,32 ); +bitmap_set_value (bits,0xbbbbabcd ,32 ,32 ); +bitmap_set_value (bits,0x000000aa ,64 ,32 ); +bitmap_set_value (bits,0x000000aa ,96 ,32 ); +bitmap_set_value (bits,0x00ff0000 ,128 ,32 ); +bitmap_set_value (bits,0xaaaaaa00 ,160 ,32 ); +bitmap_set_value (bits,0xff000000 ,192 ,32 ); +bitmap_set_value (bits,0x00aa0000 ,224 ,32 ); + +execute_for_each_set_clump (bits,240 , clump_exp2,24 ); + +/* set bitmap for test case 3 with clump size as 30 bits */ +bitmap_set_value (bits,0x00000000 ,0 ,32 ); +bitmap_set_value (bits,0x00000000 ,32 ,32 ); +bitmap_set_value (bits,0x00000000 ,64 ,32 ); +bitmap_set_value (bits,0x0f000000 ,96 ,32 ); + +execute_for_each_set_clump (bits,240 , clump_exp3,30 ); + +/* set bitmap for test case 4 with clump size as 6 bits */ +bitmap_set_value (bits,0x00000ac0 ,0 ,32 ); +execute_for_each_set_clump (bits,18 , clump_exp4,6 ); +} +static void __init selftest (void ) {test_zero_clear ();
@@ -623,6 +743,7 @@ static void __init selftest(void)test_bitmap_parselist_user ();test_mem_optimisations (); test_for_each_set_clump8(); + test_for_each_set_clump(); }KSTM_MODULE_LOADERS (test_bitmap);
Signature · 1 line
2.7.4
PATCH v2 3/6 gpio: thermal: Utilize for_each_set_clump macro
In reply to Syed Nayyar WarisThis patch replaces all the existing for_each_set_clump8 and related function calls in the drivers (gpio and thermal) with the equivalent new generic for_each_set_clump macro.
---
Changes in v2:
- No change.
drivers/gpio/gpio-104-dio-48e.c | 8 ++++---- drivers/gpio/gpio-104-idi-48.c | 4 ++-- drivers/gpio/gpio-74x164.c | 4 ++-- drivers/gpio/gpio-gpio-mm.c | 8 ++++---- drivers/gpio/gpio-max3191x.c | 4 ++-- drivers/gpio/gpio-pca953x.c | 4 ++-- drivers/gpio/gpio-pci-idio-16.c | 8 ++++---- drivers/gpio/gpio-pcie-idio-24.c | 8 ++++---- drivers/gpio/gpio-pisosr.c | 4 ++-- drivers/gpio/gpio-uniphier.c | 4 ++-- drivers/gpio/gpio-ws16c48.c | 8 ++++---- drivers/thermal/intel/intel_soc_dts_iosf.c | 6 +++--- 12 files changed, 35 insertions(+), 35 deletions(-)
drivers/gpio/gpio-104-dio-48e.c +4 -4
@@ -192,11 +192,11 @@ static int dio48e_gpio_get_multiple(struct gpio_chip *chip, unsigned long *mask,/* clear bits array to a clean slate */ bitmap_zero (bits, chip->ngpio); -for_each_set_clump8 (offset, gpio_mask, mask,ARRAY_SIZE (ports) *8 ) { +for_each_set_clump (offset, gpio_mask, mask,ARRAY_SIZE (ports) *8 ,8 ) { port_addr = dio48egpio->base + ports[offset /8 ]; port_state =inb (port_addr) & gpio_mask; -bitmap_set_value8 (bits, port_state, offset); +bitmap_set_value (bits, port_state, offset,8 ); }return 0 ;
@@ -233,11 +233,11 @@ static void dio48e_gpio_set_multiple(struct gpio_chip *chip,unsigned long bitmask;unsigned long flags; -for_each_set_clump8 (offset, gpio_mask, mask,ARRAY_SIZE (ports) *8 ) { +for_each_set_clump (offset, gpio_mask, mask,ARRAY_SIZE (ports) *8 ,8 ) { index = offset /8 ; port_addr = dio48egpio->base + ports[index]; - bitmask =bitmap_get_value8 (bits, offset) & gpio_mask; + bitmask =bitmap_get_value (bits, offset,8 ) & gpio_mask;raw_spin_lock_irqsave (&dio48egpio->lock, flags);
drivers/gpio/gpio-104-idi-48.c +2 -2
@@ -94,11 +94,11 @@ static int idi_48_gpio_get_multiple(struct gpio_chip *chip, unsigned long *mask,/* clear bits array to a clean slate */ bitmap_zero (bits, chip->ngpio); -for_each_set_clump8 (offset, gpio_mask, mask,ARRAY_SIZE (ports) *8 ) { +for_each_set_clump (offset, gpio_mask, mask,ARRAY_SIZE (ports) *8 ,8 ) { port_addr = idi48gpio->base + ports[offset /8 ]; port_state =inb (port_addr) & gpio_mask; -bitmap_set_value8 (bits, port_state, offset); +bitmap_set_value (bits, port_state, offset,8 ); }return 0 ;
drivers/gpio/gpio-74x164.c +2 -2
@@ -79,9 +79,9 @@ static void gen_74x164_set_multiple(struct gpio_chip *gc, unsigned long *mask,unsigned long bitmask;mutex_lock (&chip->lock); -for_each_set_clump8 (offset, bankmask, mask, chip->registers *8 ) { +for_each_set_clump (offset, bankmask, mask, chip->registers *8 ,8 ) { bank = chip->registers -1 - offset /8 ; - bitmask =bitmap_get_value8 (bits, offset) & bankmask; + bitmask =bitmap_get_value (bits, offset,8 ) & bankmask; chip->buffer[bank] &= ~bankmask; chip->buffer[bank] |= bitmask;
drivers/gpio/gpio-gpio-mm.c +4 -4
@@ -181,11 +181,11 @@ static int gpiomm_gpio_get_multiple(struct gpio_chip *chip, unsigned long *mask,/* clear bits array to a clean slate */ bitmap_zero (bits, chip->ngpio); -for_each_set_clump8 (offset, gpio_mask, mask,ARRAY_SIZE (ports) *8 ) { +for_each_set_clump (offset, gpio_mask, mask,ARRAY_SIZE (ports) *8 ,8 ) { port_addr = gpiommgpio->base + ports[offset /8 ]; port_state =inb (port_addr) & gpio_mask; -bitmap_set_value8 (bits, port_state, offset); +bitmap_set_value (bits, port_state, offset,8 ); }return 0 ;
@@ -223,11 +223,11 @@ static void gpiomm_gpio_set_multiple(struct gpio_chip *chip,unsigned long bitmask;unsigned long flags; -for_each_set_clump8 (offset, gpio_mask, mask,ARRAY_SIZE (ports) *8 ) { +for_each_set_clump (offset, gpio_mask, mask,ARRAY_SIZE (ports) *8 ,8 ) { index = offset /8 ; port_addr = gpiommgpio->base + ports[index]; - bitmask =bitmap_get_value8 (bits, offset) & gpio_mask; + bitmask =bitmap_get_value (bits, offset,8 ) & gpio_mask;spin_lock_irqsave (&gpiommgpio->lock, flags);
drivers/gpio/gpio-max3191x.c +2 -2
@@ -245,7 +245,7 @@ static int max3191x_get_multiple(struct gpio_chip *gpio, unsigned long *mask, goto out_unlock;bitmap_zero (bits, gpio->ngpio); -for_each_set_clump8 (bit, gpio_mask, mask, gpio->ngpio) { +for_each_set_clump (bit, gpio_mask, mask, gpio->ngpio,8 ) {unsigned int chipnum = bit /MAX3191X_NGPIO ;if (max3191x_chip_is_faulting (max3191x, chipnum)) {
@@ -255,7 +255,7 @@ static int max3191x_get_multiple(struct gpio_chip *gpio, unsigned long *mask, in = ((u8 *)max3191x->xfer.rx_buf)[chipnum * wordlen]; in &= gpio_mask; -bitmap_set_value8 (bits, in, bit); +bitmap_set_value (bits, in, bit,8 ); } out_unlock:
drivers/gpio/gpio-pca953x.c +2 -2
@@ -343,7 +343,7 @@ static int pca953x_write_regs(struct pca953x_chip *chip, int reg, unsigned longint i, ret;for (i =0 ; i <NBANK (chip); i++) - value[i] =bitmap_get_value8 (val, i *BANK_SZ ); + value[i] =bitmap_get_value (val, i *BANK_SZ ,8 ); ret =regmap_bulk_write (chip->regmap, regaddr, value,NBANK (chip));if (ret <0 ) {
@@ -367,7 +367,7 @@ static int pca953x_read_regs(struct pca953x_chip *chip, int reg, unsigned long * }for (i =0 ; i <NBANK (chip); i++) -bitmap_set_value8 (val, value[i], i *BANK_SZ ); +bitmap_set_value (val, value[i], i *BANK_SZ ,8 );return 0 ; }
drivers/gpio/gpio-pci-idio-16.c +4 -4
@@ -112,11 +112,11 @@ static int idio_16_gpio_get_multiple(struct gpio_chip *chip,/* clear bits array to a clean slate */ bitmap_zero (bits, chip->ngpio); -for_each_set_clump8 (offset, gpio_mask, mask,ARRAY_SIZE (ports) *8 ) { +for_each_set_clump (offset, gpio_mask, mask,ARRAY_SIZE (ports) *8 ,8 ) { port_addr = ports[offset /8 ]; port_state =ioread8 (port_addr) & gpio_mask; -bitmap_set_value8 (bits, port_state, offset); +bitmap_set_value (bits, port_state, offset,8 ); }return 0 ;
@@ -167,11 +167,11 @@ static void idio_16_gpio_set_multiple(struct gpio_chip *chip,unsigned long flags;unsigned long out_state; -for_each_set_clump8 (offset, gpio_mask, mask,ARRAY_SIZE (ports) *8 ) { +for_each_set_clump (offset, gpio_mask, mask,ARRAY_SIZE (ports) *8 ,8 ) { index = offset /8 ; port_addr = ports[index]; - bitmask =bitmap_get_value8 (bits, offset) & gpio_mask; + bitmask =bitmap_get_value (bits, offset,8 ) & gpio_mask;raw_spin_lock_irqsave (&idio16gpio->lock, flags);
drivers/gpio/gpio-pcie-idio-24.c +4 -4
@@ -215,7 +215,7 @@ static int idio_24_gpio_get_multiple(struct gpio_chip *chip,/* clear bits array to a clean slate */ bitmap_zero (bits, chip->ngpio); -for_each_set_clump8 (offset, gpio_mask, mask,ARRAY_SIZE (ports) *8 ) { +for_each_set_clump (offset, gpio_mask, mask,ARRAY_SIZE (ports) *8 ,8 ) { index = offset /8 ;/* read bits from current gpio port (port 6 is TTL GPIO) */
@@ -228,7 +228,7 @@ static int idio_24_gpio_get_multiple(struct gpio_chip *chip, port_state &= gpio_mask; -bitmap_set_value8 (bits, port_state, offset); +bitmap_set_value (bits, port_state, offset,8 ); }return 0 ;
@@ -291,10 +291,10 @@ static void idio_24_gpio_set_multiple(struct gpio_chip *chip,unsigned long out_state;const unsigned long out_mode_mask =BIT (1 ); -for_each_set_clump8 (offset, gpio_mask, mask,ARRAY_SIZE (ports) *8 ) { +for_each_set_clump (offset, gpio_mask, mask,ARRAY_SIZE (ports) *8 ,8 ) { index = offset /8 ; - bitmask =bitmap_get_value8 (bits, offset) & gpio_mask; + bitmask =bitmap_get_value (bits, offset,8 ) & gpio_mask;raw_spin_lock_irqsave (&idio24gpio->lock, flags);
drivers/gpio/gpio-pisosr.c +2 -2
@@ -103,9 +103,9 @@ static int pisosr_gpio_get_multiple(struct gpio_chip *chip,pisosr_gpio_refresh (gpio);bitmap_zero (bits, chip->ngpio); -for_each_set_clump8 (offset, gpio_mask, mask, chip->ngpio) { +for_each_set_clump (offset, gpio_mask, mask, chip->ngpio,8 ) { buffer_state = gpio->buffer[offset /8 ] & gpio_mask; -bitmap_set_value8 (bits, buffer_state, offset); +bitmap_set_value (bits, buffer_state, offset,8 ); }return 0 ;
drivers/gpio/gpio-uniphier.c +2 -2
@@ -149,9 +149,9 @@ static void uniphier_gpio_set_multiple(struct gpio_chip *chip, {unsigned long i, bank, bank_mask, bank_bits; -for_each_set_clump8 (i, bank_mask, mask, chip->ngpio) { +for_each_set_clump (i, bank_mask, mask, chip->ngpio,UNIPHIER_GPIO_LINES_PER_BANK ) { bank = i /UNIPHIER_GPIO_LINES_PER_BANK ; - bank_bits =bitmap_get_value8 (bits, i); + bank_bits =bitmap_get_value (bits, i,UNIPHIER_GPIO_LINES_PER_BANK );uniphier_gpio_bank_write (chip, bank,UNIPHIER_GPIO_PORT_DATA , bank_mask, bank_bits);
drivers/gpio/gpio-ws16c48.c +4 -4
@@ -137,11 +137,11 @@ static int ws16c48_gpio_get_multiple(struct gpio_chip *chip,/* clear bits array to a clean slate */ bitmap_zero (bits, chip->ngpio); -for_each_set_clump8 (offset, gpio_mask, mask, chip->ngpio) { +for_each_set_clump (offset, gpio_mask, mask, chip->ngpio,8 ) { port_addr = ws16c48gpio->base + offset /8 ; port_state =inb (port_addr) & gpio_mask; -bitmap_set_value8 (bits, port_state, offset); +bitmap_set_value (bits, port_state, offset,8 ); }return 0 ;
@@ -182,13 +182,13 @@ static void ws16c48_gpio_set_multiple(struct gpio_chip *chip,unsigned long bitmask;unsigned long flags; -for_each_set_clump8 (offset, gpio_mask, mask, chip->ngpio) { +for_each_set_clump (offset, gpio_mask, mask, chip->ngpio,8 ) { index = offset /8 ; port_addr = ws16c48gpio->base + index;/* mask out GPIO configured for input */ gpio_mask &= ~ws16c48gpio->io_state[index]; - bitmask =bitmap_get_value8 (bits, offset) & gpio_mask; + bitmask =bitmap_get_value (bits, offset,8 ) & gpio_mask;raw_spin_lock_irqsave (&ws16c48gpio->lock, flags);
drivers/thermal/intel/intel_soc_dts_iosf.c +3 -3
@@ -123,7 +123,7 @@ static int update_trip_temp(struct intel_soc_dts_sensor_entry *dts,return status; update_ptps = store_ptps; -bitmap_set_value8 (&update_ptps, temp_out &0xFF , thres_index *8 ); +bitmap_set_value (&update_ptps, temp_out &0xFF , thres_index *8 ,8 ); out = update_ptps; status = iosf_mbi_write(BT_MBI_UNIT_PMC, MBI_REG_WRITE,
@@ -237,7 +237,7 @@ static int sys_get_curr_temp(struct thermal_zone_device *tzd,return status; raw = out; - out =bitmap_get_value8 (&raw, dts->id *8 ) -SOC_DTS_TJMAX_ENCODING ; + out =bitmap_get_value (&raw, dts->id *8 ,8 ) -SOC_DTS_TJMAX_ENCODING ; *temp = sensors->tj_max - out *1000 ;return 0 ;
@@ -314,7 +314,7 @@ static int add_dts_thermal_zone(int id, struct intel_soc_dts_sensor_entry *dts, trip_mask =0 ; else { ptps = store_ptps; -for_each_set_clump8 (i, trip, &ptps, writable_trip_cnt *8 ) +for_each_set_clump (i, trip, &ptps, writable_trip_cnt *8 ,8 ) trip_mask &= ~BIT (i /8 ); } dts->trip_mask = trip_mask;
Signature · 1 line
2.7.4
Re: [PATCH v2 3/6] gpio: thermal: Utilize for_each_set_clump macro
Quoted 3 lines · Syed Nayyar Waris
This patch replaces all the existing
for_each_set_clump8and related function calls in the drivers (gpio and thermal) with the equivalent new genericfor_each_set_clumpmacro.
Why are patches [3/6] and [4/6] included in v2 even though William said they should be ignored?
Again, replacing for_each_set_clump8() with for_each_set_clump() does not provide any benefit but may impact performance and makes the code more difficult to follow. So once more, please do not change drivers which are known to work fine with 8 bit clumps, specifically gpio-max3191x.c and gpio-74x164.c.
Please in the future include a list of the changes you've made in the cover letter, not just in each individual patch.
Thanks,
Lukas
Re: [PATCH v2 3/6] gpio: thermal: Utilize for_each_set_clump macro
Quoted 15 lines · Lukas Wunner
Quoted 3 lines · Syed Nayyar Waris
This patch replaces all the existing
for_each_set_clump8and related function calls in the drivers (gpio and thermal) with the equivalent new genericfor_each_set_clumpmacro.Why are patches [3/6] and [4/6] included in v2 even though William said they should be ignored?
Again, replacing
for_each_set_clump8()withfor_each_set_clump()does not provide any benefit but may impact performance and makes the code more difficult to follow. So once more, please do not change drivers which are known to work fine with 8 bit clumps, specificallygpio-max3191x.candgpio-74x164.c.
Quoted 6 lines
Please in the future include a list of the changes you've made in the cover letter, not just in each individual patch.
Thanks,
Lukas
Hi Lukas,
Your concerns are noted. [3/6] and [4/6] won't be included in the next version v3 of the patchset.
Regards
Syed Nayyar Waris
PATCH v2 4/6 bitops: Remove code related to for_each_set_clump8
In reply to Syed Nayyar WarisRemove code related to the old for_each_set_clump8 macro because it has now been replaced by the new generic for_each_set_clump macro.
---
Changes in v2:
- No change.
include/asm-generic/bitops/find.h | 17 ---------- include/linux/bitmap.h | 35 --------------------- include/linux/bitops.h | 12 -------- lib/find_bit.c | 14 --------- lib/test_bitmap.c | 65 --------------------------------------- 5 files changed, 143 deletions(-)
include/asm-generic/bitops/find.h +0 -17
@@ -81,23 +81,6 @@ extern unsigned long find_first_zero_bit(const unsigned long *addr,#endif /* CONFIG_GENERIC_FIND_FIRST_BIT */ /** -* find_next_clump8 - find next 8-bit clump with set bits in a memory region -* @clump: location to store copy of found clump -* @addr: address to base the search on -* @size: bitmap size in number of bits -* @offset: bit offset at which to start searching -* -* Returns the bit offset for the next set clump; the found clump value is -* copied to the location pointed by @clump. If no bits are set, returns @size. -*/ -extern unsigned long find_next_clump8 (unsigned long *clump, -const unsigned long *addr, -unsigned long size,unsigned long offset); - -#define find_first_clump8 (clump, bits, size) \ - find_next_clump8((clump), (bits), (size), 0) - -/** * find_next_clump - find next clump with set bits in a memory region * @clump: location to store copy of found clump * @addr: address to base the search on
include/linux/bitmap.h +0 -35
@@ -74,10 +74,8 @@* bitmap_allocate_region(bitmap, pos, order) Allocate specified bit region * bitmap_from_arr32(dst, buf, nbits) Copy nbits from u32[] buf to dst * bitmap_to_arr32(buf, src, nbits) Copy nbits from buf to u32[] dst -* bitmap_get_value8(map, start) Get 8bit value from map at start * bitmap_get_value(map, start, nbits) Get bit value of size * 'nbits' from map at start -* bitmap_set_value8(map, value, start) Set 8bit value to map at start * bitmap_set_value(map, value, start, nbits) Set bit value of size 'nbits' * of map at start *
@@ -551,23 +549,6 @@ static inline void bitmap_from_u64(unsigned long *dst, u64 mask) }/** -* bitmap_get_value8 - get an 8-bit value within a memory region -* @map: address to the bitmap memory region -* @start: bit offset of the 8-bit value; must be a multiple of 8 -* -* Returns the 8-bit value located at the @start bit offset within the @src -* memory region. -*/ -static inline unsigned long bitmap_get_value8 (const unsigned long *map, -unsigned long start) -{ -const size_t index =BIT_WORD (start); -const unsigned long offset = start %BITS_PER_LONG ; - -return (map[index] >> offset) &0xFF ; -} - -/** * bitmap_get_value - get a value of n-bits from the memory region * @map: address to the bitmap memory region * @start: bit offset of the n-bit value
@@ -596,22 +577,6 @@ static inline unsigned long bitmap_get_value(const unsigned long *map, }/** -* bitmap_set_value8 - set an 8-bit value within a memory region -* @map: address to the bitmap memory region -* @value: the 8-bit value; values wider than 8 bits may clobber bitmap -* @start: bit offset of the 8-bit value; must be a multiple of 8 -*/ -static inline void bitmap_set_value8 (unsigned long *map,unsigned long value, -unsigned long start) -{ -const size_t index =BIT_WORD (start); -const unsigned long offset = start %BITS_PER_LONG ; - - map[index] &= ~(0xFFUL << offset); - map[index] |= value << offset; -} - -/** * bitmap_set_value - set n-bit value within a memory region * @map: address to the bitmap memory region * @value: value of nbits
include/linux/bitops.h +0 -12
@@ -51,18 +51,6 @@ extern unsigned long __sw_hweight64(__u64 w); (bit) = find_next_zero_bit((addr), (size), (bit) + 1))/** -* for_each_set_clump8 - iterate over bitmap for each 8-bit clump with set bits -* @start: bit offset to start search and to store the current iteration offset -* @clump: location to store copy of current 8-bit clump -* @bits: bitmap address to base the search on -* @size: bitmap size in number of bits -*/ -#define for_each_set_clump8 (start, clump, bits, size) \ - for ((start) = find_first_clump8(&(clump), (bits), (size)); \ - (start) < (size); \ - (start) = find_next_clump8(&(clump), (bits), (size), (start) + 8)) - -/** * for_each_set_clump - iterate over bitmap for each clump with set bits * @start: bit offset to start search and to store the current iteration offset * @clump: location to store copy of current 8-bit clump
lib/find_bit.c +0 -14
@@ -177,20 +177,6 @@ EXPORT_SYMBOL(find_next_bit_le);#endif /* __BIG_ENDIAN */ -unsigned long find_next_clump8 (unsigned long *clump,const unsigned long *addr, -unsigned long size,unsigned long offset) -{ - offset =find_next_bit (addr, size, offset); -if (offset == size) -return size; - - offset =round_down (offset,8 ); - *clump =bitmap_get_value8 (addr, offset); - -return offset; -} -EXPORT_SYMBOL (find_next_clump8); -unsigned long find_next_clump (unsigned long *clump,const unsigned long *addr,unsigned long size,unsigned long offset,unsigned long clump_size)
lib/test_bitmap.c +0 -65
95 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v2 5/6 gpio: thunderx: Utilize for_each_set_clump macro
In reply to Syed Nayyar WarisThis patch reimplements the thunderx_gpio_set_multiple function in drivers/gpio/gpio-thunderx.c to use the new for_each_set_clump macro. Instead of looping for each bank in thunderx_gpio_set_multiple function, now we can skip bank which is not set and save cycles.
---
Changes in v2:
- No change.
drivers/gpio/gpio-thunderx.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/gpio/gpio-thunderx.c +8 -4
@@ -275,12 +275,16 @@ static void thunderx_gpio_set_multiple(struct gpio_chip *chip, unsigned long *bits) {int bank; -u64 set_bits, clear_bits; +u64 set_bits, clear_bits, gpio_mask; +const unsigned long bank_size =64 ; +unsigned long offset; +struct thunderx_gpio *txgpio =gpiochip_get_data (chip); -for (bank =0 ; bank <= chip->ngpio /64 ; bank++) { - set_bits = bits[bank] & mask[bank]; - clear_bits = ~bits[bank] & mask[bank]; +for_each_set_clump (offset, gpio_mask, mask, chip->ngpio, bank_size) { + bank = offset / bank_size; + set_bits = bits[bank] & gpio_mask; + clear_bits = ~bits[bank] & gpio_mask;writeq (set_bits, txgpio->register_base + (bank *GPIO_2ND_BANK ) +GPIO_TX_SET );writeq (clear_bits, txgpio->register_base + (bank *GPIO_2ND_BANK ) +GPIO_TX_CLR ); }
Signature · 1 line
2.7.4
kbuild test robot
build botRe: [PATCH v2 5/6] gpio: thunderx: Utilize for_each_set_clump macro
Thank you for the patch! Yet something to improve:
Hi Syed,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on gpio/for-next]
[also build test ERROR on linus/master v5.7-rc3 next-20200424] [cannot apply to xlnx/master]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system. BTW, we also suggest to use '--base' option to specify the base tree in git format-patch, please see https://stackoverflow.com/a/37406982]
url: https://github.com/0day-ci/linux/commits/Syed-Nayyar-Waris/Introduce-the-for_each_set_clump-macro/20200427-184103 base: https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git for-next config: x86_64-randconfig-g001-20200427 (attached as .config) compiler: gcc-7 (Ubuntu 7.5.0-6ubuntu2) 7.5.0 reproduce: # save the attached .config to linux build tree make ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
All error/warnings (new ones prefixed by >>):
In file included from arch/x86/include/asm/bitops.h:383:0,
from include/linux/bitops.h:29,
from drivers/gpio/gpio-thunderx.c:9:
drivers/gpio/gpio-thunderx.c: In function 'thunderx_gpio_set_multiple':
>> include/asm-generic/bitops/find.h:100:18: error: passing argument 1 of 'find_next_clump' from incompatible pointer type [-Werror=incompatible-pointer-types]
find_next_clump((clump), (bits), (size), 0, (clump_size))
^
>> include/linux/bitops.h:62:17: note: in expansion of macro 'find_first_clump'
for ((start) = find_first_clump(&(clump), (bits), (size), (clump_size)); \
^~~~~~~~~~~~~~~~
drivers/gpio/gpio-thunderx.c:284:2: note: in expansion of macro 'for_each_set_clump'
for_each_set_clump(offset, gpio_mask, mask, chip->ngpio, bank_size) {
^~~~~~~~~~~~~~~~~~
include/asm-generic/bitops/find.h:94:22: note: expected 'long unsigned int *' but argument is of type 'u64 * {aka long long unsigned int *}'
extern unsigned long find_next_clump(unsigned long *clump,
^~~~~~~~~~~~~~~
In file included from drivers/gpio/gpio-thunderx.c:9:0:
include/linux/bitops.h:64:33: error: passing argument 1 of 'find_next_clump' from incompatible pointer type [-Werror=incompatible-pointer-types]
(start) = find_next_clump(&(clump), (bits), (size), (start) + (clump_size), (clump_size)))
^
drivers/gpio/gpio-thunderx.c:284:2: note: in expansion of macro 'for_each_set_clump'
for_each_set_clump(offset, gpio_mask, mask, chip->ngpio, bank_size) {
^~~~~~~~~~~~~~~~~~ In file included from arch/x86/include/asm/bitops.h:383:0,
from include/linux/bitops.h:29,
from drivers/gpio/gpio-thunderx.c:9:
include/asm-generic/bitops/find.h:94:22: note: expected 'long unsigned int *' but argument is of type 'u64 * {aka long long unsigned int *}'
extern unsigned long find_next_clump(unsigned long *clump,
^~~~~~~~~~~~~~~
cc1: some warnings being treated as errors
vim +/find_next_clump +100 include/asm-generic/bitops/find.h
708ff2a0097b02 Akinobu Mita 2010-09-29 82 c1b8ffb88d31d5 Syed Nayyar Waris 2020-04-26 83 /** c1b8ffb88d31d5 Syed Nayyar Waris 2020-04-26 84 * find_next_clump - find next clump with set bits in a memory region c1b8ffb88d31d5 Syed Nayyar Waris 2020-04-26 85 * @clump: location to store copy of found clump c1b8ffb88d31d5 Syed Nayyar Waris 2020-04-26 86 * @addr: address to base the search on c1b8ffb88d31d5 Syed Nayyar Waris 2020-04-26 87 * @size: bitmap size in number of bits c1b8ffb88d31d5 Syed Nayyar Waris 2020-04-26 88 * @offset: bit offset at which to start searching c1b8ffb88d31d5 Syed Nayyar Waris 2020-04-26 89 * @clump_size: clump size in bits c1b8ffb88d31d5 Syed Nayyar Waris 2020-04-26 90 * c1b8ffb88d31d5 Syed Nayyar Waris 2020-04-26 91 * Returns the bit offset for the next set clump; the found clump value is c1b8ffb88d31d5 Syed Nayyar Waris 2020-04-26 92 * copied to the location pointed by @clump. If no bits are set, returns @size. c1b8ffb88d31d5 Syed Nayyar Waris 2020-04-26 93 */ c1b8ffb88d31d5 Syed Nayyar Waris 2020-04-26 94 extern unsigned long find_next_clump(unsigned long *clump, c1b8ffb88d31d5 Syed Nayyar Waris 2020-04-26 95 const unsigned long *addr, c1b8ffb88d31d5 Syed Nayyar Waris 2020-04-26 96 unsigned long size, unsigned long offset, c1b8ffb88d31d5 Syed Nayyar Waris 2020-04-26 97 unsigned long clump_size); c1b8ffb88d31d5 Syed Nayyar Waris 2020-04-26 98 c1b8ffb88d31d5 Syed Nayyar Waris 2020-04-26 99 #define find_first_clump(clump, bits, size, clump_size) \
c1b8ffb88d31d5 Syed Nayyar Waris 2020-04-26 @100 find_next_clump((clump), (bits), (size), 0, (clump_size))c1b8ffb88d31d5 Syed Nayyar Waris 2020-04-26 101
:::::: The code at line 100 was first introduced by commit
:::::: c1b8ffb88d31d5ed311afb9fec47eded4b9410c6 bitops: Introduce the the for_each_set_clump macro
:::::: TO: Syed Nayyar Waris <[email protected]> :::::: CC: 0day robot <[email protected]>
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
kbuild test robot
build botRe: [PATCH v2 5/6] gpio: thunderx: Utilize for_each_set_clump macro
In reply to Syed Nayyar WarisThank you for the patch! Yet something to improve:
Hi Syed,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on gpio/for-next]
[also build test ERROR on linus/master asm-generic/master v5.7-rc3 next-20200423] [cannot apply to xlnx/master]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system. BTW, we also suggest to use '--base' option to specify the base tree in git format-patch, please see https://stackoverflow.com/a/37406982]
url: https://github.com/0day-ci/linux/commits/Syed-Nayyar-Waris/Introduce-the-for_each_set_clump-macro/20200427-184103 base: https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git for-next config: s390-allyesconfig (attached as .config) compiler: s390-linux-gcc (GCC) 9.3.0
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day GCC_VERSION=9.3.0 make.cross ARCH=s390
If you fix the issue, kindly add following tag as appropriate
All error/warnings (new ones prefixed by >>):
In file included from arch/s390/include/asm/bitops.h:425,
from include/linux/bitops.h:29,
from drivers/gpio/gpio-thunderx.c:9:
drivers/gpio/gpio-thunderx.c: In function 'thunderx_gpio_set_multiple':
>> include/linux/bitops.h:62:34: error: passing argument 1 of 'find_next_clump' from incompatible pointer type [-Werror=incompatible-pointer-types]
62 | for ((start) = find_first_clump(&(clump), (bits), (size), (clump_size)); \
include/asm-generic/bitops/find.h:100:19: note: in definition of macro 'find_first_clump'
100 | find_next_clump((clump), (bits), (size), 0, (clump_size))
| ^~~~~
>> drivers/gpio/gpio-thunderx.c:284:2: note: in expansion of macro 'for_each_set_clump'
284 | for_each_set_clump(offset, gpio_mask, mask, chip->ngpio, bank_size) {
| ^~~~~~~~~~~~~~~~~~
include/asm-generic/bitops/find.h:94:53: note: expected 'long unsigned int *' but argument is of type 'u64 *' {aka 'long long unsigned int *'}
94 | extern unsigned long find_next_clump(unsigned long *clump,
| ~~~~~~~~~~~~~~~^~~~~
In file included from drivers/gpio/gpio-thunderx.c:9:
include/linux/bitops.h:64:33: error: passing argument 1 of 'find_next_clump' from incompatible pointer type [-Werror=incompatible-pointer-types]
64 | (start) = find_next_clump(&(clump), (bits), (size), (start) + (clump_size), (clump_size)))
| ^~~~~~~~
| |
| u64 * {aka long long unsigned int *}
>> drivers/gpio/gpio-thunderx.c:284:2: note: in expansion of macro 'for_each_set_clump'
284 | for_each_set_clump(offset, gpio_mask, mask, chip->ngpio, bank_size) {
| ^~~~~~~~~~~~~~~~~~ In file included from arch/s390/include/asm/bitops.h:425,
from include/linux/bitops.h:29,
from drivers/gpio/gpio-thunderx.c:9:
include/asm-generic/bitops/find.h:94:53: note: expected 'long unsigned int *' but argument is of type 'u64 *' {aka 'long long unsigned int *'}
94 | extern unsigned long find_next_clump(unsigned long *clump,
| ~~~~~~~~~~~~~~~^~~~~
cc1: some warnings being treated as errors
vim +/for_each_set_clump +284 drivers/gpio/gpio-thunderx.c
272
273 static void thunderx_gpio_set_multiple(struct gpio_chip *chip,
274 unsigned long *mask,
275 unsigned long *bits)
276 {
277 int bank;
278 u64 set_bits, clear_bits, gpio_mask;
279 const unsigned long bank_size = 64;
280 unsigned long offset;
281
282 struct thunderx_gpio *txgpio = gpiochip_get_data(chip);
283
> 284 for_each_set_clump(offset, gpio_mask, mask, chip->ngpio, bank_size) { 285 bank = offset / bank_size;
286 set_bits = bits[bank] & gpio_mask;
287 clear_bits = ~bits[bank] & gpio_mask;
288 writeq(set_bits, txgpio->register_base + (bank * GPIO_2ND_BANK) + GPIO_TX_SET);
289 writeq(clear_bits, txgpio->register_base + (bank * GPIO_2ND_BANK) + GPIO_TX_CLR);
290 }
291 }
292
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
kbuild test robot
build botRe: [PATCH v2 5/6] gpio: thunderx: Utilize for_each_set_clump macro
In reply to Syed Nayyar WarisThank you for the patch! Perhaps something to improve:
Hi Syed,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on gpio/for-next]
[also build test WARNING on linus/master asm-generic/master v5.7-rc3 next-20200424] [cannot apply to xlnx/master]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system. BTW, we also suggest to use '--base' option to specify the base tree in git format-patch, please see https://stackoverflow.com/a/37406982]
url: https://github.com/0day-ci/linux/commits/Syed-Nayyar-Waris/Introduce-the-for_each_set_clump-macro/20200427-184103 base: https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git for-next reproduce: # apt-get install sparse # sparse version: v0.6.1-191-gc51a0382-dirty make ARCH=x86_64 allmodconfig make C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__'
If you fix the issue, kindly add following tag as appropriate
sparse warnings: (new ones prefixed by >>)
>> drivers/gpio/gpio-thunderx.c:284:9: sparse: sparse: incorrect type in argument 1 (different type sizes) @@ expected unsigned long *clump @@ got unsigunsigned long *clump @@ >> drivers/gpio/gpio-thunderx.c:284:9: sparse: expected unsigned long *clump >> drivers/gpio/gpio-thunderx.c:284:9: sparse: got unsigned long long * >> drivers/gpio/gpio-thunderx.c:284:9: sparse: sparse: incorrect type in argument 1 (different type sizes) @@ expected unsigned long *clump @@ got unsigunsigned long *clump @@ >> drivers/gpio/gpio-thunderx.c:284:9: sparse: expected unsigned long *clump >> drivers/gpio/gpio-thunderx.c:284:9: sparse: got unsigned long long *
vim +284 drivers/gpio/gpio-thunderx.c
272
273 static void thunderx_gpio_set_multiple(struct gpio_chip *chip,
274 unsigned long *mask,
275 unsigned long *bits)
276 {
277 int bank;
278 u64 set_bits, clear_bits, gpio_mask;
279 const unsigned long bank_size = 64;
280 unsigned long offset;
281
282 struct thunderx_gpio *txgpio = gpiochip_get_data(chip);
283
> 284 for_each_set_clump(offset, gpio_mask, mask, chip->ngpio, bank_size) { 285 bank = offset / bank_size;
286 set_bits = bits[bank] & gpio_mask;
287 clear_bits = ~bits[bank] & gpio_mask;
288 writeq(set_bits, txgpio->register_base + (bank * GPIO_2ND_BANK) + GPIO_TX_SET);
289 writeq(clear_bits, txgpio->register_base + (bank * GPIO_2ND_BANK) + GPIO_TX_CLR);
290 }
291 }
292
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
PATCH v2 6/6 gpio: xilinx: Utilize for_each_set_clump macro
In reply to Syed Nayyar WarisThis patch reimplements the xgpio_set_multiple function in drivers/gpio/gpio-xilinx.c to use the new for_each_set_clump macro. Instead of looping for each bit in xgpio_set_multiple function, now we can check each channel at a time and save cycles.
---
Changes in v2:
- No change.
drivers/gpio/gpio-xilinx.c | 64 ++++++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 30 deletions(-)
drivers/gpio/gpio-xilinx.c +34 -30
@@ -136,39 +136,43 @@ static void xgpio_set(struct gpio_chip *gc, unsigned int gpio, int val)static void xgpio_set_multiple (struct gpio_chip *gc,unsigned long *mask,unsigned long *bits) { -unsigned long flags; +unsigned long flags[2 ];struct xgpio_instance *chip =gpiochip_get_data (gc); -int index =xgpio_index (chip,0 ); -int offset, i; - -spin_lock_irqsave (&chip->gpio_lock[index], flags); - -/* Write to GPIO signals */ -for (i =0 ; i < gc->ngpio; i++) { -if (*mask ==0 ) -break ; -/* Once finished with an index write it out to the register */ -if (index !=xgpio_index (chip, i)) { -xgpio_writereg (chip->regs +XGPIO_DATA_OFFSET + - index *XGPIO_CHANNEL_OFFSET , - chip->gpio_state[index]); -spin_unlock_irqrestore (&chip->gpio_lock[index], flags); - index =xgpio_index (chip, i); -spin_lock_irqsave (&chip->gpio_lock[index], flags); - } -if (__test_and_clear_bit (i, mask)) { - offset =xgpio_offset (chip, i); -if (test_bit (i, bits)) - chip->gpio_state[index] |=BIT (offset); -else - chip->gpio_state[index] &= ~BIT (offset); - } +u32 *const state = chip->gpio_state; +unsigned int *const width = chip->gpio_width; +const unsigned long state_size =BITS_PER_TYPE (*state); +unsigned long offset, clump; +size_t index; + +#define TOTAL_BITS BITS_PER_TYPE(chip->gpio_state) +DECLARE_BITMAP (old,TOTAL_BITS ); +DECLARE_BITMAP (new,TOTAL_BITS ); +DECLARE_BITMAP (changed,TOTAL_BITS ); + +spin_lock_irqsave (&chip->gpio_lock[0 ], flags[0 ]); +spin_lock_irqsave (&chip->gpio_lock[1 ], flags[1 ]); + +bitmap_set_value (old, state[0 ],0 , width[0 ]); +bitmap_set_value (old, state[1 ], width[0 ], width[1 ]); +bitmap_replace (new, old, bits, mask, gc->ngpio); + +bitmap_set_value (old, state[0 ],0 , state_size); +bitmap_set_value (old, state[1 ], state_size, state_size); + state[0 ] =bitmap_get_value (new,0 , width[0 ]); + state[1 ] =bitmap_get_value (new, width[0 ], width[1 ]); +bitmap_set_value (new, state[0 ],0 , state_size); +bitmap_set_value (new, state[1 ], state_size, state_size); +bitmap_xor (changed, old, new,TOTAL_BITS ); + +for_each_set_clump (offset, clump, changed,TOTAL_BITS , state_size) { + index = offset / state_size; +xgpio_writereg (chip->regs +XGPIO_DATA_OFFSET + + index *XGPIO_CHANNEL_OFFSET , + state[index]); } -xgpio_writereg (chip->regs +XGPIO_DATA_OFFSET + - index *XGPIO_CHANNEL_OFFSET , chip->gpio_state[index]); - -spin_unlock_irqrestore (&chip->gpio_lock[index], flags); +spin_unlock_irqrestore (&chip->gpio_lock[1 ], flags[1 ]); +spin_unlock_irqrestore (&chip->gpio_lock[0 ], flags[0 ]); }/**
Signature · 1 line
2.7.4