* [PATCH v2 0/6] Introduce the for_each_set_clump macro
@ 2020-04-25 18:59 Syed Nayyar Waris
2020-04-25 19:01 ` [PATCH v2 1/6] bitops: Introduce the " Syed Nayyar Waris
2020-04-25 19:05 ` [PATCH v2 4/6] bitops: Remove code related to for_each_set_clump8 Syed Nayyar Waris
0 siblings, 2 replies; 4+ messages in thread
From: Syed Nayyar Waris @ 2020-04-25 18:59 UTC (permalink / raw)
To: akpm
Cc: andriy.shevchenko, vilhelm.gray, michal.simek, arnd, rrichter,
linus.walleij, bgolaszewski, yamada.masahiro, rui.zhang,
daniel.lezcano, amit.kucheria, linux-arch, linux-gpio,
linux-kernel, linux-arm-kernel, linux-pm
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 00110011
Each 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(-)
--
2.7.4
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2 1/6] bitops: Introduce the the for_each_set_clump macro
2020-04-25 18:59 [PATCH v2 0/6] Introduce the for_each_set_clump macro Syed Nayyar Waris
@ 2020-04-25 19:01 ` Syed Nayyar Waris
2020-04-25 19:05 ` [PATCH v2 4/6] bitops: Remove code related to for_each_set_clump8 Syed Nayyar Waris
1 sibling, 0 replies; 4+ messages in thread
From: Syed Nayyar Waris @ 2020-04-25 19:01 UTC (permalink / raw)
To: akpm
Cc: andriy.shevchenko, vilhelm.gray, arnd, linus.walleij, linux-arch,
linux-kernel
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.
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Syed Nayyar Waris <syednwaris@gmail.com>
Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com>
---
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(+)
diff --git a/include/asm-generic/bitops/find.h b/include/asm-generic/bitops/find.h
index 9fdf213..4e66007 100644
--- a/include/asm-generic/bitops/find.h
+++ b/include/asm-generic/bitops/find.h
@@ -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_ */
diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h
index 99058eb..7ab2c65 100644
--- a/include/linux/bitmap.h
+++ b/include/linux/bitmap.h
@@ -75,7 +75,11 @@
* 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
*
* Note, bitmap_zero() and bitmap_fill() operate over the region of
* unsigned longs, that is, bits behind bitmap till the unsigned long
@@ -564,6 +568,34 @@ static inline unsigned long bitmap_get_value8(const unsigned long *map,
}
/**
+ * 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
+ * @nbits: size of value in bits
+ *
+ * Returns value of nbits located at the @start bit offset within the @map
+ * memory region.
+ */
+static inline unsigned long bitmap_get_value(const unsigned long *map,
+ unsigned long start,
+ unsigned long nbits)
+{
+ const size_t index = BIT_WORD(start);
+ const unsigned long offset = start % BITS_PER_LONG;
+ const unsigned long ceiling = roundup(start + 1, BITS_PER_LONG);
+ const unsigned long space = ceiling - start;
+ unsigned long value_low, value_high;
+
+ if (space >= nbits)
+ return (map[index] >> offset) & GENMASK(nbits - 1, 0);
+ else {
+ value_low = map[index] & BITMAP_FIRST_WORD_MASK(start);
+ value_high = map[index + 1] & BITMAP_LAST_WORD_MASK(start + nbits);
+ return (value_low >> offset) | (value_high << space);
+ }
+}
+
+/**
* 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
@@ -579,6 +611,35 @@ static inline void bitmap_set_value8(unsigned long *map, unsigned long value,
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
+ * @start: bit offset of the n-bit value
+ * @nbits: size of value in bits
+ */
+static inline void bitmap_set_value(unsigned long *map,
+ unsigned long value,
+ unsigned long start, unsigned long nbits)
+{
+ const size_t index = BIT_WORD(start);
+ const unsigned long offset = start % BITS_PER_LONG;
+ const unsigned long ceiling = roundup(start + 1, BITS_PER_LONG);
+ const unsigned long space = ceiling - start;
+
+ value &= GENMASK(nbits - 1, 0);
+
+ if (space >= nbits) {
+ map[index] &= ~(GENMASK(nbits + offset - 1, offset));
+ map[index] |= value << offset;
+ } else {
+ map[index] &= ~BITMAP_FIRST_WORD_MASK(start);
+ map[index] |= value << offset;
+ map[index + 1] &= ~BITMAP_LAST_WORD_MASK(start + nbits);
+ map[index + 1] |= (value >> space);
+ }
+}
+
#endif /* __ASSEMBLY__ */
#endif /* __LINUX_BITMAP_H */
diff --git a/include/linux/bitops.h b/include/linux/bitops.h
index 9acf654..41c2d9c 100644
--- a/include/linux/bitops.h
+++ b/include/linux/bitops.h
@@ -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;
diff --git a/lib/find_bit.c b/lib/find_bit.c
index 49f875f..1341bd3 100644
--- a/lib/find_bit.c
+++ b/lib/find_bit.c
@@ -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);
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2 4/6] bitops: Remove code related to for_each_set_clump8
2020-04-25 18:59 [PATCH v2 0/6] Introduce the for_each_set_clump macro Syed Nayyar Waris
2020-04-25 19:01 ` [PATCH v2 1/6] bitops: Introduce the " Syed Nayyar Waris
@ 2020-04-25 19:05 ` Syed Nayyar Waris
2020-04-25 19:05 ` Syed Nayyar Waris
1 sibling, 1 reply; 4+ messages in thread
From: Syed Nayyar Waris @ 2020-04-25 19:05 UTC (permalink / raw)
To: akpm
Cc: andriy.shevchenko, vilhelm.gray, arnd, linus.walleij, linux-arch,
linux-kernel
Remove 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.
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Syed Nayyar Waris <syednwaris@gmail.com>
Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com>
---
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(-)
diff --git a/include/asm-generic/bitops/find.h b/include/asm-generic/bitops/find.h
index 4e66007..d412268 100644
--- a/include/asm-generic/bitops/find.h
+++ b/include/asm-generic/bitops/find.h
@@ -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
diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h
index 7ab2c65..d6595bc1 100644
--- a/include/linux/bitmap.h
+++ b/include/linux/bitmap.h
@@ -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
diff --git a/include/linux/bitops.h b/include/linux/bitops.h
index 41c2d9c..cc0a413 100644
--- a/include/linux/bitops.h
+++ b/include/linux/bitops.h
@@ -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
diff --git a/lib/find_bit.c b/lib/find_bit.c
index 1341bd3..6332ec1 100644
--- a/lib/find_bit.c
+++ b/lib/find_bit.c
@@ -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)
diff --git a/lib/test_bitmap.c b/lib/test_bitmap.c
index 13fe9a2..100443c 100644
--- a/lib/test_bitmap.c
+++ b/lib/test_bitmap.c
@@ -125,36 +125,6 @@ __check_eq_u32_array(const char *srcfile, unsigned int line,
return true;
}
-static bool __init __check_eq_clump8(const char *srcfile, unsigned int line,
- const unsigned int offset,
- const unsigned int size,
- const unsigned char *const clump_exp,
- const unsigned long *const clump)
-{
- 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 / 8];
- 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;
-}
-
static bool __init __check_eq_clump(const char *srcfile, unsigned int line,
const unsigned int offset,
const unsigned int size,
@@ -203,7 +173,6 @@ static bool __init __check_eq_clump(const char *srcfile, unsigned int line,
#define expect_eq_bitmap(...) __expect_eq(bitmap, ##__VA_ARGS__)
#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)
@@ -610,17 +579,6 @@ static void noinline __init test_mem_optimisations(void)
}
}
-static const unsigned char clump_exp[] __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_exp1[] __initconst = {
0x01, /* 1 bit set */
0x02, /* non-edge 1 bit set */
@@ -661,28 +619,6 @@ static const unsigned long clump_exp4[] __initconst = {
0x2b,
};
-static void __init test_for_each_set_clump8(void)
-{
-#define CLUMP_EXP_NUMBITS 64
- DECLARE_BITMAP(bits, CLUMP_EXP_NUMBITS);
- unsigned int start;
- unsigned long clump;
-
- /* set bitmap to test case */
- bitmap_zero(bits, CLUMP_EXP_NUMBITS);
- bitmap_set(bits, 0, 1); /* 0x01 */
- bitmap_set(bits, 9, 1); /* 0x02 */
- bitmap_set(bits, 27, 3); /* 0x28 */
- bitmap_set(bits, 35, 3); /* 0x28 */
- bitmap_set(bits, 40, 4); /* 0x0F */
- bitmap_set(bits, 48, 8); /* 0xFF */
- bitmap_set(bits, 56, 1); /* 0x05 - part 1 */
- bitmap_set(bits, 58, 1); /* 0x05 - part 2 */
-
- for_each_set_clump8(start, clump, bits, CLUMP_EXP_NUMBITS)
- 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,
@@ -742,7 +678,6 @@ static void __init selftest(void)
test_bitmap_parselist();
test_bitmap_parselist_user();
test_mem_optimisations();
- test_for_each_set_clump8();
test_for_each_set_clump();
}
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2 4/6] bitops: Remove code related to for_each_set_clump8
2020-04-25 19:05 ` [PATCH v2 4/6] bitops: Remove code related to for_each_set_clump8 Syed Nayyar Waris
@ 2020-04-25 19:05 ` Syed Nayyar Waris
0 siblings, 0 replies; 4+ messages in thread
From: Syed Nayyar Waris @ 2020-04-25 19:05 UTC (permalink / raw)
To: akpm
Cc: andriy.shevchenko, vilhelm.gray, arnd, linus.walleij, linux-arch,
linux-kernel
Remove 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.
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Syed Nayyar Waris <syednwaris@gmail.com>
Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com>
---
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(-)
diff --git a/include/asm-generic/bitops/find.h b/include/asm-generic/bitops/find.h
index 4e66007..d412268 100644
--- a/include/asm-generic/bitops/find.h
+++ b/include/asm-generic/bitops/find.h
@@ -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
diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h
index 7ab2c65..d6595bc1 100644
--- a/include/linux/bitmap.h
+++ b/include/linux/bitmap.h
@@ -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
diff --git a/include/linux/bitops.h b/include/linux/bitops.h
index 41c2d9c..cc0a413 100644
--- a/include/linux/bitops.h
+++ b/include/linux/bitops.h
@@ -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
diff --git a/lib/find_bit.c b/lib/find_bit.c
index 1341bd3..6332ec1 100644
--- a/lib/find_bit.c
+++ b/lib/find_bit.c
@@ -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)
diff --git a/lib/test_bitmap.c b/lib/test_bitmap.c
index 13fe9a2..100443c 100644
--- a/lib/test_bitmap.c
+++ b/lib/test_bitmap.c
@@ -125,36 +125,6 @@ __check_eq_u32_array(const char *srcfile, unsigned int line,
return true;
}
-static bool __init __check_eq_clump8(const char *srcfile, unsigned int line,
- const unsigned int offset,
- const unsigned int size,
- const unsigned char *const clump_exp,
- const unsigned long *const clump)
-{
- 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 / 8];
- 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;
-}
-
static bool __init __check_eq_clump(const char *srcfile, unsigned int line,
const unsigned int offset,
const unsigned int size,
@@ -203,7 +173,6 @@ static bool __init __check_eq_clump(const char *srcfile, unsigned int line,
#define expect_eq_bitmap(...) __expect_eq(bitmap, ##__VA_ARGS__)
#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)
@@ -610,17 +579,6 @@ static void noinline __init test_mem_optimisations(void)
}
}
-static const unsigned char clump_exp[] __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_exp1[] __initconst = {
0x01, /* 1 bit set */
0x02, /* non-edge 1 bit set */
@@ -661,28 +619,6 @@ static const unsigned long clump_exp4[] __initconst = {
0x2b,
};
-static void __init test_for_each_set_clump8(void)
-{
-#define CLUMP_EXP_NUMBITS 64
- DECLARE_BITMAP(bits, CLUMP_EXP_NUMBITS);
- unsigned int start;
- unsigned long clump;
-
- /* set bitmap to test case */
- bitmap_zero(bits, CLUMP_EXP_NUMBITS);
- bitmap_set(bits, 0, 1); /* 0x01 */
- bitmap_set(bits, 9, 1); /* 0x02 */
- bitmap_set(bits, 27, 3); /* 0x28 */
- bitmap_set(bits, 35, 3); /* 0x28 */
- bitmap_set(bits, 40, 4); /* 0x0F */
- bitmap_set(bits, 48, 8); /* 0xFF */
- bitmap_set(bits, 56, 1); /* 0x05 - part 1 */
- bitmap_set(bits, 58, 1); /* 0x05 - part 2 */
-
- for_each_set_clump8(start, clump, bits, CLUMP_EXP_NUMBITS)
- 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,
@@ -742,7 +678,6 @@ static void __init selftest(void)
test_bitmap_parselist();
test_bitmap_parselist_user();
test_mem_optimisations();
- test_for_each_set_clump8();
test_for_each_set_clump();
}
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-04-25 19:05 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-25 18:59 [PATCH v2 0/6] Introduce the for_each_set_clump macro Syed Nayyar Waris
2020-04-25 19:01 ` [PATCH v2 1/6] bitops: Introduce the " Syed Nayyar Waris
2020-04-25 19:05 ` [PATCH v2 4/6] bitops: Remove code related to for_each_set_clump8 Syed Nayyar Waris
2020-04-25 19:05 ` Syed Nayyar Waris
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).