diff mbox series

[v2,5/8] gpio: 104-dio-48e: Implement get_multiple callback

Message ID d31637cb701ecf556515539fd40e7098e0c99bfd.1521128287.git.vilhelm.gray@gmail.com
State New
Headers show
Series Implement get_multiple for ACCES and PC/104 drivers | expand

Commit Message

William Breathitt Gray March 15, 2018, 3:53 p.m. UTC
The ACCES I/O 104-DIO-48E series of devices contain two Programmable
Peripheral Interface (PPI) chips of type 82C55, which each feature three
8-bit ports of I/O. Since eight input lines are acquired on a single
port input read, the 104-DIO-48E GPIO driver may improve multiple input
reads by utilizing a get_multiple callback. This patch implements the
dio48e_gpio_get_multiple function which serves as the respective
get_multiple callback.

Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com>
---
 drivers/gpio/gpio-104-dio-48e.c | 46 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

Comments

kernel test robot March 17, 2018, 3:47 p.m. UTC | #1
Hi William,

I love your patch! Yet something to improve:

[auto build test ERROR on v4.16-rc4]
[also build test ERROR on next-20180316]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/William-Breathitt-Gray/Implement-get_multiple-for-ACCES-and-PC-104-drivers/20180317-224135
config: i386-randconfig-a0-201810 (attached as .config)
compiler: gcc-4.9 (Debian 4.9.4-2) 4.9.4
reproduce:
        # save the attached .config to linux build tree
        make ARCH=i386 

All errors (new ones prefixed by >>):

   drivers/gpio/gpio-104-dio-48e.c: In function 'dio48e_gpio_get_multiple':
>> drivers/gpio/gpio-104-dio-48e.c:214:3: error: 'word_mask' undeclared (first use in this function)
      word_mask = mask[word_index] & (port_mask << word_offset);
      ^
   drivers/gpio/gpio-104-dio-48e.c:214:3: note: each undeclared identifier is reported only once for each function it appears in
   drivers/gpio/gpio-104-dio-48e.c:195:16: warning: unused variable 'mask_word' [-Wunused-variable]
     unsigned long mask_word;
                   ^

vim +/word_mask +214 drivers/gpio/gpio-104-dio-48e.c

   184	
   185	static int dio48e_gpio_get_multiple(struct gpio_chip *chip, unsigned long *mask,
   186		unsigned long *bits)
   187	{
   188		struct dio48e_gpio *const dio48egpio = gpiochip_get_data(chip);
   189		size_t i;
   190		const size_t ports[] = { 0, 1, 2, 4, 5, 6 };
   191		const unsigned int gpio_reg_size = 8;
   192		unsigned int bits_offset;
   193		size_t word_index;
   194		unsigned int word_offset;
   195		unsigned long mask_word;
   196		const unsigned long port_mask = GENMASK(gpio_reg_size, 0);
   197		unsigned long port_state;
   198	
   199		/* clear bits array to a clean slate */
   200		bitmap_zero(bits, chip->ngpio);
   201	
   202		/* get bits are evaluated a gpio port register at a time */
   203		for (i = 0; i < ARRAY_SIZE(ports); i++) {
   204			/* gpio offset in bits array */
   205			bits_offset = i * gpio_reg_size;
   206	
   207			/* word index for bits array */
   208			word_index = BIT_WORD(bits_offset);
   209	
   210			/* gpio offset within current word of bits array */
   211			word_offset = bits_offset % BITS_PER_LONG;
   212	
   213			/* mask of get bits for current gpio within current word */
 > 214			word_mask = mask[word_index] & (port_mask << word_offset);
   215			if (!word_mask) {
   216				/* no get bits in this port so skip to next one */
   217				continue;
   218			}
   219	
   220			/* read bits from current gpio port */
   221			port_state = inb(dio48egpio->base + ports[i]);
   222	
   223			/* store acquired bits at respective bits array offset */
   224			bits[word_index] |= port_state << word_offset;
   225		}
   226	
   227		return 0;
   228	}
   229	

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
diff mbox series

Patch

diff --git a/drivers/gpio/gpio-104-dio-48e.c b/drivers/gpio/gpio-104-dio-48e.c
index bab3b94c5cbc..537b436c6e7f 100644
--- a/drivers/gpio/gpio-104-dio-48e.c
+++ b/drivers/gpio/gpio-104-dio-48e.c
@@ -182,6 +182,51 @@  static int dio48e_gpio_get(struct gpio_chip *chip, unsigned offset)
 	return !!(port_state & mask);
 }
 
+static int dio48e_gpio_get_multiple(struct gpio_chip *chip, unsigned long *mask,
+	unsigned long *bits)
+{
+	struct dio48e_gpio *const dio48egpio = gpiochip_get_data(chip);
+	size_t i;
+	const size_t ports[] = { 0, 1, 2, 4, 5, 6 };
+	const unsigned int gpio_reg_size = 8;
+	unsigned int bits_offset;
+	size_t word_index;
+	unsigned int word_offset;
+	unsigned long mask_word;
+	const unsigned long port_mask = GENMASK(gpio_reg_size, 0);
+	unsigned long port_state;
+
+	/* clear bits array to a clean slate */
+	bitmap_zero(bits, chip->ngpio);
+
+	/* get bits are evaluated a gpio port register at a time */
+	for (i = 0; i < ARRAY_SIZE(ports); i++) {
+		/* 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_state = inb(dio48egpio->base + ports[i]);
+
+		/* store acquired bits at respective bits array offset */
+		bits[word_index] |= port_state << word_offset;
+	}
+
+	return 0;
+}
+
 static void dio48e_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
 {
 	struct dio48e_gpio *const dio48egpio = gpiochip_get_data(chip);
@@ -384,6 +429,7 @@  static int dio48e_probe(struct device *dev, unsigned int id)
 	dio48egpio->chip.direction_input = dio48e_gpio_direction_input;
 	dio48egpio->chip.direction_output = dio48e_gpio_direction_output;
 	dio48egpio->chip.get = dio48e_gpio_get;
+	dio48egpio->chip.get_multiple = dio48e_gpio_get_multiple;
 	dio48egpio->chip.set = dio48e_gpio_set;
 	dio48egpio->chip.set_multiple = dio48e_gpio_set_multiple;
 	dio48egpio->base = base[id];