iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gpio: pcie-idio-24: utilize for_each_set_clump8 macro

Browse Source 
Replace verbose implementation in get_multiple/set_multiple callbacks
with for_each_set_clump8 macro to simplify code and improve clarity.

Link: http://lkml.kernel.org/r/d5d22fa9809dcf8330f4381dbe7e7ca37990e79f.1570641097.git.vilhelm.gray@gmail.com
Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: Lukas Wunner <lukas@wunner.de>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Mathias Duckeck <m.duckeck@kunbus.de>
Cc: Morten Hein Tiljeset <morten.tiljeset@prevas.dk>
Cc: Phil Reid <preid@electromag.com.au>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Sean Nyekjaer <sean.nyekjaer@prevas.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
William Breathitt Gray 2019-12-04 16:51:22 -08:00 committed by Linus Torvalds
parent 2dc7c3c16d
commit c586aa8f48
1 changed files with 39 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
drivers/gpio/gpio-pcie-idio-24.c
View File

@ -201,52 +201,34 @@ static int idio_24_gpio_get_multiple(struct gpio_chip *chip,
unsigned long *mask, unsigned long *bits) unsigned long *mask, unsigned long *bits)
{ {
struct idio_24_gpio *const idio24gpio = gpiochip_get_data(chip); struct idio_24_gpio *const idio24gpio = gpiochip_get_data(chip);
size_t i; unsigned long offset;
const unsigned int gpio_reg_size = 8; unsigned long gpio_mask;
unsigned int bits_offset;
size_t word_index;
unsigned int word_offset;
unsigned long word_mask;
const unsigned long port_mask = GENMASK(gpio_reg_size - 1, 0);
unsigned long port_state;
void __iomem *ports[] = { void __iomem *ports[] = {
&idio24gpio->reg->out0_7, &idio24gpio->reg->out8_15, &idio24gpio->reg->out0_7, &idio24gpio->reg->out8_15,
&idio24gpio->reg->out16_23, &idio24gpio->reg->in0_7, &idio24gpio->reg->out16_23, &idio24gpio->reg->in0_7,
&idio24gpio->reg->in8_15, &idio24gpio->reg->in16_23, &idio24gpio->reg->in8_15, &idio24gpio->reg->in16_23,
}; };
size_t index;
unsigned long port_state;
const unsigned long out_mode_mask = BIT(1); const unsigned long out_mode_mask = BIT(1);
/* clear bits array to a clean slate */ /* clear bits array to a clean slate */
bitmap_zero(bits, chip->ngpio); bitmap_zero(bits, chip->ngpio);
/* get bits are evaluated a gpio port register at a time */ for_each_set_clump8(offset, gpio_mask, mask, ARRAY_SIZE(ports) * 8) {
for (i = 0; i < ARRAY_SIZE(ports) + 1; i++) { index = offset / 8;
/* gpio offset in bits array */
bits_offset = i * gpio_reg_size;
/* word index for bits array */
word_index = BIT_WORD(bits_offset);
/* gpio offset within current word of bits array */
word_offset = bits_offset % BITS_PER_LONG;
/* mask of get bits for current gpio within current word */
word_mask = mask[word_index] & (port_mask << word_offset);
if (!word_mask) {
/* no get bits in this port so skip to next one */
continue;
}
/* read bits from current gpio port (port 6 is TTL GPIO) */ /* read bits from current gpio port (port 6 is TTL GPIO) */
if (i < 6) if (index < 6)
port_state = ioread8(ports[i]); port_state = ioread8(ports[index]);
else if (ioread8(&idio24gpio->reg->ctl) & out_mode_mask) else if (ioread8(&idio24gpio->reg->ctl) & out_mode_mask)
port_state = ioread8(&idio24gpio->reg->ttl_out0_7); port_state = ioread8(&idio24gpio->reg->ttl_out0_7);
else else
port_state = ioread8(&idio24gpio->reg->ttl_in0_7); port_state = ioread8(&idio24gpio->reg->ttl_in0_7);
/* store acquired bits at respective bits array offset */ port_state &= gpio_mask;
bits[word_index] |= (port_state << word_offset) & word_mask;
bitmap_set_value8(bits, port_state, offset);
} }
return 0; return 0;
@ -297,60 +279,49 @@ static void idio_24_gpio_set_multiple(struct gpio_chip *chip,
unsigned long *mask, unsigned long *bits) unsigned long *mask, unsigned long *bits)
{ {
struct idio_24_gpio *const idio24gpio = gpiochip_get_data(chip); struct idio_24_gpio *const idio24gpio = gpiochip_get_data(chip);
size_t i; unsigned long offset;
unsigned long bits_offset;
unsigned long gpio_mask; unsigned long gpio_mask;
const unsigned int gpio_reg_size = 8;
const unsigned long port_mask = GENMASK(gpio_reg_size, 0);
unsigned long flags;
unsigned int out_state;
void __iomem *ports[] = { void __iomem *ports[] = {
&idio24gpio->reg->out0_7, &idio24gpio->reg->out8_15, &idio24gpio->reg->out0_7, &idio24gpio->reg->out8_15,
&idio24gpio->reg->out16_23 &idio24gpio->reg->out16_23
}; };
size_t index;
unsigned long bitmask;
unsigned long flags;
unsigned long out_state;
const unsigned long out_mode_mask = BIT(1); const unsigned long out_mode_mask = BIT(1);
const unsigned int ttl_offset = 48;
const size_t ttl_i = BIT_WORD(ttl_offset);
const unsigned int word_offset = ttl_offset % BITS_PER_LONG;
const unsigned long ttl_mask = (mask[ttl_i] >> word_offset) & port_mask;
const unsigned long ttl_bits = (bits[ttl_i] >> word_offset) & ttl_mask;
/* set bits are processed a gpio port register at a time */ for_each_set_clump8(offset, gpio_mask, mask, ARRAY_SIZE(ports) * 8) {
for (i = 0; i < ARRAY_SIZE(ports); i++) { index = offset / 8;
/* gpio offset in bits array */
bits_offset = i * gpio_reg_size;
/* check if any set bits for current port */ bitmask = bitmap_get_value8(bits, offset) & gpio_mask;
gpio_mask = (*mask >> bits_offset) & port_mask;
if (!gpio_mask) { raw_spin_lock_irqsave(&idio24gpio->lock, flags);
/* no set bits for this port so move on to next port */
/* read bits from current gpio port (port 6 is TTL GPIO) */
if (index < 6) {
out_state = ioread8(ports[index]);
} else if (ioread8(&idio24gpio->reg->ctl) & out_mode_mask) {
out_state = ioread8(&idio24gpio->reg->ttl_out0_7);
} else {
/* skip TTL GPIO if set for input */
raw_spin_unlock_irqrestore(&idio24gpio->lock, flags);
continue; continue;
} }
raw_spin_lock_irqsave(&idio24gpio->lock, flags); /* set requested bit states */
out_state &= ~gpio_mask;
out_state |= bitmask;
/* process output lines */ /* write bits for current gpio port (port 6 is TTL GPIO) */
out_state = ioread8(ports[i]) & ~gpio_mask; if (index < 6)
out_state |= (*bits >> bits_offset) & gpio_mask; iowrite8(out_state, ports[index]);
iowrite8(out_state, ports[i]); else
raw_spin_unlock_irqrestore(&idio24gpio->lock, flags);
}
/* check if setting TTL lines and if they are in output mode */
if (!ttl_mask || !(ioread8(&idio24gpio->reg->ctl) & out_mode_mask))
return;
/* handle TTL output */
raw_spin_lock_irqsave(&idio24gpio->lock, flags);
/* process output lines */
out_state = ioread8(&idio24gpio->reg->ttl_out0_7) & ~ttl_mask;
out_state |= ttl_bits;
iowrite8(out_state, &idio24gpio->reg->ttl_out0_7); iowrite8(out_state, &idio24gpio->reg->ttl_out0_7);
raw_spin_unlock_irqrestore(&idio24gpio->lock, flags); raw_spin_unlock_irqrestore(&idio24gpio->lock, flags);
} }
}
static void idio_24_irq_ack(struct irq_data *data) static void idio_24_irq_ack(struct irq_data *data)
{ {