gpio: implement the configfs testing module
Subsystems (7)
v4 cover gpio: implement the configfs testing module
From: Bartosz Golaszewski <[email protected]>
This series adds a new GPIO testing module based on configfs committable items and sysfs. The goal is to provide a testing driver that will be configurable at runtime (won't need module reload) and easily extensible. The control over the attributes is also much more fine-grained than in gpio-mockup.
This series also contains a respin of the patches I sent separately to the configfs maintainers - these patches implement the concept of committable items that was well defined for a long time but never actually completed.
Apart from the new driver itself, its selftests and the configfs patches, this series contains some changes to the bitmap API - most importantly: it adds devres managed variants of bitmap_alloc() and bitmap_zalloc().
v1 -> v2:
- add selftests for gpio-sim
- add helper programs for selftests
- update the configfs rename callback to work with the new API introduced in v5.11
- fix a missing quote in the documentation
- use !! whenever using bits operation that are required to return 0 or 1
- use provided bitmap API instead of reimplementing copy or fill operations
- fix a deadlock in gpio_sim_direction_output()
- add new read-only configfs attributes for mapping of configfs items to GPIO device names
- and address other minor issues pointed out in reviews of v1
v2 -> v3:
- use devm_bitmap_alloc() instead of the zalloc variant if we're initializing the bitmap with 1s
- drop the patch exporting device_is_bound()
- don't return -ENODEV from dev_nam and chip_name configfs attributes, return a string indicating that the device is not available yet ('n/a')
- fix indentation where it makes sense
- don't protect IDA functions which use their own locking and where it's not needed
- use kmemdup() instead of kzalloc() + memcpy()
- collected review tags
- minor coding style fixes
v3 -> v4:
- return 'none' instead of 'n/a' from dev_name and chip_name before the device is registered
- use sysfs_emit() instead of s*printf()
- drop GPIO_SIM_MAX_PROP as it's only used in an array's definition where it's fine to hardcode the value
Bartosz Golaszewski (11):
configfs: increase the item name length
configfs: use (1UL << bit) for internal flags
configfs: implement committable items
samples: configfs: add a committable group
lib: bitmap: remove the 'extern' keyword from function declarations
lib: bitmap: order includes alphabetically
lib: bitmap: provide devm_bitmap_alloc() and devm_bitmap_zalloc()
gpio: sim: new testing module
selftests: gpio: provide a helper for reading chip info
selftests: gpio: add a helper for reading GPIO line names
selftests: gpio: add test cases for gpio-sim
Documentation/admin-guide/gpio/gpio-sim.rst | 72 ++ Documentation/filesystems/configfs.rst | 6 +- drivers/gpio/Kconfig | 8 + drivers/gpio/Makefile | 1 + drivers/gpio/gpio-sim.c | 874 ++++++++++++++++++ fs/configfs/configfs_internal.h | 22 +- fs/configfs/dir.c | 245 ++++- include/linux/bitmap.h | 127 +-- include/linux/configfs.h | 3 +- lib/bitmap.c | 42 +- samples/configfs/configfs_sample.c | 153 +++ tools/testing/selftests/gpio/.gitignore | 2 + tools/testing/selftests/gpio/Makefile | 4 +- tools/testing/selftests/gpio/config | 1 + tools/testing/selftests/gpio/gpio-chip-info.c | 57 ++ tools/testing/selftests/gpio/gpio-line-name.c | 55 ++ tools/testing/selftests/gpio/gpio-sim.sh | 229 +++++ 17 files changed, 1815 insertions(+), 86 deletions(-) create mode 100644 Documentation/admin-guide/gpio/gpio-sim.rst create mode 100644 drivers/gpio/gpio-sim.c create mode 100644 tools/testing/selftests/gpio/gpio-chip-info.c create mode 100644 tools/testing/selftests/gpio/gpio-line-name.c create mode 100755 tools/testing/selftests/gpio/gpio-sim.sh
Signature · 1 line
2.30.1
PATCH v4 1/11 configfs: increase the item name length
From: Bartosz Golaszewski <[email protected]>
20 characters limit for item name is relatively small. Let's increase it to 32 to fit '04-committable-children' - a name we'll use in the sample code for committable items.
Signed-off-by Bartosz Golaszewski <[email protected]>
Acked-by Linus Walleij <[email protected]>
--- include/linux/configfs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/configfs.h +1 -1
@@ -27,7 +27,7 @@#include <linux/kref.h> /* struct kref */ #include <linux/mutex.h> /* struct mutex */ -#define CONFIGFS_ITEM_NAME_LEN 20 +#define CONFIGFS_ITEM_NAME_LEN 32struct module ;
Signature · 1 line
2.30.1
PATCH v4 2/11 configfs: use (1UL << bit) for internal flags
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
For better readability and maintenance: use the (1UL << bit) for flag definitions.
Signed-off-by Bartosz Golaszewski <[email protected]>
Acked-by Linus Walleij <[email protected]>
--- fs/configfs/configfs_internal.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
fs/configfs/configfs_internal.h +10 -10
@@ -46,16 +46,16 @@ struct configfs_dirent {struct configfs_fragment *s_frag; }; -#define CONFIGFS_ROOT 0x0001 -#define CONFIGFS_DIR 0x0002 -#define CONFIGFS_ITEM_ATTR 0x0004 -#define CONFIGFS_ITEM_BIN_ATTR 0x0008 -#define CONFIGFS_ITEM_LINK 0x0020 -#define CONFIGFS_USET_DIR 0x0040 -#define CONFIGFS_USET_DEFAULT 0x0080 -#define CONFIGFS_USET_DROPPING 0x0100 -#define CONFIGFS_USET_IN_MKDIR 0x0200 -#define CONFIGFS_USET_CREATING 0x0400 +#define CONFIGFS_ROOT (1UL << 0) +#define CONFIGFS_DIR (1UL << 1) +#define CONFIGFS_ITEM_ATTR (1UL << 2) +#define CONFIGFS_ITEM_BIN_ATTR (1UL << 3) +#define CONFIGFS_ITEM_LINK (1UL << 5) +#define CONFIGFS_USET_DIR (1UL << 6) +#define CONFIGFS_USET_DEFAULT (1UL << 7) +#define CONFIGFS_USET_DROPPING (1UL << 8) +#define CONFIGFS_USET_IN_MKDIR (1UL << 9) +#define CONFIGFS_USET_CREATING (1UL << 10)#define CONFIGFS_NOT_PINNED (CONFIGFS_ITEM_ATTR | CONFIGFS_ITEM_BIN_ATTR)extern struct mutex configfs_symlink_mutex;
Signature · 1 line
2.30.1
PATCH v4 3/11 configfs: implement committable items
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
This implements configfs committable items. We mostly follow the documentation except that we extend config_group_ops with uncommit_item() callback for reverting the changes made by commit_item().
Each committable group has two sub-directories: pending and live. New items can only be created in pending/. Attributes can only be modified while the item is in pending/. Once it's ready to be committed, it must be moved over to live/ using the rename() system call. This is when the commit_item() function will be called.
Implementation-wise: we reuse the default group mechanism to elegantly plug the new pseude-groups into configfs. The pending group inherits the parent group's operations so that config_items can be seamlesly created in it using the callbacks supplied by the user as part of the committable group itself.
Signed-off-by Bartosz Golaszewski <[email protected]>
Acked-by Linus Walleij <[email protected]>
--- Documentation/filesystems/configfs.rst | 6 +- fs/configfs/configfs_internal.h | 2 + fs/configfs/dir.c | 245 ++++++++++++++++++++++++- include/linux/configfs.h | 1 + 4 files changed, 245 insertions(+), 9 deletions(-)
Documentation/filesystems/configfs.rst +2 -4
@@ -290,6 +290,7 @@ config_item_type:: struct config_group *(*make_group)(struct config_group *group, const char *name); int (*commit_item)(struct config_item *item); + int (*uncommit_item)(struct config_item *item); void (*disconnect_notify)(struct config_group *group, struct config_item *item); void (*drop_item)(struct config_group *group,
@@ -490,9 +491,6 @@ pass up an error. Committable Items ================= -Note: - Committable items are currently unimplemented. - Some config_items cannot have a valid initial state. That is, no default values can be specified for the item's attributes such that the item can do its work. Userspace must configure one or more attributes,
@@ -532,4 +530,4 @@ method returns zero and the item is moved to the "live" directory. As rmdir(2) does not work in the "live" directory, an item must be shutdown, or "uncommitted". Again, this is done via rename(2), this time from the "live" directory back to the "pending" one. The subsystem -is notified by the ct_group_ops->uncommit_object() method. +is notified by the ct_group_ops->uncommit_item() method.
fs/configfs/configfs_internal.h +2 -0
@@ -56,6 +56,8 @@ struct configfs_dirent {#define CONFIGFS_USET_DROPPING (1UL << 8)#define CONFIGFS_USET_IN_MKDIR (1UL << 9)#define CONFIGFS_USET_CREATING (1UL << 10) +#define CONFIGFS_GROUP_PENDING (1UL << 11) +#define CONFIGFS_GROUP_LIVE (1UL << 12)#define CONFIGFS_NOT_PINNED (CONFIGFS_ITEM_ATTR | CONFIGFS_ITEM_BIN_ATTR)extern struct mutex configfs_symlink_mutex;
fs/configfs/dir.c +240 -5
291 lines not on this page · raw message
include/linux/configfs.h +1 -0
@@ -219,6 +219,7 @@ struct configfs_group_operations {struct config_item *(*make_item)(struct config_group *group,const char *name);struct config_group *(*make_group)(struct config_group *group,const char *name);int (*commit_item)(struct config_item *item); +int (*uncommit_item)(struct config_item *item);void (*disconnect_notify)(struct config_group *group,struct config_item *item);void (*drop_item)(struct config_group *group,struct config_item *item); };
Signature · 1 line
2.30.1
PATCH v4 4/11 samples: configfs: add a committable group
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
Add an example of using committable items to configfs samples. Each config item has two attributes: read-write 'storeme' which works similarly to other examples in this file and a read-only 'committed' attribute which changes its value between false and true depending on whether it's committed or not at the moment.
Signed-off-by Bartosz Golaszewski <[email protected]>
Acked-by Linus Walleij <[email protected]>
--- samples/configfs/configfs_sample.c | 153 +++++++++++++++++++++++++++++ 1 file changed, 153 insertions(+)
samples/configfs/configfs_sample.c +153 -0
@@ -315,6 +315,158 @@ static struct configfs_subsystem group_children_subsys = {/* ----------------------------------------------------------------- */ +/* +* 04-committable-children +* +* This is an example of a committable group. It's similar to the simple +* children example but each config_item has an additional 'committed' +* attribute which is read-only and is only modified when the config_item +* is moved from the 'pending' to the 'live' directory. +*/ + +struct committable_child { +struct config_item item; +int storeme; +bool committed; +}; + +static inline struct committable_child * +to_committable_child (struct config_item *item) +{ + return container_of(item, struct committable_child, item); +} + +static ssize_t +committable_child_storeme_show (struct config_item *item,char *page) +{ +return sprintf (page,"%d\n" ,to_committable_child (item)->storeme); +} + +static ssize_t committable_child_storeme_store (struct config_item *item, +const char *page,size_t count) +{ +struct committable_child *child =to_committable_child (item); +int ret; + +if (child->committed) +return -EPERM ; + + ret =kstrtoint (page,10 , &child->storeme); +if (ret) +return ret; + +return count; +} + +CONFIGFS_ATTR (committable_child_, storeme); + +static ssize_t +committable_child_committed_show (struct config_item *item,char *page) +{ +return sprintf (page,"%s\n" , +to_committable_child (item)->committed ?"true" :"false" ); +} + +CONFIGFS_ATTR_RO (committable_child_, committed); + +static struct configfs_attribute *committable_child_attrs[] = { + &committable_child_attr_storeme, + &committable_child_attr_committed, +NULL , +}; + +static void committable_child_release (struct config_item *item) +{ +kfree (to_committable_child (item)); +} + +static struct configfs_item_operations committable_child_item_ops = { + .release = committable_child_release, +}; + +static const struct config_item_type committable_child_type = { + .ct_item_ops = &committable_child_item_ops, + .ct_attrs = committable_child_attrs, + .ct_owner =THIS_MODULE , +}; + +struct committable_children { +struct config_group group; +}; + +static struct config_item * +committable_children_make_item (struct config_group *group,const char *name) +{ +struct committable_child *child; + + child =kzalloc (sizeof (*child),GFP_KERNEL ); +if (!child) +return ERR_PTR (-ENOMEM ); + +config_item_init_type_name (&child->item, name, &committable_child_type); + +return &child->item; +} + +static ssize_t +committable_children_description_show (struct config_item *item,char *page) +{ +return sprintf (page, +"[04-committable-children]\n" +"\n" +"This subsystem allows creation of committable config_items. The subsystem\n" +"has two subdirectories: pending and live. New config_items can only be\n" +"created in pending/ and they have one writable and readable attribute as\n" +"well as a single read-only attribute. The latter is only changed once the\n" +"item is 'committed'. This is done by moving the config_item (using\n" +"rename()) to the live/ directory. In this example, the storeme attribute\n" +"becomes 'read-only' once committed.\n" ); +} + +CONFIGFS_ATTR_RO (committable_children_, description); + +static struct configfs_attribute *committable_children_attrs[] = { + &committable_children_attr_description, +NULL , +}; + +static int committable_children_commit_item (struct config_item *item) +{ +to_committable_child (item)->committed = true; + +return 0 ; +} + +static int committable_children_uncommit_item (struct config_item *item) +{ +to_committable_child (item)->committed = false; + +return 0 ; +} + +static struct configfs_group_operations committable_children_group_ops = { + .make_item = committable_children_make_item, + .commit_item = committable_children_commit_item, + .uncommit_item = committable_children_uncommit_item, +}; + +static const struct config_item_type committable_children_type = { + .ct_group_ops = &committable_children_group_ops, + .ct_attrs = committable_children_attrs, + .ct_owner =THIS_MODULE , +}; + +static struct configfs_subsystem committable_children_subsys = { + .su_group = { + .cg_item = { + .ci_namebuf ="04-committable-children" , + .ci_type = &committable_children_type, + }, + }, +}; + +/* ----------------------------------------------------------------- */ +/* * We're now done with our subsystem definitions. * For convenience in this module, here's a list of them all. It
@@ -326,6 +478,7 @@ static struct configfs_subsystem *example_subsys[] = { &childless_subsys.subsys, &simple_children_subsys, &group_children_subsys, + &committable_children_subsys, NULL, };
Signature · 1 line
2.30.1
PATCH v4 5/11 lib: bitmap: remove the 'extern' keyword from function declarations
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
The 'extern' keyword doesn't have any benefits in header files. Remove it.
Signed-off-by Bartosz Golaszewski <[email protected]>
Reviewed-by Andy Shevchenko <[email protected]>
--- include/linux/bitmap.h | 115 ++++++++++++++++++++--------------------- 1 file changed, 57 insertions(+), 58 deletions(-)
include/linux/bitmap.h +57 -58
@@ -118,54 +118,53 @@* Allocation and deallocation of bitmap. * Provided in lib/bitmap.c to avoid circular dependency. */ -extern unsigned long *bitmap_alloc (unsigned int nbits,gfp_t flags); -extern unsigned long *bitmap_zalloc (unsigned int nbits,gfp_t flags); -extern void bitmap_free (const unsigned long *bitmap); +unsigned long *bitmap_alloc (unsigned int nbits,gfp_t flags); +unsigned long *bitmap_zalloc (unsigned int nbits,gfp_t flags); +void bitmap_free (const unsigned long *bitmap);/* * lib/bitmap.c provides these functions: */ -extern int __bitmap_equal (const unsigned long *bitmap1, -const unsigned long *bitmap2,unsigned int nbits); -extern bool __pure __bitmap_or_equal (const unsigned long *src1, -const unsigned long *src2, -const unsigned long *src3, -unsigned int nbits); -extern void __bitmap_complement (unsigned long *dst,const unsigned long *src, -unsigned int nbits); -extern void __bitmap_shift_right (unsigned long *dst,const unsigned long *src, -unsigned int shift,unsigned int nbits); -extern void __bitmap_shift_left (unsigned long *dst,const unsigned long *src, -unsigned int shift,unsigned int nbits); -extern void bitmap_cut (unsigned long *dst,const unsigned long *src, -unsigned int first,unsigned int cut, -unsigned int nbits); -extern int __bitmap_and (unsigned long *dst,const unsigned long *bitmap1, +int __bitmap_equal (const unsigned long *bitmap1, +const unsigned long *bitmap2,unsigned int nbits); +bool __pure __bitmap_or_equal (const unsigned long *src1, +const unsigned long *src2, +const unsigned long *src3, +unsigned int nbits); +void __bitmap_complement (unsigned long *dst,const unsigned long *src, +unsigned int nbits); +void __bitmap_shift_right (unsigned long *dst,const unsigned long *src, +unsigned int shift,unsigned int nbits); +void __bitmap_shift_left (unsigned long *dst,const unsigned long *src, +unsigned int shift,unsigned int nbits); +void bitmap_cut (unsigned long *dst,const unsigned long *src, +unsigned int first,unsigned int cut,unsigned int nbits); +int __bitmap_and (unsigned long *dst,const unsigned long *bitmap1, +const unsigned long *bitmap2,unsigned int nbits); +void __bitmap_or (unsigned long *dst,const unsigned long *bitmap1, +const unsigned long *bitmap2,unsigned int nbits); +void __bitmap_xor (unsigned long *dst,const unsigned long *bitmap1, +const unsigned long *bitmap2,unsigned int nbits); +int __bitmap_andnot (unsigned long *dst,const unsigned long *bitmap1, +const unsigned long *bitmap2,unsigned int nbits); +void __bitmap_replace (unsigned long *dst, +const unsigned long *old,const unsigned long *new, +const unsigned long *mask,unsigned int nbits); +int __bitmap_intersects (const unsigned long *bitmap1,const unsigned long *bitmap2,unsigned int nbits); -extern void __bitmap_or (unsigned long *dst,const unsigned long *bitmap1, -const unsigned long *bitmap2,unsigned int nbits); -extern void __bitmap_xor (unsigned long *dst,const unsigned long *bitmap1, -const unsigned long *bitmap2,unsigned int nbits); -extern int __bitmap_andnot (unsigned long *dst,const unsigned long *bitmap1, -const unsigned long *bitmap2,unsigned int nbits); -extern void __bitmap_replace (unsigned long *dst, -const unsigned long *old,const unsigned long *new, -const unsigned long *mask,unsigned int nbits); -extern int __bitmap_intersects (const unsigned long *bitmap1, -const unsigned long *bitmap2,unsigned int nbits); -extern int __bitmap_subset (const unsigned long *bitmap1, -const unsigned long *bitmap2,unsigned int nbits); -extern int __bitmap_weight (const unsigned long *bitmap,unsigned int nbits); -extern void __bitmap_set (unsigned long *map,unsigned int start,int len); -extern void __bitmap_clear (unsigned long *map,unsigned int start,int len); - -extern unsigned long bitmap_find_next_zero_area_off (unsigned long *map, -unsigned long size, -unsigned long start, -unsigned int nr, -unsigned long align_mask, -unsigned long align_offset); +int __bitmap_subset (const unsigned long *bitmap1, +const unsigned long *bitmap2,unsigned int nbits); +int __bitmap_weight (const unsigned long *bitmap,unsigned int nbits); +void __bitmap_set (unsigned long *map,unsigned int start,int len); +void __bitmap_clear (unsigned long *map,unsigned int start,int len); + +unsigned long bitmap_find_next_zero_area_off (unsigned long *map, +unsigned long size, +unsigned long start, +unsigned int nr, +unsigned long align_mask, +unsigned long align_offset);/** * bitmap_find_next_zero_area - find a contiguous aligned zero area
@@ -190,33 +189,33 @@ bitmap_find_next_zero_area(unsigned long *map, align_mask, 0); } -extern int bitmap_parse (const char *buf,unsigned int buflen, +int bitmap_parse (const char *buf,unsigned int buflen,unsigned long *dst,int nbits); -extern int bitmap_parse_user (const char __user *ubuf,unsigned int ulen, +int bitmap_parse_user (const char __user *ubuf,unsigned int ulen,unsigned long *dst,int nbits); -extern int bitmap_parselist (const char *buf,unsigned long *maskp, +int bitmap_parselist (const char *buf,unsigned long *maskp,int nmaskbits); -extern int bitmap_parselist_user (const char __user *ubuf,unsigned int ulen, +int bitmap_parselist_user (const char __user *ubuf,unsigned int ulen,unsigned long *dst,int nbits); -extern void bitmap_remap (unsigned long *dst,const unsigned long *src, +void bitmap_remap (unsigned long *dst,const unsigned long *src,const unsigned long *old,const unsigned long *new,unsigned int nbits); -extern int bitmap_bitremap (int oldbit, +int bitmap_bitremap (int oldbit,const unsigned long *old,const unsigned long *new,int bits); -extern void bitmap_onto (unsigned long *dst,const unsigned long *orig, +void bitmap_onto (unsigned long *dst,const unsigned long *orig,const unsigned long *relmap,unsigned int bits); -extern void bitmap_fold (unsigned long *dst,const unsigned long *orig, +void bitmap_fold (unsigned long *dst,const unsigned long *orig,unsigned int sz,unsigned int nbits); -extern int bitmap_find_free_region (unsigned long *bitmap,unsigned int bits,int order); -extern void bitmap_release_region (unsigned long *bitmap,unsigned int pos,int order); -extern int bitmap_allocate_region (unsigned long *bitmap,unsigned int pos,int order); +int bitmap_find_free_region (unsigned long *bitmap,unsigned int bits,int order); +void bitmap_release_region (unsigned long *bitmap,unsigned int pos,int order); +int bitmap_allocate_region (unsigned long *bitmap,unsigned int pos,int order);#ifdef __BIG_ENDIAN -extern void bitmap_copy_le (unsigned long *dst,const unsigned long *src,unsigned int nbits); +void bitmap_copy_le (unsigned long *dst,const unsigned long *src,unsigned int nbits);#else #define bitmap_copy_le bitmap_copy#endif -extern unsigned int bitmap_ord_to_pos (const unsigned long *bitmap,unsigned int ord,unsigned int nbits); -extern int bitmap_print_to_pagebuf (bool list,char *buf, +unsigned int bitmap_ord_to_pos (const unsigned long *bitmap,unsigned int ord,unsigned int nbits); +int bitmap_print_to_pagebuf (bool list,char *buf,const unsigned long *maskp,int nmaskbits);#define BITMAP_FIRST_WORD_MASK (start) (~0UL << ((start) & (BITS_PER_LONG - 1)))
@@ -265,9 +264,9 @@ static inline void bitmap_copy_clear_tail(unsigned long *dst,* therefore conversion is not needed when copying data from/to arrays of u32. */ #if BITS_PER_LONG ==64 -extern void bitmap_from_arr32 (unsigned long *bitmap,const u32 *buf, +void bitmap_from_arr32 (unsigned long *bitmap,const u32 *buf,unsigned int nbits); -extern void bitmap_to_arr32 (u32 *buf,const unsigned long *bitmap, +void bitmap_to_arr32 (u32 *buf,const unsigned long *bitmap,unsigned int nbits);#else #define bitmap_from_arr32 (bitmap, buf, nbits) \
Signature · 1 line
2.30.1
PATCH v4 6/11 lib: bitmap: order includes alphabetically
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
For better readability and maintenance: order the includes in bitmap source files alphabetically.
Signed-off-by Bartosz Golaszewski <[email protected]>
Reviewed-by Andy Shevchenko <[email protected]>
--- include/linux/bitmap.h | 4 ++-- lib/bitmap.c | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-)
include/linux/bitmap.h +2 -2
@@ -4,10 +4,10 @@#ifndef __ASSEMBLY__ -#include <linux/types.h> #include <linux/bitops.h> -#include <linux/string.h> #include <linux/kernel.h> +#include <linux/string.h> +#include <linux/types.h> /* * bitmaps provide bit arrays that consume one or more unsigned
lib/bitmap.c +5 -4
@@ -3,17 +3,18 @@* lib/bitmap.c * Helper functions for bitmap.h. */ -#include <linux/export.h> -#include <linux/thread_info.h> -#include <linux/ctype.h> -#include <linux/errno.h> +#include <linux/bitmap.h> #include <linux/bitops.h> #include <linux/bug.h> +#include <linux/ctype.h> +#include <linux/errno.h> +#include <linux/export.h> #include <linux/kernel.h> #include <linux/mm.h> #include <linux/slab.h> #include <linux/string.h> +#include <linux/thread_info.h> #include <linux/uaccess.h> #include <asm/page.h>
Signature · 1 line
2.30.1
PATCH v4 7/11 lib: bitmap: provide devm_bitmap_alloc() and devm_bitmap_zalloc()
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
Provide managed variants of bitmap_alloc() and bitmap_zalloc().
Signed-off-by Bartosz Golaszewski <[email protected]>
Reviewed-by Andy Shevchenko <[email protected]>
--- include/linux/bitmap.h | 8 ++++++++ lib/bitmap.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+)
include/linux/bitmap.h +8 -0
@@ -9,6 +9,8 @@#include <linux/string.h> #include <linux/types.h> +struct device ; +/* * bitmaps provide bit arrays that consume one or more unsigned * longs. The bitmap interface and available operations are listed
@@ -122,6 +124,12 @@ unsigned long *bitmap_alloc(unsigned int nbits, gfp_t flags);unsigned long *bitmap_zalloc (unsigned int nbits,gfp_t flags);void bitmap_free (const unsigned long *bitmap); +/* Managed variants of the above. */ +unsigned long *devm_bitmap_alloc (struct device *dev, +unsigned int nbits,gfp_t flags); +unsigned long *devm_bitmap_zalloc (struct device *dev, +unsigned int nbits,gfp_t flags); +/* * lib/bitmap.c provides these functions: */
lib/bitmap.c +33 -0
@@ -8,6 +8,7 @@#include <linux/bitops.h> #include <linux/bug.h> #include <linux/ctype.h> +#include <linux/device.h> #include <linux/errno.h> #include <linux/export.h> #include <linux/kernel.h>
@@ -1263,6 +1264,38 @@ void bitmap_free(const unsigned long *bitmap) }EXPORT_SYMBOL (bitmap_free); +static void devm_bitmap_free (void *data) +{ +unsigned long *bitmap = data; + +bitmap_free (bitmap); +} + +unsigned long *devm_bitmap_alloc (struct device *dev, +unsigned int nbits,gfp_t flags) +{ +unsigned long *bitmap; +int ret; + + bitmap =bitmap_alloc (nbits, flags); +if (!bitmap) +return NULL ; + + ret =devm_add_action_or_reset (dev, devm_bitmap_free, bitmap); +if (ret) +return NULL ; + +return bitmap; +} +EXPORT_SYMBOL (devm_bitmap_alloc); + +unsigned long *devm_bitmap_zalloc (struct device *dev, +unsigned int nbits,gfp_t flags) +{ +return devm_bitmap_alloc (dev, nbits, flags | __GFP_ZERO); +} +EXPORT_SYMBOL (devm_bitmap_zalloc); +#if BITS_PER_LONG ==64 /** * bitmap_from_arr32 - copy the contents of u32 array of bits to bitmap
Signature · 1 line
2.30.1
Re: [PATCH v4 07/11] lib: bitmap: provide devm_bitmap_alloc() and devm_bitmap_zalloc()
Quoted 3 lines · Bartosz Golaszewski
From: Bartosz Golaszewski <[email protected]>
Provide managed variants of
bitmap_alloc()andbitmap_zalloc().
Perhaps I missed your answer to Greg's comment... So, what do you think about adding _GPL to the export?
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v4 07/11] lib: bitmap: provide devm_bitmap_alloc() and devm_bitmap_zalloc()
Quoted 4 lines · Andy Shevchenko
Quoted 2 lines · Bartosz Golaszewski
From: Bartosz Golaszewski <[email protected]>
Quoted 10 lines
Quoted 1 line
Provide managed variants of
bitmap_alloc()andbitmap_zalloc().Perhaps I missed your answer to Greg's comment... So, what do you think about adding
_GPLto the export?--
With Best Regards,
Andy Shevchenko
Nah, I missed Greg's comment. :(
Will fix in v5.
Bart
PATCH v4 8/11 gpio: sim: new testing module
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
Implement a new, modern GPIO testing module controlled by configfs attributes instead of module parameters. The goal of this driver is to provide a replacement for gpio-mockup that will be easily extensible with new features and doesn't require reloading the module to change the setup.
Signed-off-by Bartosz Golaszewski <[email protected]>
Reviewed-by Andy Shevchenko <[email protected]>
Reviewed-by Linus Walleij <[email protected]>
--- Documentation/admin-guide/gpio/gpio-sim.rst | 72 ++ drivers/gpio/Kconfig | 8 + drivers/gpio/Makefile | 1 + drivers/gpio/gpio-sim.c | 874 ++++++++++++++++++++ 4 files changed, 955 insertions(+) create mode 100644 Documentation/admin-guide/gpio/gpio-sim.rst create mode 100644 drivers/gpio/gpio-sim.c
Documentation/admin-guide/gpio/gpio-sim.rst new file +72 -0
@@ -0,0 +1,72 @@ +.. SPDX-License-Identifier: GPL-2.0-or-later + +Configfs GPIO Simulator +======================= + +The configfs GPIO Simulator (gpio-sim) provides a way to create simulated GPIO +chips for testing purposes. The lines exposed by these chips can be accessed +using the standard GPIO character device interface as well as manipulated +using sysfs attributes. + +Creating simulated chips +------------------------ + +The gpio-sim module registers a configfs subsystem called 'gpio-sim'. It's a +subsystem with committable items which means two subdirectories are created in +the filesystem: pending and live. For more information on configfs and +committable items, please refer to Documentation/filesystems/configfs.rst. + +In order to instantiate a new simulated chip, the user needs to mkdir() a new +directory in pending/. Inside each new directory, there's a set of attributes +that can be used to configure the new chip. Once the configuration is complete, +the user needs to use rename() to move the chip to the live/ directory. This +creates and registers the new device. + +In order to destroy a simulated chip, it has to be moved back to pending first +and then removed using rmdir(). + +Currently supported configuration attributes are: + + num_lines - an unsigned integer value defining the number of GPIO lines to + export + + label - a string defining the label for the GPIO chip + + line_names - a list of GPIO line names in the form of quoted strings + separated by commas, e.g.: '"foo", "bar", "", "foobar"'. The + number of strings doesn't have to be equal to the value set in + the num_lines attribute. If it's lower than the number of lines, + the remaining lines are unnamed. If it's larger, the superfluous + lines are ignored. A name of the form: '""' means the line + should be unnamed. + +Additionally two read-only attributes named 'chip_name' and 'dev_name' are +exposed in order to provide users with a mapping from configfs directories to +the actual devices created in the kernel. The former returns the name of the +GPIO device as assigned by gpiolib (i.e. "gpiochip0", "gpiochip1", etc.). The +latter returns the parent device name as defined by the gpio-sim driver (i.e. +"gpio-sim.0", "gpio-sim.1", etc.). This allows user-space to map the configfs +items both to the correct character device file as well as the associated entry +in sysfs. + +Simulated GPIO chips can also be defined in device-tree. The compatible string +must be: "gpio-simulator". Supported properties are: + + "gpio-sim,label" - chip label + + "gpio-sim,nr-gpios" - number of lines + +Other standard GPIO properties (like "gpio-line-names" and gpio-hog) are also +supported. + +Manipulating simulated lines +---------------------------- + +Each simulated GPIO chip creates a sysfs attribute group under its device +directory called 'line-ctrl'. Inside each group, there's a separate attribute +for each GPIO line. The name of the attribute is of the form 'gpioX' where X +is the line's offset in the chip. + +Reading from a line attribute returns the current value. Writing to it (0 or 1) +changes the configuration of the simulated pull-up/pull-down resistor +(1 - pull-up, 0 - pull-down).
drivers/gpio/Kconfig +8 -0
@@ -1633,6 +1633,14 @@ config GPIO_MOCKUP tools/testing/selftests/gpio/gpio-mockup.sh. Reference the usage in it. +config GPIO_SIM + tristate "GPIO Simulator Module" + select IRQ_SIM + select CONFIGFS_FS + help + This enables the GPIO simulator - a configfs-based GPIO testing + driver. + endmenu endif
drivers/gpio/Makefile +1 -0
@@ -130,6 +130,7 @@ obj-$(CONFIG_GPIO_SAMA5D2_PIOBU) += gpio-sama5d2-piobu.o obj-$(CONFIG_GPIO_SCH311X) += gpio-sch311x.o obj-$(CONFIG_GPIO_SCH) += gpio-sch.o obj-$(CONFIG_GPIO_SIFIVE) += gpio-sifive.o +obj-$(CONFIG_GPIO_SIM) += gpio-sim.o obj-$(CONFIG_GPIO_SIOX) += gpio-siox.o obj-$(CONFIG_GPIO_SL28CPLD) += gpio-sl28cpld.o obj-$(CONFIG_GPIO_SODAVILLE) += gpio-sodaville.o
drivers/gpio/gpio-sim.c new file +874 -0
874 lines not on this page · raw message
Signature · 1 line
2.30.1
PATCH v4 9/11 selftests: gpio: provide a helper for reading chip info
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
Add a simple program that allows to retrieve chip properties from the GPIO character device. This will be used in gpio-sim selftests.
Signed-off-by Bartosz Golaszewski <[email protected]>
--- tools/testing/selftests/gpio/.gitignore | 1 + tools/testing/selftests/gpio/Makefile | 2 +- tools/testing/selftests/gpio/gpio-chip-info.c | 57 +++++++++++++++++++ 3 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/gpio/gpio-chip-info.c
tools/testing/selftests/gpio/.gitignore +1 -0
@@ -1,2 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only gpio-mockup-cdev +gpio-chip-info
tools/testing/selftests/gpio/Makefile +1 -1
@@ -2,6 +2,6 @@ TEST_PROGS := gpio-mockup.sh TEST_FILES := gpio-mockup-sysfs.sh -TEST_GEN_PROGS_EXTENDED := gpio-mockup-cdev +TEST_GEN_PROGS_EXTENDED := gpio-mockup-cdev gpio-chip-info include ../lib.mk
tools/testing/selftests/gpio/gpio-chip-info.c new file +57 -0
57 lines not on this page · raw message
Signature · 1 line
2.30.1
PATCH v4 10/11 selftests: gpio: add a helper for reading GPIO line names
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
Add a simple program that allows to read GPIO line names from the character device. This will be used in gpio-sim selftests.
Signed-off-by Bartosz Golaszewski <[email protected]>
--- tools/testing/selftests/gpio/.gitignore | 1 + tools/testing/selftests/gpio/Makefile | 2 +- tools/testing/selftests/gpio/gpio-line-name.c | 55 +++++++++++++++++++ 3 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/gpio/gpio-line-name.c
tools/testing/selftests/gpio/.gitignore +1 -0
@@ -1,3 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only gpio-mockup-cdev gpio-chip-info +gpio-line-name
tools/testing/selftests/gpio/Makefile +1 -1
@@ -2,6 +2,6 @@ TEST_PROGS := gpio-mockup.sh TEST_FILES := gpio-mockup-sysfs.sh -TEST_GEN_PROGS_EXTENDED := gpio-mockup-cdev gpio-chip-info +TEST_GEN_PROGS_EXTENDED := gpio-mockup-cdev gpio-chip-info gpio-line-name include ../lib.mk
tools/testing/selftests/gpio/gpio-line-name.c new file +55 -0
55 lines not on this page · raw message
Signature · 1 line
2.30.1
PATCH v4 11/11 selftests: gpio: add test cases for gpio-sim
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
Add a set of tests for the new gpio-sim module. This is a pure shell test-suite and uses the helper programs available in the gpio selftests directory. These test-cases only test the functionalities exposed by the gpio-sim driver, not those handled by core gpiolib code.
Signed-off-by Bartosz Golaszewski <[email protected]>
--- tools/testing/selftests/gpio/Makefile | 2 +- tools/testing/selftests/gpio/config | 1 + tools/testing/selftests/gpio/gpio-sim.sh | 229 +++++++++++++++++++++++ 3 files changed, 231 insertions(+), 1 deletion(-) create mode 100755 tools/testing/selftests/gpio/gpio-sim.sh
tools/testing/selftests/gpio/Makefile +1 -1
@@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 -TEST_PROGS := gpio-mockup.sh +TEST_PROGS := gpio-mockup.sh gpio-sim.sh TEST_FILES := gpio-mockup-sysfs.sh TEST_GEN_PROGS_EXTENDED := gpio-mockup-cdev gpio-chip-info gpio-line-name
tools/testing/selftests/gpio/config +1 -0
@@ -1,3 +1,4 @@ CONFIG_GPIOLIB=y CONFIG_GPIO_CDEV=y CONFIG_GPIO_MOCKUP=m +CONFIG_GPIO_SIM=m
tools/testing/selftests/gpio/gpio-sim.sh new file +229 -0
229 lines not on this page · raw message
Signature · 1 line
2.30.1