gpio: sim: fix setting and getting multiple lines
Subsystems (2)
PATCH 1/1 gpio: sim: fix setting and getting multiple lines
We need to take mask into account in the set/get_multiple() callbacks. Use bitmap_replace() instead of bitmap_copy().
--- drivers/gpio/gpio-sim.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpio/gpio-sim.c +2 -2
@@ -134,7 +134,7 @@ static int gpio_sim_get_multiple(struct gpio_chip *gc,struct gpio_sim_chip *chip =gpiochip_get_data (gc);mutex_lock (&chip->lock); -bitmap_copy (bits, chip->value_map, gc->ngpio); +bitmap_replace (bits, bits, chip->value_map, mask, gc->ngpio);mutex_unlock (&chip->lock);return 0 ;
@@ -146,7 +146,7 @@ static void gpio_sim_set_multiple(struct gpio_chip *gc,struct gpio_sim_chip *chip =gpiochip_get_data (gc);mutex_lock (&chip->lock); -bitmap_copy (chip->value_map, bits, gc->ngpio); +bitmap_replace (chip->value_map, chip->value_map, bits, mask, gc->ngpio);mutex_unlock (&chip->lock); }
Signature · 1 line
2.32.0
Quoted 2 lines · Bartosz Golaszewski
We need to take mask into account in the set/get_multiple() callbacks. Use
bitmap_replace()instead ofbitmap_copy().
Good catch!
Quoted 32 lines
Fixes cb8c474e79be ("gpio: sim: new testing module")Signed-off-by Bartosz Golaszewski <[email protected]>--- drivers/gpio/gpio-sim.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/gpio/gpio-sim.c +2
-2@@ -134,7 +134,7 @@ static int gpio_sim_get_multiple(struct gpio_chip *gc,struct gpio_sim_chip *chip =gpiochip_get_data (gc);mutex_lock (&chip->lock); -bitmap_copy (bits, chip->value_map, gc->ngpio); +bitmap_replace (bits, bits, chip->value_map, mask, gc->ngpio);mutex_unlock (&chip->lock);return 0 ;@@ -146,7 +146,7 @@ static void gpio_sim_set_multiple(struct gpio_chip *gc,struct gpio_sim_chip *chip =gpiochip_get_data (gc);mutex_lock (&chip->lock); -bitmap_copy (chip->value_map, bits, gc->ngpio); +bitmap_replace (chip->value_map, chip->value_map, bits, mask, gc->ngpio);mutex_unlock (&chip->lock); }Signature · 1 line
2.32.0
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 8 lines · Andy Shevchenko
Quoted 2 lines · Bartosz Golaszewski
We need to take mask into account in the set/get_multiple() callbacks. Use
bitmap_replace()instead ofbitmap_copy().Good catch!
Reviewed-by Andy Shevchenko <[email protected]>
I've actually spent two days tracking this. I noticed that a single test-case in libgpiod v2 fails sometimes (about 1 in 10 runs) and suspected some race condition but couldn't find any. Turned out it was triggered by not masking the bits but would only be triggered if the memory which got passed to the callbacks got written over with some other values than zeroes.
Bart