gpiolib: indicate errors in value setters
Subsystems (7)
cover gpiolib: indicate errors in value setters
The value setter callbacks (both for single and multiple lines) return void even though we have many types of controllers that can fail to set a line's value: i2c, SPI, USB, etc.
For the consumer API: single line setters return void. Multiple line setters do have an integer return value but due to the above, they still cannot be used to indicate problems within the driver.
This series proposes to start the process of converting the setters to returning int thus making it possible to propagate any errors to the user.
The first patch changes the consumer interfaces. This has no impact on any user (even though they don't currently check the retval) except for places where any of the functions are passed as function pointer arguments in which case we need to update the affected callers. I only identified one such place - the gpio-latch module. I guess we may find more when the series gets into next.
The second patch adds a wrapper around gpio_chip::set() to limit the number of places where this pointer is dereferenced to one making further work easier. Next we make the existing wrapper around gpio_chip::set_multiple() consistent with the one for set() in terms of the return value as well as SRCU and callback checks.
Finally in patch 4 we add new variants of the set callbacks suffixed with "_rv" indicating that they return a value. We privilege them in the code only falling back to the old ones if the new ones aren't present.
Patches that follow convert several drivers to using the new callbacks to start the process.
My long term plan for this rework is the following:
1. Get this intitial series into the GPIO tree and next. Make sure it doesn't cause problems.
2. Start to convert drivers under drivers/gpio/ until the end of this cycle.
3. After v6.15-rc1 is tagged and the new callbacks are available upstream, start converting drivers outside of drivers/gpio/. For most part, this concerns drivers/pinctrl/ but we also have GPIO drivers scattered in media, sound, iio and old board files.
4. Once all GPIO chips are converted to using the new setters, remove the old callbacks and rename the new ones to the old name in one swift move across the tree (similarly to how the remove_new() was changed back to remove().
---
Bartosz Golaszewski (14):
gpiolib: make value setters have return values
gpiolib: wrap gpio_chip::set()
gpiolib: rework the wrapper around gpio_chip::set_multiple()
gpiolib: introduce gpio_chip setters that return values
gpio: sim: use value returning setters
gpio: regmap: use value returning setters
gpio: pca953x: use value returning setters
gpio: mockup: use value returning setters
gpio: aggregator: use value returning setters
gpio: max77650: use value returning setters
gpio: latch: use lock guards
gpio: latch: use value returning setters
gpio: davinci: use value returning setters
gpio: mvebu: use value returning setters
drivers/gpio/gpio-aggregator.c | 38 +++++++----- drivers/gpio/gpio-davinci.c | 6 +- drivers/gpio/gpio-latch.c | 53 ++++++++-------- drivers/gpio/gpio-max77650.c | 14 ++--- drivers/gpio/gpio-mockup.c | 14 +++-- drivers/gpio/gpio-mvebu.c | 8 +-- drivers/gpio/gpio-pca953x.c | 17 ++--- drivers/gpio/gpio-regmap.c | 21 ++++--- drivers/gpio/gpio-sim.c | 14 +++-- drivers/gpio/gpiolib.c | 137 +++++++++++++++++++++++++++++------------ include/linux/gpio.h | 4 +- include/linux/gpio/consumer.h | 22 ++++--- include/linux/gpio/driver.h | 10 +++ 13 files changed, 228 insertions(+), 130 deletions(-)
---
base-commit: df5d6180169ae06a2eac57e33b077ad6f6252440
change-id: 20250210-gpio-set-retval-41cd6baeead3
Best regards,
Signature · 1 line
Bartosz Golaszewski <[email protected]>
PATCH 1/14 gpiolib: make value setters have return values
From: Bartosz Golaszewski <[email protected]>
Change the in-kernel consumer interface for GPIOs: make all variants of value setters that don't have a return value, return a signed integer instead. That will allow these routines to indicate failures to callers.
This doesn't change the implementation just yet, we'll do it in subsequent commits.
We need to update the gpio-latch module as it passes the address of value setters as a function pointer argument and thus cares about its type.
--- drivers/gpio/gpio-latch.c | 2 +- drivers/gpio/gpiolib.c | 53 ++++++++++++++++++++++++------------------- include/linux/gpio.h | 4 ++-- include/linux/gpio/consumer.h | 22 ++++++++++-------- 4 files changed, 46 insertions(+), 35 deletions(-)
drivers/gpio/gpio-latch.c +1 -1
@@ -72,7 +72,7 @@ static int gpio_latch_get_direction(struct gpio_chip *gc, unsigned int offset) }static void gpio_latch_set_unlocked (struct gpio_latch_priv *priv, -void (*set)(struct gpio_desc *desc,int value), +int (*set)(struct gpio_desc *desc,int value),unsigned int offset,bool val) {int latch = offset / priv->n_latched_gpios;
drivers/gpio/gpiolib.c +30 -23
140 lines not on this page · raw message
include/linux/gpio.h +2 -2
@@ -91,7 +91,7 @@ static inline int gpio_get_value_cansleep(unsigned gpio) }static inline void gpio_set_value_cansleep (unsigned gpio,int value) { -return gpiod_set_raw_value_cansleep (gpio_to_desc (gpio), value); +gpiod_set_raw_value_cansleep (gpio_to_desc (gpio), value); }static inline int gpio_get_value (unsigned gpio)
@@ -100,7 +100,7 @@ static inline int gpio_get_value(unsigned gpio) }static inline void gpio_set_value (unsigned gpio,int value) { -return gpiod_set_raw_value (gpio_to_desc (gpio), value); +gpiod_set_raw_value (gpio_to_desc (gpio), value); }static inline int gpio_to_irq (unsigned gpio)
include/linux/gpio/consumer.h +13 -9
@@ -119,7 +119,7 @@ int gpiod_get_array_value(unsigned int array_size,struct gpio_desc **desc_array, struct gpio_array *array_info, unsigned long *value_bitmap); -void gpiod_set_value (struct gpio_desc *desc,int value); +int gpiod_set_value (struct gpio_desc *desc,int value); int gpiod_set_array_value(unsigned int array_size, struct gpio_desc **desc_array, struct gpio_array *array_info,
@@ -129,7 +129,7 @@ int gpiod_get_raw_array_value(unsigned int array_size,struct gpio_desc **desc_array, struct gpio_array *array_info, unsigned long *value_bitmap); -void gpiod_set_raw_value (struct gpio_desc *desc,int value); +int gpiod_set_raw_value (struct gpio_desc *desc,int value); int gpiod_set_raw_array_value(unsigned int array_size, struct gpio_desc **desc_array, struct gpio_array *array_info,
@@ -141,7 +141,7 @@ int gpiod_get_array_value_cansleep(unsigned int array_size,struct gpio_desc **desc_array, struct gpio_array *array_info, unsigned long *value_bitmap); -void gpiod_set_value_cansleep (struct gpio_desc *desc,int value); +int gpiod_set_value_cansleep (struct gpio_desc *desc,int value); int gpiod_set_array_value_cansleep(unsigned int array_size, struct gpio_desc **desc_array, struct gpio_array *array_info,
@@ -151,7 +151,7 @@ int gpiod_get_raw_array_value_cansleep(unsigned int array_size,struct gpio_desc **desc_array, struct gpio_array *array_info, unsigned long *value_bitmap); -void gpiod_set_raw_value_cansleep (struct gpio_desc *desc,int value); +int gpiod_set_raw_value_cansleep (struct gpio_desc *desc,int value); int gpiod_set_raw_array_value_cansleep(unsigned int array_size, struct gpio_desc **desc_array, struct gpio_array *array_info,
@@ -375,10 +375,11 @@ static inline int gpiod_get_array_value(unsigned int array_size,WARN_ON (desc_array);return 0 ; } -static inline void gpiod_set_value (struct gpio_desc *desc,int value) +static inline int gpiod_set_value (struct gpio_desc *desc,int value) {/* GPIO can never have been requested */ WARN_ON (desc); +return 0 ; } static inline int gpiod_set_array_value(unsigned int array_size, struct gpio_desc **desc_array,
@@ -404,10 +405,11 @@ static inline int gpiod_get_raw_array_value(unsigned int array_size,WARN_ON (desc_array);return 0 ; } -static inline void gpiod_set_raw_value (struct gpio_desc *desc,int value) +static inline int gpiod_set_raw_value (struct gpio_desc *desc,int value) {/* GPIO can never have been requested */ WARN_ON (desc); +return 0 ; } static inline int gpiod_set_raw_array_value(unsigned int array_size, struct gpio_desc **desc_array,
@@ -434,10 +436,11 @@ static inline int gpiod_get_array_value_cansleep(unsigned int array_size,WARN_ON (desc_array);return 0 ; } -static inline void gpiod_set_value_cansleep (struct gpio_desc *desc,int value) +static inline int gpiod_set_value_cansleep (struct gpio_desc *desc,int value) {/* GPIO can never have been requested */ WARN_ON (desc); +return 0 ; } static inline int gpiod_set_array_value_cansleep(unsigned int array_size, struct gpio_desc **desc_array,
@@ -463,11 +466,12 @@ static inline int gpiod_get_raw_array_value_cansleep(unsigned int array_size,WARN_ON (desc_array);return 0 ; } -static inline void gpiod_set_raw_value_cansleep (struct gpio_desc *desc, -int value) +static inline int gpiod_set_raw_value_cansleep (struct gpio_desc *desc, +int value) {/* GPIO can never have been requested */ WARN_ON (desc); +return 0 ; } static inline int gpiod_set_raw_array_value_cansleep(unsigned int array_size, struct gpio_desc **desc_array,
Signature · 1 line
2.45.2
kernel test robot
build botRe: [PATCH 01/14] gpiolib: make value setters have return values
kernel test robot noticed the following build warnings:
Hi Bartosz,
kernel test robot noticed the following build warnings:
[auto build test WARNING on df5d6180169ae06a2eac57e33b077ad6f6252440]
url: https://github.com/intel-lab-lkp/linux/commits/Bartosz-Golaszewski/gpiolib-make-value-setters-have-return-values/20250211-201426 base: df5d6180169ae06a2eac57e33b077ad6f6252440 patch link: https://lore.kernel.org/r/20250211-gpio-set-retval-v1-1-52d3d613d7d3%40linaro.org patch subject: [PATCH 01/14] gpiolib: make value setters have return values config: i386-buildonly-randconfig-002-20250212 (https://download.01.org/0day-ci/archive/20250212/[email protected]/config) compiler: gcc-12 (Debian 12.2.0-14) 12.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250212/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All warnings (new ones prefixed by >>):
drivers/leds/leds-aw200xx.c: In function 'aw200xx_disable':
>> drivers/leds/leds-aw200xx.c:382:16: warning: 'return' with a value, in function returning void [-Wreturn-type]
382 | return gpiod_set_value_cansleep(chip->hwen, 0);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/leds/leds-aw200xx.c:380:13: note: declared here
380 | static void aw200xx_disable(const struct aw200xx *const chip)
| ^~~~~~~~~~~~~~~vim +/return +382 drivers/leds/leds-aw200xx.c
d882762f7950c3 Dmitry Rokosov 2023-11-25 379
d882762f7950c3 Dmitry Rokosov 2023-11-25 380 static void aw200xx_disable(const struct aw200xx *const chip)
d882762f7950c3 Dmitry Rokosov 2023-11-25 381 {d882762f7950c3 Dmitry Rokosov 2023-11-25 @382 return gpiod_set_value_cansleep(chip->hwen, 0);d882762f7950c3 Dmitry Rokosov 2023-11-25 383 }d882762f7950c3 Dmitry Rokosov 2023-11-25 384
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
kernel test robot
build botRe: [PATCH 01/14] gpiolib: make value setters have return values
In reply to Bartosz Golaszewskikernel test robot noticed the following build warnings:
Hi Bartosz,
kernel test robot noticed the following build warnings:
[auto build test WARNING on df5d6180169ae06a2eac57e33b077ad6f6252440]
url: https://github.com/intel-lab-lkp/linux/commits/Bartosz-Golaszewski/gpiolib-make-value-setters-have-return-values/20250211-201426 base: df5d6180169ae06a2eac57e33b077ad6f6252440 patch link: https://lore.kernel.org/r/20250211-gpio-set-retval-v1-1-52d3d613d7d3%40linaro.org patch subject: [PATCH 01/14] gpiolib: make value setters have return values config: s390-randconfig-001-20250212 (https://download.01.org/0day-ci/archive/20250212/[email protected]/config) compiler: clang version 15.0.7 (https://github.com/llvm/llvm-project 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250212/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All warnings (new ones prefixed by >>):
>> drivers/leds/leds-aw200xx.c:382:2: warning: void function 'aw200xx_disable' should not return a value [-Wreturn-type]
return gpiod_set_value_cansleep(chip->hwen, 0);
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~1 warning generated.
vim +/aw200xx_disable +382 drivers/leds/leds-aw200xx.c
d882762f7950c3 Dmitry Rokosov 2023-11-25 379
d882762f7950c3 Dmitry Rokosov 2023-11-25 380 static void aw200xx_disable(const struct aw200xx *const chip)
d882762f7950c3 Dmitry Rokosov 2023-11-25 381 {d882762f7950c3 Dmitry Rokosov 2023-11-25 @382 return gpiod_set_value_cansleep(chip->hwen, 0);d882762f7950c3 Dmitry Rokosov 2023-11-25 383 }d882762f7950c3 Dmitry Rokosov 2023-11-25 384
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
kernel test robot
build botRe: [PATCH 01/14] gpiolib: make value setters have return values
In reply to Bartosz Golaszewskikernel test robot noticed the following build errors:
Hi Bartosz,
kernel test robot noticed the following build errors:
[auto build test ERROR on df5d6180169ae06a2eac57e33b077ad6f6252440]
url: https://github.com/intel-lab-lkp/linux/commits/Bartosz-Golaszewski/gpiolib-make-value-setters-have-return-values/20250211-201426 base: df5d6180169ae06a2eac57e33b077ad6f6252440 patch link: https://lore.kernel.org/r/20250211-gpio-set-retval-v1-1-52d3d613d7d3%40linaro.org patch subject: [PATCH 01/14] gpiolib: make value setters have return values config: sparc-randconfig-002-20250212 (https://download.01.org/0day-ci/archive/20250212/[email protected]/config) compiler: sparc-linux-gcc (GCC) 14.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250212/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
drivers/leds/leds-aw200xx.c: In function 'aw200xx_disable':
>> drivers/leds/leds-aw200xx.c:382:16: error: 'return' with a value, in function returning void [-Wreturn-mismatch]
382 | return gpiod_set_value_cansleep(chip->hwen, 0);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/leds/leds-aw200xx.c:380:13: note: declared here
380 | static void aw200xx_disable(const struct aw200xx *const chip)
| ^~~~~~~~~~~~~~~vim +/return +382 drivers/leds/leds-aw200xx.c
d882762f7950c3d Dmitry Rokosov 2023-11-25 379
d882762f7950c3d Dmitry Rokosov 2023-11-25 380 static void aw200xx_disable(const struct aw200xx *const chip)
d882762f7950c3d Dmitry Rokosov 2023-11-25 381 {d882762f7950c3d Dmitry Rokosov 2023-11-25 @382 return gpiod_set_value_cansleep(chip->hwen, 0);d882762f7950c3d Dmitry Rokosov 2023-11-25 383 }d882762f7950c3d Dmitry Rokosov 2023-11-25 384
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
Re: [PATCH 01/14] gpiolib: make value setters have return values
Quoted 36 lines · kernel test robot
Hi Bartosz,
kernel test robot noticed the following build errors:
[auto build test ERROR on
df5d6180169ae06a2eac57e33b077ad6f6252440]url: https://github.com/intel-lab-lkp/linux/commits/Bartosz-Golaszewski/gpiolib-make-value-setters-have-return-values/20250211-201426 base: df5d6180169ae06a2eac57e33b077ad6f6252440 patch link: https://lore.kernel.org/r/20250211-gpio-set-retval-v1-1-52d3d613d7d3%40linaro.org patch subject: [PATCH 01/14] gpiolib: make value setters have return values config: sparc-randconfig-002-20250212 (https://download.01.org/0day-ci/archive/20250212/[email protected]/config) compiler: sparc-linux-gcc (GCC) 14.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250212/[email protected]/reproduce)If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/All errors (new ones prefixed by >>):
drivers/leds/leds-aw200xx.c: In function 'aw200xx_disable':Quoted 1 line
Quoted 1 line
drivers/leds/leds-aw200xx.c:382:16: error: 'return' with a value, in function returning void [-Wreturn-mismatch]382 | return gpiod_set_value_cansleep(chip->hwen, 0); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/leds/leds-aw200xx.c:380:13: note: declared here 380 | static void aw200xx_disable(const struct aw200xx *const chip) | ^~~~~~~~~~~~~~~vim +/return +382
drivers/leds/leds-aw200xx.cd882762f7950c3d Dmitry Rokosov 2023-11-25 379 d882762f7950c3d Dmitry Rokosov 2023-11-25 380 static void aw200xx_disable(const struct aw200xx *const chip) d882762f7950c3d Dmitry Rokosov 2023-11-25 381 {
Quoted 7 lines
d882762f7950c3dDmitry Rokosov 2023-11-25 @382 returngpiod_set_value_cansleep(chip->hwen, 0);d882762f7950c3dDmitry Rokosov 2023-11-25 383 }d882762f7950c3dDmitry Rokosov 2023-11-25 384--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
These issues will be fixed once
https://lore.kernel.org/lkml/[email protected]/ is in tree.
Bart
PATCH 2/14 gpiolib: wrap gpio_chip::set()
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
We have three places where we dereference the gpio_chip::set() callback. In order to make it easier to incorporate the upcoming new variant of this callback (one returning an integer value), wrap it in a helper so that the dereferencing only happens once.
--- drivers/gpio/gpiolib.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)
drivers/gpio/gpiolib.c +16 -5
@@ -2747,6 +2747,17 @@ int gpiod_direction_input_nonotify(struct gpio_desc *desc)return ret; } +static int gpiochip_set (struct gpio_chip *gc,unsigned int offset,int value) +{ +lockdep_assert_held (&gc->gpiodev->srcu); + +if (WARN_ON (unlikely (!gc->set))) +return -EOPNOTSUPP ; + + gc->set (gc, offset, value); +return 0 ; +} +static int gpiod_direction_output_raw_commit (struct gpio_desc *desc,int value) {int val = !!value, ret =0 ;
@@ -2783,7 +2794,9 @@ static int gpiod_direction_output_raw_commit(struct gpio_desc *desc, int value)* If we can't actively set the direction, we are some * output-only chip, so just drive the output as desired. */ - guard.gc->set (guard.gc,gpio_chip_hwgpio (desc), val); + ret =gpiochip_set (guard.gc,gpio_chip_hwgpio (desc), val); +if (ret) +return ret; }if (!ret)
@@ -3443,9 +3456,7 @@ static int gpiod_set_raw_value_commit(struct gpio_desc *desc, bool value)return -ENODEV ;trace_gpio_value (desc_to_gpio (desc),0 , value); - guard.gc->set (guard.gc,gpio_chip_hwgpio (desc), value); - -return 0 ; +return gpiochip_set (guard.gc,gpio_chip_hwgpio (desc), value); }/*
@@ -3468,7 +3479,7 @@ static void gpio_chip_set_multiple(struct gpio_chip *gc,/* set outputs if the corresponding mask bit is set */ for_each_set_bit (i, mask, gc->ngpio) - gc->set (gc, i,test_bit (i, bits)); +gpiochip_set (gc, i,test_bit (i, bits)); } }
Signature · 1 line
2.45.2
PATCH 3/14 gpiolib: rework the wrapper around gpio_chip::set_multiple()
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
Make the existing wrapper around gpio_chip::set_multiple() consistent with the one for gpio_chip::set(): make it return int, add a lockdep assertion, warn on missing set callback and move the code a bit for better readability.
Add return value checks in all call places.
--- drivers/gpio/gpiolib.c | 45 ++++++++++++++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 13 deletions(-)
drivers/gpio/gpiolib.c +32 -13
@@ -3468,19 +3468,32 @@ static int gpiod_set_raw_value_commit(struct gpio_desc *desc, bool value)* defines which outputs are to be changed * @bits: bit value array; one bit per output; BITS_PER_LONG bits per word * defines the values the outputs specified by mask are to be set to +* +* Returns: 0 on success, negative error number on failure. */ -static void gpio_chip_set_multiple (struct gpio_chip *gc, -unsigned long *mask,unsigned long *bits) +static int gpiochip_set_multiple (struct gpio_chip *gc, +unsigned long *mask,unsigned long *bits) { +unsigned int i; + +lockdep_assert_held (&gc->gpiodev->srcu); + +if (WARN_ON (unlikely (!gc->set_multiple && !gc->set))) +return -EOPNOTSUPP ; +if (gc->set_multiple) { gc->set_multiple (gc, mask, bits); - }else { -unsigned int i; - -/* set outputs if the corresponding mask bit is set */ -for_each_set_bit (i, mask, gc->ngpio) -gpiochip_set (gc, i,test_bit (i, bits)); +return 0 ; } + +/* set outputs if the corresponding mask bit is set */ +for_each_set_bit (i, mask, gc->ngpio) { + ret =gpiochip_set (gc, i,test_bit (i, bits)); +if (ret) +break ; + } + +return ret; } int gpiod_set_array_value_complex(bool raw, bool can_sleep,
@@ -3489,7 +3502,7 @@ int gpiod_set_array_value_complex(bool raw, bool can_sleep,struct gpio_array *array_info, unsigned long *value_bitmap) { - int i = 0; + int i = 0, ret;/* * Validate array_info against desc_array and its size.
@@ -3506,8 +3519,11 @@ int gpiod_set_array_value_complex(bool raw, bool can_sleep,bitmap_xor (value_bitmap, value_bitmap, array_info->invert_mask, array_size); -gpio_chip_set_multiple (array_info->chip, array_info->set_mask, - value_bitmap); + ret =gpiochip_set_multiple (array_info->chip, + array_info->set_mask, + value_bitmap); +if (ret) +return ret; i =find_first_zero_bit (array_info->set_mask, array_size);if (i == array_size)
@@ -3584,8 +3600,11 @@ int gpiod_set_array_value_complex(bool raw, bool can_sleep, }while ((i < array_size) &&gpio_device_chip_cmp (desc_array[i]->gdev, guard.gc));/* push collected bits to outputs */ -if (count !=0 ) -gpio_chip_set_multiple (guard.gc, mask, bits); +if (count !=0 ) { + ret =gpiochip_set_multiple (guard.gc, mask, bits); +if (ret) +return ret; + }if (mask != fastpath_mask)bitmap_free (mask);
Signature · 1 line
2.45.2
PATCH 4/14 gpiolib: introduce gpio_chip setters that return values
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
Add new variants of the set() and set_multiple() callbacks that have integer return values allowing to indicate failures to users of the GPIO consumer API. Until we convert all GPIO providers treewide to using them, they will live in parallel to the existing ones.
Make sure that providers cannot define both. Prefer the new ones and only use the old ones as fallback.
--- drivers/gpio/gpiolib.c | 28 ++++++++++++++++++++++++++-- include/linux/gpio/driver.h | 10 ++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-)
drivers/gpio/gpiolib.c +26 -2
@@ -926,6 +926,11 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data,int base =0 ;int ret =0 ; +/* Only allow one set() and one set_multiple(). */ +if ((gc->set && gc->set_rv) || + (gc->set_multiple && gc->set_multiple_rv)) +return -EINVAL ; +/* * First: allocate and populate the internal stat container, and * set up the struct device.
@@ -2749,11 +2754,21 @@ int gpiod_direction_input_nonotify(struct gpio_desc *desc)static int gpiochip_set (struct gpio_chip *gc,unsigned int offset,int value) { +int ret; +lockdep_assert_held (&gc->gpiodev->srcu); -if (WARN_ON (unlikely (!gc->set))) +if (WARN_ON (unlikely (!gc->set && !gc->set_rv)))return -EOPNOTSUPP ; +if (gc->set_rv) { + ret = gc->set_rv (gc, offset, value); +if (ret >0 ) + ret = -EBADE ; + +return ret; + } + gc->set (gc, offset, value);return 0 ; }
@@ -3475,12 +3490,21 @@ static int gpiochip_set_multiple(struct gpio_chip *gc, unsigned long *mask, unsigned long *bits) { unsigned int i; +int ret;lockdep_assert_held (&gc->gpiodev->srcu); -if (WARN_ON (unlikely (!gc->set_multiple && !gc->set))) +if (WARN_ON (unlikely (!gc->set_multiple && !gc->set_multiple_rv)))return -EOPNOTSUPP ; +if (gc->set_multiple_rv) { + ret = gc->set_multiple_rv (gc, mask, bits); +if (ret >0 ) + ret = -EBADE ; + +return ret; + } +if (gc->set_multiple) { gc->set_multiple (gc, mask, bits);return 0 ;
include/linux/gpio/driver.h +10 -0
@@ -346,6 +346,10 @@ struct gpio_irq_chip {* stores them in "bits", returns 0 on success or negative error * @set: assigns output value for signal "offset" * @set_multiple: assigns output values for multiple signals defined by "mask" +* @set_rv: assigns output value for signal "offset", returns 0 on success or +* negative error value +* @set_multiple_rv: assigns output values for multiple signals defined by +* "mask", returns 0 on success or negative error value * @set_config: optional hook for all kinds of settings. Uses the same * packed config format as generic pinconf. * @to_irq: optional hook supporting non-static gpiod_to_irq() mappings;
@@ -441,6 +445,12 @@ struct gpio_chip {void (*set_multiple)(struct gpio_chip *gc,unsigned long *mask,unsigned long *bits); +int (*set_rv)(struct gpio_chip *gc, +unsigned int offset, +int value); +int (*set_multiple_rv)(struct gpio_chip *gc, +unsigned long *mask, +unsigned long *bits);int (*set_config)(struct gpio_chip *gc,unsigned int offset,unsigned long config);
Signature · 1 line
2.45.2
PATCH 5/14 gpio: sim: use value returning setters
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
struct gpio_chip now has additional variants of the set(_multiple) driver callbacks that return an integer to indicate success or failure. Convert the driver to using them.
--- drivers/gpio/gpio-sim.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
drivers/gpio/gpio-sim.c +9 -5
@@ -119,12 +119,14 @@ static int gpio_sim_get(struct gpio_chip *gc, unsigned int offset)return !!test_bit (offset, chip->value_map); } -static void gpio_sim_set (struct gpio_chip *gc,unsigned int offset,int value) +static int gpio_sim_set (struct gpio_chip *gc,unsigned int offset,int value) {struct gpio_sim_chip *chip =gpiochip_get_data (gc); scoped_guard(mutex, &chip->lock)__assign_bit (offset, chip->value_map, value); + +return 0 ; } static int gpio_sim_get_multiple(struct gpio_chip *gc,
@@ -138,14 +140,16 @@ static int gpio_sim_get_multiple(struct gpio_chip *gc,return 0 ; } -static void gpio_sim_set_multiple (struct gpio_chip *gc, -unsigned long *mask,unsigned long *bits) +static int gpio_sim_set_multiple (struct gpio_chip *gc, +unsigned long *mask,unsigned long *bits) {struct gpio_sim_chip *chip =gpiochip_get_data (gc); scoped_guard(mutex, &chip->lock)bitmap_replace (chip->value_map, chip->value_map, bits, mask, gc->ngpio); + +return 0 ; } static int gpio_sim_direction_output(struct gpio_chip *gc,
@@ -481,9 +485,9 @@ static int gpio_sim_add_bank(struct fwnode_handle *swnode, struct device *dev) gc->parent = dev; gc->fwnode = swnode; gc->get = gpio_sim_get; - gc->set = gpio_sim_set; + gc->set_rv = gpio_sim_set; gc->get_multiple = gpio_sim_get_multiple; - gc->set_multiple = gpio_sim_set_multiple; + gc->set_multiple_rv = gpio_sim_set_multiple; gc->direction_output = gpio_sim_direction_output; gc->direction_input = gpio_sim_direction_input; gc->get_direction = gpio_sim_get_direction;
Signature · 1 line
2.45.2
PATCH 6/14 gpio: regmap: use value returning setters
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
struct gpio_chip now has additional variants of the set(_multiple) driver callbacks that return an integer to indicate success or failure. Convert the driver to using them.
--- drivers/gpio/gpio-regmap.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)
drivers/gpio/gpio-regmap.c +12 -9
@@ -81,22 +81,25 @@ static int gpio_regmap_get(struct gpio_chip *chip, unsigned int offset)return !!(val & mask); } -static void gpio_regmap_set (struct gpio_chip *chip,unsigned int offset, -int val) +static int gpio_regmap_set (struct gpio_chip *chip,unsigned int offset, +int val) {struct gpio_regmap *gpio =gpiochip_get_data (chip);unsigned int base =gpio_regmap_addr (gpio->reg_set_base);unsigned int reg, mask; +int ret; gpio->reg_mask_xlate (gpio, base, offset, ®, &mask);if (val) -regmap_update_bits (gpio->regmap, reg, mask, mask); + ret =regmap_update_bits (gpio->regmap, reg, mask, mask);else -regmap_update_bits (gpio->regmap, reg, mask,0 ); + ret =regmap_update_bits (gpio->regmap, reg, mask,0 ); + +return ret; } -static void gpio_regmap_set_with_clear (struct gpio_chip *chip, -unsigned int offset,int val) +static int gpio_regmap_set_with_clear (struct gpio_chip *chip, +unsigned int offset,int val) {struct gpio_regmap *gpio =gpiochip_get_data (chip);unsigned int base, reg, mask;
@@ -107,7 +110,7 @@ static void gpio_regmap_set_with_clear(struct gpio_chip *chip, base =gpio_regmap_addr (gpio->reg_clr_base); gpio->reg_mask_xlate (gpio, base, offset, ®, &mask); -regmap_write (gpio->regmap, reg, mask); +return regmap_write (gpio->regmap, reg, mask); } static int gpio_regmap_get_direction(struct gpio_chip *chip,
@@ -266,9 +269,9 @@ struct gpio_regmap *gpio_regmap_register(const struct gpio_regmap_config *config chip->free = gpiochip_generic_free; chip->get = gpio_regmap_get;if (gpio->reg_set_base && gpio->reg_clr_base) - chip->set = gpio_regmap_set_with_clear; + chip->set_rv = gpio_regmap_set_with_clear;else if (gpio->reg_set_base) - chip->set = gpio_regmap_set; + chip->set_rv = gpio_regmap_set; chip->get_direction = gpio_regmap_get_direction;if (gpio->reg_dir_in_base || gpio->reg_dir_out_base) {
Signature · 1 line
2.45.2
Michael Walle
maintainerRe: [PATCH 06/14] gpio: regmap: use value returning setters
Hi,
Quoted 5 lines · Bartosz Golaszewski
From: Bartosz Golaszewski <[email protected]>
struct
gpio_chipnow has additional variants of theset(_multiple)driver callbacks that return an integer to indicate success or failure. Convert the driver to using them.
Great!
Quoted 14 lines
Signed-off-by Bartosz Golaszewski <[email protected]>--- drivers/gpio/gpio-regmap.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)drivers/gpio/gpio-regmap.c +0
-1@@ -81,22 +81,25 @@ static int gpio_regmap_get(struct gpio_chip *chip, unsigned int offset)return !!(val & mask); } -static void gpio_regmap_set(struct gpio_chip *chip, unsigned int offset,
drivers/gpio/gpio-regmap.c static int gpio_regmap_get(struct gpio_chip *chip, unsigned int offset) · line 92
Quoted 10 lines
drivers/gpio/gpio-regmap.c +3
-1- int val) +static int gpio_regmap_set (struct gpio_chip *chip,unsigned int offset, +int val) {struct gpio_regmap *gpio =gpiochip_get_data (chip);unsigned int base =gpio_regmap_addr (gpio->reg_set_base);unsigned int reg, mask; +int ret; gpio->reg_mask_xlate (gpio, base, offset, ®, &mask);
reg_mask_xlate() might fail. Please also check the return code.
Quoted 18 lines
drivers/gpio/gpio-regmap.c +6
-4if (val) -regmap_update_bits (gpio->regmap, reg, mask, mask); + ret =regmap_update_bits (gpio->regmap, reg, mask, mask);else -regmap_update_bits (gpio->regmap, reg, mask,0 ); + ret =regmap_update_bits (gpio->regmap, reg, mask,0 ); + +return ret; } -static void gpio_regmap_set_with_clear (struct gpio_chip *chip, -unsigned int offset,int val) +static int gpio_regmap_set_with_clear (struct gpio_chip *chip, +unsigned int offset,int val) {struct gpio_regmap *gpio =gpiochip_get_data (chip);unsigned int base, reg, mask;
drivers/gpio/gpio-regmap.c static void gpio_regmap_set_with_clear(struct gpio_chip *chip, · line 112
Quoted 3 lines
drivers/gpio/gpio-regmap.c +0
-0@@ -107,7 +110,7 @@ static void gpio_regmap_set_with_clear(struct gpio_chip *chip, base =gpio_regmap_addr (gpio->reg_clr_base); gpio->reg_mask_xlate (gpio, base, offset, ®, &mask);
same same :)
-michael
Quoted 17 lines
drivers/gpio/gpio-regmap.c +3
-3-regmap_write (gpio->regmap, reg, mask); +return regmap_write (gpio->regmap, reg, mask); } static int gpio_regmap_get_direction(struct gpio_chip *chip,@@ -266,9 +269,9 @@ struct gpio_regmap *gpio_regmap_register(const struct gpio_regmap_config *config chip->free = gpiochip_generic_free; chip->get = gpio_regmap_get;if (gpio->reg_set_base && gpio->reg_clr_base) - chip->set = gpio_regmap_set_with_clear; + chip->set_rv = gpio_regmap_set_with_clear;else if (gpio->reg_set_base) - chip->set = gpio_regmap_set; + chip->set_rv = gpio_regmap_set; chip->get_direction = gpio_regmap_get_direction;if (gpio->reg_dir_in_base || gpio->reg_dir_out_base) {
PATCH 7/14 gpio: pca953x: use value returning setters
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
struct gpio_chip now has additional variants of the set(_multiple) driver callbacks that return an integer to indicate success or failure. Convert the driver to using them.
--- drivers/gpio/gpio-pca953x.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
drivers/gpio/gpio-pca953x.c +9 -8
@@ -570,7 +570,8 @@ static int pca953x_gpio_get_value(struct gpio_chip *gc, unsigned off)return !!(reg_val & bit); } -static void pca953x_gpio_set_value (struct gpio_chip *gc,unsigned off,int val) +static int pca953x_gpio_set_value (struct gpio_chip *gc,unsigned int off, +int val) {struct pca953x_chip *chip =gpiochip_get_data (gc);u8 outreg = chip->recalc_addr (chip, chip->regs->output, off);
@@ -578,7 +579,7 @@ static void pca953x_gpio_set_value(struct gpio_chip *gc, unsigned off, int val)guard (mutex)(&chip->i2c_lock); -regmap_write_bits (chip->regmap, outreg, bit, val ? bit :0 ); +return regmap_write_bits (chip->regmap, outreg, bit, val ? bit :0 ); }static int pca953x_gpio_get_direction (struct gpio_chip *gc,unsigned off)
@@ -616,8 +617,8 @@ static int pca953x_gpio_get_multiple(struct gpio_chip *gc,return 0 ; } -static void pca953x_gpio_set_multiple (struct gpio_chip *gc, -unsigned long *mask,unsigned long *bits) +static int pca953x_gpio_set_multiple (struct gpio_chip *gc, +unsigned long *mask,unsigned long *bits) {struct pca953x_chip *chip =gpiochip_get_data (gc);DECLARE_BITMAP (reg_val,MAX_LINE );
@@ -627,11 +628,11 @@ static void pca953x_gpio_set_multiple(struct gpio_chip *gc, ret =pca953x_read_regs (chip, chip->regs->output, reg_val);if (ret) -return ; +return ret;bitmap_replace (reg_val, reg_val, bits, mask, gc->ngpio); -pca953x_write_regs (chip, chip->regs->output, reg_val); +return pca953x_write_regs (chip, chip->regs->output, reg_val); } static int pca953x_gpio_set_pull_up_down(struct pca953x_chip *chip,
@@ -693,10 +694,10 @@ static void pca953x_setup_gpio(struct pca953x_chip *chip, int gpios) gc->direction_input = pca953x_gpio_direction_input; gc->direction_output = pca953x_gpio_direction_output; gc->get = pca953x_gpio_get_value; - gc->set = pca953x_gpio_set_value; + gc->set_rv = pca953x_gpio_set_value; gc->get_direction = pca953x_gpio_get_direction; gc->get_multiple = pca953x_gpio_get_multiple; - gc->set_multiple = pca953x_gpio_set_multiple; + gc->set_multiple_rv = pca953x_gpio_set_multiple; gc->set_config = pca953x_gpio_set_config; gc->can_sleep = true;
Signature · 1 line
2.45.2
PATCH 8/14 gpio: mockup: use value returning setters
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
struct gpio_chip now has additional variants of the set(_multiple) driver callbacks that return an integer to indicate success or failure. Convert the driver to using them.
--- drivers/gpio/gpio-mockup.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
drivers/gpio/gpio-mockup.c +9 -5
@@ -122,7 +122,7 @@ static void __gpio_mockup_set(struct gpio_mockup_chip *chip, chip->lines[offset].value = !!value; } -static void gpio_mockup_set (struct gpio_chip *gc, +static int gpio_mockup_set (struct gpio_chip *gc,unsigned int offset,int value) {struct gpio_mockup_chip *chip =gpiochip_get_data (gc);
@@ -130,10 +130,12 @@ static void gpio_mockup_set(struct gpio_chip *gc,guard (mutex)(&chip->lock);__gpio_mockup_set (chip, offset, value); + +return 0 ; } -static void gpio_mockup_set_multiple (struct gpio_chip *gc, -unsigned long *mask,unsigned long *bits) +static int gpio_mockup_set_multiple (struct gpio_chip *gc, +unsigned long *mask,unsigned long *bits) {struct gpio_mockup_chip *chip =gpiochip_get_data (gc);unsigned int bit;
@@ -142,6 +144,8 @@ static void gpio_mockup_set_multiple(struct gpio_chip *gc,for_each_set_bit (bit, mask, gc->ngpio)__gpio_mockup_set (chip, bit,test_bit (bit, bits)); + +return 0 ; } static int gpio_mockup_apply_pull(struct gpio_mockup_chip *chip,
@@ -445,9 +449,9 @@ static int gpio_mockup_probe(struct platform_device *pdev) gc->owner =THIS_MODULE ; gc->parent = dev; gc->get = gpio_mockup_get; - gc->set = gpio_mockup_set; + gc->set_rv = gpio_mockup_set; gc->get_multiple = gpio_mockup_get_multiple; - gc->set_multiple = gpio_mockup_set_multiple; + gc->set_multiple_rv = gpio_mockup_set_multiple; gc->direction_output = gpio_mockup_dirout; gc->direction_input = gpio_mockup_dirin; gc->get_direction = gpio_mockup_get_direction;
Signature · 1 line
2.45.2
PATCH 9/14 gpio: aggregator: use value returning setters
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
struct gpio_chip now has additional variants of the set(_multiple) driver callbacks that return an integer to indicate success or failure. Convert the driver to using them.
--- drivers/gpio/gpio-aggregator.c | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-)
drivers/gpio/gpio-aggregator.c +24 -14
@@ -358,25 +358,30 @@ static void gpio_fwd_delay(struct gpio_chip *chip, unsigned int offset, int valuudelay (delay_us); } -static void gpio_fwd_set (struct gpio_chip *chip,unsigned int offset,int value) +static int gpio_fwd_set (struct gpio_chip *chip,unsigned int offset,int value) {struct gpiochip_fwd *fwd =gpiochip_get_data (chip); +int ret;if (chip->can_sleep) -gpiod_set_value_cansleep (fwd->descs[offset], value); + ret =gpiod_set_value_cansleep (fwd->descs[offset], value);else -gpiod_set_value (fwd->descs[offset], value); + ret =gpiod_set_value (fwd->descs[offset], value); +if (ret) +return ret;if (fwd->delay_timings)gpio_fwd_delay (chip, offset, value); + +return ret; } -static void gpio_fwd_set_multiple (struct gpiochip_fwd *fwd,unsigned long *mask, -unsigned long *bits) +static int gpio_fwd_set_multiple (struct gpiochip_fwd *fwd,unsigned long *mask, +unsigned long *bits) {struct gpio_desc **descs =fwd_tmp_descs (fwd);unsigned long *values =fwd_tmp_values (fwd); -unsigned int i, j =0 ; +unsigned int i, j =0 , ret;for_each_set_bit (i, mask, fwd->chip.ngpio) {__assign_bit (j, values,test_bit (i, bits));
@@ -384,26 +389,31 @@ static void gpio_fwd_set_multiple(struct gpiochip_fwd *fwd, unsigned long *mask, }if (fwd->chip.can_sleep) -gpiod_set_array_value_cansleep (j, descs,NULL , values); + ret =gpiod_set_array_value_cansleep (j, descs,NULL , values);else -gpiod_set_array_value (j, descs,NULL , values); + ret =gpiod_set_array_value (j, descs,NULL , values); + +return ret; } -static void gpio_fwd_set_multiple_locked (struct gpio_chip *chip, -unsigned long *mask,unsigned long *bits) +static int gpio_fwd_set_multiple_locked (struct gpio_chip *chip, +unsigned long *mask,unsigned long *bits) {struct gpiochip_fwd *fwd =gpiochip_get_data (chip);unsigned long flags; +int ret;if (chip->can_sleep) {mutex_lock (&fwd->mlock); -gpio_fwd_set_multiple (fwd, mask, bits); + ret =gpio_fwd_set_multiple (fwd, mask, bits);mutex_unlock (&fwd->mlock); }else {spin_lock_irqsave (&fwd->slock, flags); -gpio_fwd_set_multiple (fwd, mask, bits); + ret =gpio_fwd_set_multiple (fwd, mask, bits);spin_unlock_irqrestore (&fwd->slock, flags); } + +return ret; } static int gpio_fwd_set_config(struct gpio_chip *chip, unsigned int offset,
@@ -533,8 +543,8 @@ static struct gpiochip_fwd *gpiochip_fwd_create(struct device *dev, chip->direction_output = gpio_fwd_direction_output; chip->get = gpio_fwd_get; chip->get_multiple = gpio_fwd_get_multiple_locked; - chip->set = gpio_fwd_set; - chip->set_multiple = gpio_fwd_set_multiple_locked; + chip->set_rv = gpio_fwd_set; + chip->set_multiple_rv = gpio_fwd_set_multiple_locked; chip->to_irq = gpio_fwd_to_irq; chip->base =-1 ; chip->ngpio = ngpios;
Signature · 1 line
2.45.2
PATCH 10/14 gpio: max77650: use value returning setters
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
struct gpio_chip now has additional variants of the set(_multiple) driver callbacks that return an integer to indicate success or failure. Convert the driver to using them.
--- drivers/gpio/gpio-max77650.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/gpio/gpio-max77650.c +6 -8
@@ -62,18 +62,16 @@ static int max77650_gpio_direction_output(struct gpio_chip *gc, MAX77650_REG_CNFG_GPIO, mask, regval); } -static void max77650_gpio_set_value (struct gpio_chip *gc, -unsigned int offset,int value) +static int max77650_gpio_set_value (struct gpio_chip *gc, +unsigned int offset,int value) {struct max77650_gpio_chip *chip =gpiochip_get_data (gc); -int rv, regval; +int regval; regval = value ?MAX77650_GPIO_OUT_HIGH :MAX77650_GPIO_OUT_LOW ; - rv =regmap_update_bits (chip->map,MAX77650_REG_CNFG_GPIO , -MAX77650_GPIO_OUTVAL_MASK , regval); -if (rv) -dev_err (gc->parent,"cannot set GPIO value: %d\n" , rv); +return regmap_update_bits (chip->map,MAX77650_REG_CNFG_GPIO , +MAX77650_GPIO_OUTVAL_MASK , regval); } static int max77650_gpio_get_value(struct gpio_chip *gc,
@@ -168,7 +166,7 @@ static int max77650_gpio_probe(struct platform_device *pdev) chip->gc.direction_input = max77650_gpio_direction_input; chip->gc.direction_output = max77650_gpio_direction_output; - chip->gc.set = max77650_gpio_set_value; + chip->gc.set_rv = max77650_gpio_set_value; chip->gc.get = max77650_gpio_get_value; chip->gc.get_direction = max77650_gpio_get_direction; chip->gc.set_config = max77650_gpio_set_config;
Signature · 1 line
2.45.2
PATCH 11/14 gpio: latch: use lock guards
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
Use lock guards from linux/cleanup.h. This will make the subsequent commit that switches to using value returning GPIO line setters much simpler as we'll be able to return values without caring about releasing the locks.
--- drivers/gpio/gpio-latch.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/gpio/gpio-latch.c +3 -7
@@ -38,6 +38,7 @@* in the corresponding device tree properties. */ +#include <linux/cleanup.h> #include <linux/err.h> #include <linux/gpio/consumer.h> #include <linux/gpio/driver.h>
@@ -93,24 +94,19 @@ static void gpio_latch_set_unlocked(struct gpio_latch_priv *priv,static void gpio_latch_set (struct gpio_chip *gc,unsigned int offset,int val) {struct gpio_latch_priv *priv =gpiochip_get_data (gc); -unsigned long flags; -spin_lock_irqsave (&priv->spinlock, flags); +guard (spinlock_irqsave)(&priv->spinlock);gpio_latch_set_unlocked (priv, gpiod_set_value, offset, val); - -spin_unlock_irqrestore (&priv->spinlock, flags); }static void gpio_latch_set_can_sleep (struct gpio_chip *gc,unsigned int offset,int val) {struct gpio_latch_priv *priv =gpiochip_get_data (gc); -mutex_lock (&priv->mutex); +guard (mutex)(&priv->mutex);gpio_latch_set_unlocked (priv, gpiod_set_value_cansleep, offset, val); - -mutex_unlock (&priv->mutex); }static bool gpio_latch_can_sleep (struct gpio_latch_priv *priv,unsigned int n_latches)
Signature · 1 line
2.45.2
PATCH 12/14 gpio: latch: use value returning setters
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
struct gpio_chip now has additional variants of the set(_multiple) driver callbacks that return an integer to indicate success or failure. Convert the driver to using them.
--- drivers/gpio/gpio-latch.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-)
drivers/gpio/gpio-latch.c +19 -14
@@ -72,41 +72,46 @@ static int gpio_latch_get_direction(struct gpio_chip *gc, unsigned int offset)return GPIO_LINE_DIRECTION_OUT ; } -static void gpio_latch_set_unlocked (struct gpio_latch_priv *priv, -int (*set)(struct gpio_desc *desc,int value), -unsigned int offset,bool val) +static int gpio_latch_set_unlocked (struct gpio_latch_priv *priv, +int (*set)(struct gpio_desc *desc,int value), +unsigned int offset,bool val) { -int latch = offset / priv->n_latched_gpios; -int i; +int latch = offset / priv->n_latched_gpios, i, ret;assign_bit (offset, priv->shadow, val); -for (i =0 ; i < priv->n_latched_gpios; i++) -set (priv->latched_gpios->desc[i], -test_bit (latch * priv->n_latched_gpios + i, priv->shadow)); +for (i =0 ; i < priv->n_latched_gpios; i++) { + ret =set (priv->latched_gpios->desc[i], +test_bit (latch * priv->n_latched_gpios + i, + priv->shadow)); +if (ret) +return ret; + }ndelay (priv->setup_duration_ns);set (priv->clk_gpios->desc[latch],1 );ndelay (priv->clock_duration_ns);set (priv->clk_gpios->desc[latch],0 ); + +return 0 ; } -static void gpio_latch_set (struct gpio_chip *gc,unsigned int offset,int val) +static int gpio_latch_set (struct gpio_chip *gc,unsigned int offset,int val) {struct gpio_latch_priv *priv =gpiochip_get_data (gc);guard (spinlock_irqsave)(&priv->spinlock); -gpio_latch_set_unlocked (priv, gpiod_set_value, offset, val); +return gpio_latch_set_unlocked (priv, gpiod_set_value, offset, val); } -static void gpio_latch_set_can_sleep (struct gpio_chip *gc,unsigned int offset,int val) +static int gpio_latch_set_can_sleep (struct gpio_chip *gc,unsigned int offset,int val) {struct gpio_latch_priv *priv =gpiochip_get_data (gc);guard (mutex)(&priv->mutex); -gpio_latch_set_unlocked (priv, gpiod_set_value_cansleep, offset, val); +return gpio_latch_set_unlocked (priv, gpiod_set_value_cansleep, offset, val); }static bool gpio_latch_can_sleep (struct gpio_latch_priv *priv,unsigned int n_latches)
@@ -160,11 +165,11 @@ static int gpio_latch_probe(struct platform_device *pdev)if (gpio_latch_can_sleep (priv, n_latches)) { priv->gc.can_sleep = true; - priv->gc.set = gpio_latch_set_can_sleep; + priv->gc.set_rv = gpio_latch_set_can_sleep;mutex_init (&priv->mutex); }else { priv->gc.can_sleep = false; - priv->gc.set = gpio_latch_set; + priv->gc.set_rv = gpio_latch_set;spin_lock_init (&priv->spinlock); }
Signature · 1 line
2.45.2
PATCH 13/14 gpio: davinci: use value returning setters
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
struct gpio_chip now has additional variants of the set(_multiple) driver callbacks that return an integer to indicate success or failure. Convert the driver to using them.
--- drivers/gpio/gpio-davinci.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpio/gpio-davinci.c +4 -2
@@ -139,7 +139,7 @@ static int davinci_gpio_get(struct gpio_chip *chip, unsigned offset)/* * Assuming the pin is muxed as a gpio output, set its output value. */ -static void +static int davinci_gpio_set (struct gpio_chip *chip,unsigned offset,int value) {struct davinci_gpio_controller *d =gpiochip_get_data (chip);
@@ -150,6 +150,8 @@ davinci_gpio_set(struct gpio_chip *chip, unsigned offset, int value)writel_relaxed (__gpio_mask (offset), value ? &g->set_data : &g->clr_data); + +return 0 ; }static int davinci_gpio_probe (struct platform_device *pdev)
@@ -209,7 +211,7 @@ static int davinci_gpio_probe(struct platform_device *pdev) chips->chip.direction_input = davinci_direction_in; chips->chip.get = davinci_gpio_get; chips->chip.direction_output = davinci_direction_out; - chips->chip.set = davinci_gpio_set; + chips->chip.set_rv = davinci_gpio_set; chips->chip.ngpio = ngpio; chips->chip.base =-1 ;
Signature · 1 line
2.45.2
PATCH 14/14 gpio: mvebu: use value returning setters
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
struct gpio_chip now has additional variants of the set(_multiple) driver callbacks that return an integer to indicate success or failure. Convert the driver to using them.
--- drivers/gpio/gpio-mvebu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpio/gpio-mvebu.c +4 -4
@@ -298,12 +298,12 @@ static unsigned int mvebu_pwmreg_blink_off_duration(struct mvebu_pwm *mvpwm)/* * Functions implementing the gpio_chip methods */ -static void mvebu_gpio_set (struct gpio_chip *chip,unsigned int pin,int value) +static int mvebu_gpio_set (struct gpio_chip *chip,unsigned int pin,int value) {struct mvebu_gpio_chip *mvchip =gpiochip_get_data (chip); -regmap_update_bits (mvchip->regs,GPIO_OUT_OFF + mvchip->offset, -BIT (pin), value ?BIT (pin) :0 ); +return regmap_update_bits (mvchip->regs,GPIO_OUT_OFF + mvchip->offset, +BIT (pin), value ?BIT (pin) :0 ); }static int mvebu_gpio_get (struct gpio_chip *chip,unsigned int pin)
@@ -1173,7 +1173,7 @@ static int mvebu_gpio_probe(struct platform_device *pdev) mvchip->chip.direction_input = mvebu_gpio_direction_input; mvchip->chip.get = mvebu_gpio_get; mvchip->chip.direction_output = mvebu_gpio_direction_output; - mvchip->chip.set = mvebu_gpio_set; + mvchip->chip.set_rv = mvebu_gpio_set;if (have_irqs) mvchip->chip.to_irq = mvebu_gpio_to_irq; mvchip->chip.base = id *MVEBU_MAX_GPIO_PER_BANK ;
Signature · 1 line
2.45.2
Quoted 3 lines · Bartosz Golaszewski
The value setter callbacks (both for single and multiple lines) return void even though we have many types of controllers that can fail to set a line's value: i2c, SPI, USB, etc.
Yeah this is a remnant from the design that was done of gpiolib, at the time (by David Brownell) assumed to be simple MMIO register writes, so not much could go wrong there.
Quoted 3 lines
This series proposes to start the process of converting the setters to returning int thus making it possible to propagate any errors to the user.
My worry is that this project will be another one that stalls at 85% completion (like with the eternal descriptor rewrite project) but I guess the upside outweighs the downside, and I also trust your proven grittiness so:
for the series +/- minor nitpicks I may send that I am sure you would address anyway.
Yours,
Linus Walleij
Quoted 11 lines · Linus Walleij
Quoted 3 lines · Bartosz Golaszewski
The value setter callbacks (both for single and multiple lines) return void even though we have many types of controllers that can fail to set a line's value: i2c, SPI, USB, etc.
Yeah this is a remnant from the design that was done of gpiolib, at the time (by David Brownell) assumed to be simple MMIO register writes, so not much could go wrong there.
Quoted 9 lines
Quoted 3 lines
This series proposes to start the process of converting the setters to returning int thus making it possible to propagate any errors to the user.
My worry is that this project will be another one that stalls at 85% completion (like with the eternal descriptor rewrite project) but I guess the upside outweighs the downside, and I also trust your proven grittiness so:
Unlike the descriptor API, the changes here are quite trivial. There are about 350 drivers that need changing but can be done relatively fast.
Bart
Quoted 6 lines
Reviewed-by Linus Walleij <[email protected]>for the series +/- minor nitpicks I may send that I am sure you would address anyway.
Yours,
Linus Walleij