From: Song Hui <[email protected]>
More than one gpio controllers can share one interrupt, change the
driver to request shared irq.
While this will work, it will mess up userspace accounting of the number
of interrupts per second in tools such as vmstat. The reason is that
for every GPIO interrupt, /proc/interrupts records the count against GIC
interrupt 68 or 69, as well as the GPIO itself. So, for every GPIO
interrupt, the total number of interrupts that the system has seen
increments by two
Signed-off-by: Laurentiu Tudor <[email protected]>
Signed-off-by: Alex Marginean <[email protected]>
Signed-off-by: Song Hui <[email protected]>
---
Changes in v6:
- change request_irq to devm_request_irq and add commit message
Changes in v5:
- add traverse every bit function.
Changes in v4:
- convert 'pr_err' to 'dev_err'.
Changes in v3:
- update the patch description.
Changes in v2:
- delete the compatible of ls1088a.
drivers/gpio/gpio-mpc8xxx.c | 31 ++++++++++++++++++++-----------
1 file changed, 20 insertions(+), 11 deletions(-)
diff --git a/drivers/gpio/gpio-mpc8xxx.c b/drivers/gpio/gpio-mpc8xxx.c
index 16a47de..f0be284 100644
--- a/drivers/gpio/gpio-mpc8xxx.c
+++ b/drivers/gpio/gpio-mpc8xxx.c
@@ -22,6 +22,7 @@
#include <linux/irq.h>
#include <linux/gpio/driver.h>
#include <linux/bitops.h>
+#include <linux/interrupt.h>
#define MPC8XXX_GPIO_PINS 32
@@ -127,20 +128,20 @@ static int mpc8xxx_gpio_to_irq(struct gpio_chip *gc, unsigned offset)
return -ENXIO;
}
-static void mpc8xxx_gpio_irq_cascade(struct irq_desc *desc)
+static irqreturn_t mpc8xxx_gpio_irq_cascade(int irq, void *data)
{
- struct mpc8xxx_gpio_chip *mpc8xxx_gc = irq_desc_get_handler_data(desc);
- struct irq_chip *chip = irq_desc_get_chip(desc);
+ struct mpc8xxx_gpio_chip *mpc8xxx_gc = data;
struct gpio_chip *gc = &mpc8xxx_gc->gc;
unsigned int mask;
+ int i;
mask = gc->read_reg(mpc8xxx_gc->regs + GPIO_IER)
& gc->read_reg(mpc8xxx_gc->regs + GPIO_IMR);
- if (mask)
+ for_each_set_bit(i, &mask, 32)
generic_handle_irq(irq_linear_revmap(mpc8xxx_gc->irq,
- 32 - ffs(mask)));
- if (chip->irq_eoi)
- chip->irq_eoi(&desc->irq_data);
+ 31 - i));
+
+ return IRQ_HANDLED;
}
static void mpc8xxx_irq_unmask(struct irq_data *d)
@@ -388,8 +389,8 @@ static int mpc8xxx_probe(struct platform_device *pdev)
ret = gpiochip_add_data(gc, mpc8xxx_gc);
if (ret) {
- pr_err("%pOF: GPIO chip registration failed with status %d\n",
- np, ret);
+ dev_err(&pdev->dev, "%pOF: GPIO chip registration failed with status %d\n",
+ np, ret);
goto err;
}
@@ -409,8 +410,16 @@ static int mpc8xxx_probe(struct platform_device *pdev)
if (devtype->gpio_dir_in_init)
devtype->gpio_dir_in_init(gc);
- irq_set_chained_handler_and_data(mpc8xxx_gc->irqn,
- mpc8xxx_gpio_irq_cascade, mpc8xxx_gc);
+ ret = devm_request_irq(&pdev->dev, mpc8xxx_gc->irqn,
+ mpc8xxx_gpio_irq_cascade,
+ IRQF_NO_THREAD | IRQF_SHARED, "gpio-cascade",
+ mpc8xxx_gc);
+ if (ret) {
+ dev_err(&pdev->dev, "%s: failed to devm_request_irq(%d), ret = %d\n",
+ np->full_name, mpc8xxx_gc->irqn, ret);
+ goto err;
+ }
+
return 0;
err:
iounmap(mpc8xxx_gc->regs);
--
2.9.5
Hi Hui,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on gpio/for-next]
[cannot apply to v5.3 next-20190925]
[if your patch is applied to the wrong git tree, please drop us a note to help
improve the system. BTW, we also suggest to use '--base' option to specify the
base tree in git format-patch, please see https://stackoverflow.com/a/37406982]
url: https://github.com/0day-ci/linux/commits/Hui-Song/gpio-mpc8xxx-change-irq-handler-from-chained-to-normal/20190927-113256
base: https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git for-next
config: i386-allyesconfig (attached as .config)
compiler: gcc-7 (Debian 7.4.0-13) 7.4.0
reproduce:
# save the attached .config to linux build tree
make ARCH=i386
If you fix the issue, kindly add following tag
Reported-by: kbuild test robot <[email protected]>
All error/warnings (new ones prefixed by >>):
In file included from include/linux/kernel.h:12:0,
from drivers/gpio/gpio-mpc8xxx.c:12:
drivers/gpio/gpio-mpc8xxx.c: In function 'mpc8xxx_gpio_irq_cascade':
>> include/linux/bitops.h:22:30: error: passing argument 1 of 'find_first_bit' from incompatible pointer type [-Werror=incompatible-pointer-types]
for ((bit) = find_first_bit((addr), (size)); \
^
>> drivers/gpio/gpio-mpc8xxx.c:140:2: note: in expansion of macro 'for_each_set_bit'
for_each_set_bit(i, &mask, 32)
^~~~~~~~~~~~~~~~
In file included from arch/x86/include/asm/bitops.h:384:0,
from include/linux/bitops.h:19,
from include/linux/kernel.h:12,
from drivers/gpio/gpio-mpc8xxx.c:12:
include/asm-generic/bitops/find.h:59:22: note: expected 'const long unsigned int *' but argument is of type 'unsigned int *'
extern unsigned long find_first_bit(const unsigned long *addr,
^~~~~~~~~~~~~~
In file included from include/linux/kernel.h:12:0,
from drivers/gpio/gpio-mpc8xxx.c:12:
>> include/linux/bitops.h:24:29: error: passing argument 1 of 'find_next_bit' from incompatible pointer type [-Werror=incompatible-pointer-types]
(bit) = find_next_bit((addr), (size), (bit) + 1))
^
>> drivers/gpio/gpio-mpc8xxx.c:140:2: note: in expansion of macro 'for_each_set_bit'
for_each_set_bit(i, &mask, 32)
^~~~~~~~~~~~~~~~
In file included from arch/x86/include/asm/bitops.h:384:0,
from include/linux/bitops.h:19,
from include/linux/kernel.h:12,
from drivers/gpio/gpio-mpc8xxx.c:12:
include/asm-generic/bitops/find.h:15:22: note: expected 'const long unsigned int *' but argument is of type 'unsigned int *'
extern unsigned long find_next_bit(const unsigned long *addr, unsigned long
^~~~~~~~~~~~~
cc1: some warnings being treated as errors
--
In file included from include/linux/kernel.h:12:0,
from drivers//gpio/gpio-mpc8xxx.c:12:
drivers//gpio/gpio-mpc8xxx.c: In function 'mpc8xxx_gpio_irq_cascade':
>> include/linux/bitops.h:22:30: error: passing argument 1 of 'find_first_bit' from incompatible pointer type [-Werror=incompatible-pointer-types]
for ((bit) = find_first_bit((addr), (size)); \
^
drivers//gpio/gpio-mpc8xxx.c:140:2: note: in expansion of macro 'for_each_set_bit'
for_each_set_bit(i, &mask, 32)
^~~~~~~~~~~~~~~~
In file included from arch/x86/include/asm/bitops.h:384:0,
from include/linux/bitops.h:19,
from include/linux/kernel.h:12,
from drivers//gpio/gpio-mpc8xxx.c:12:
include/asm-generic/bitops/find.h:59:22: note: expected 'const long unsigned int *' but argument is of type 'unsigned int *'
extern unsigned long find_first_bit(const unsigned long *addr,
^~~~~~~~~~~~~~
In file included from include/linux/kernel.h:12:0,
from drivers//gpio/gpio-mpc8xxx.c:12:
>> include/linux/bitops.h:24:29: error: passing argument 1 of 'find_next_bit' from incompatible pointer type [-Werror=incompatible-pointer-types]
(bit) = find_next_bit((addr), (size), (bit) + 1))
^
drivers//gpio/gpio-mpc8xxx.c:140:2: note: in expansion of macro 'for_each_set_bit'
for_each_set_bit(i, &mask, 32)
^~~~~~~~~~~~~~~~
In file included from arch/x86/include/asm/bitops.h:384:0,
from include/linux/bitops.h:19,
from include/linux/kernel.h:12,
from drivers//gpio/gpio-mpc8xxx.c:12:
include/asm-generic/bitops/find.h:15:22: note: expected 'const long unsigned int *' but argument is of type 'unsigned int *'
extern unsigned long find_next_bit(const unsigned long *addr, unsigned long
^~~~~~~~~~~~~
cc1: some warnings being treated as errors
vim +/find_first_bit +22 include/linux/bitops.h
4677d4a53e0d56 Borislav Petkov 2010-05-03 14
^1da177e4c3f41 Linus Torvalds 2005-04-16 15 /*
^1da177e4c3f41 Linus Torvalds 2005-04-16 16 * Include this here because some architectures need generic_ffs/fls in
^1da177e4c3f41 Linus Torvalds 2005-04-16 17 * scope
^1da177e4c3f41 Linus Torvalds 2005-04-16 18 */
^1da177e4c3f41 Linus Torvalds 2005-04-16 @19 #include <asm/bitops.h>
^1da177e4c3f41 Linus Torvalds 2005-04-16 20
984b3f5746ed2c Akinobu Mita 2010-03-05 21 #define for_each_set_bit(bit, addr, size) \
3e037454bcfa4b Shannon Nelson 2007-10-16 @22 for ((bit) = find_first_bit((addr), (size)); \
3e037454bcfa4b Shannon Nelson 2007-10-16 23 (bit) < (size); \
3e037454bcfa4b Shannon Nelson 2007-10-16 @24 (bit) = find_next_bit((addr), (size), (bit) + 1))
3e037454bcfa4b Shannon Nelson 2007-10-16 25
:::::: The code at line 22 was first introduced by commit
:::::: 3e037454bcfa4b187e8293d2121bd8c0f5a5c31c I/OAT: Add support for MSI and MSI-X
:::::: TO: Shannon Nelson <[email protected]>
:::::: CC: Linus Torvalds <[email protected]>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
Hi Hui,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on gpio/for-next]
[cannot apply to v5.3 next-20190925]
[if your patch is applied to the wrong git tree, please drop us a note to help
improve the system. BTW, we also suggest to use '--base' option to specify the
base tree in git format-patch, please see https://stackoverflow.com/a/37406982]
url: https://github.com/0day-ci/linux/commits/Hui-Song/gpio-mpc8xxx-change-irq-handler-from-chained-to-normal/20190927-113256
base: https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git for-next
config: mips-allmodconfig (attached as .config)
compiler: mips-linux-gcc (GCC) 7.4.0
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
GCC_VERSION=7.4.0 make.cross ARCH=mips
If you fix the issue, kindly add following tag
Reported-by: kbuild test robot <[email protected]>
All error/warnings (new ones prefixed by >>):
In file included from arch/mips/include/asm/bitops.h:625:0,
from include/linux/bitops.h:19,
from include/linux/kernel.h:12,
from drivers/gpio/gpio-mpc8xxx.c:12:
drivers/gpio/gpio-mpc8xxx.c: In function 'mpc8xxx_gpio_irq_cascade':
>> include/asm-generic/bitops/find.h:75:50: error: passing argument 1 of 'find_next_bit' from incompatible pointer type [-Werror=incompatible-pointer-types]
#define find_first_bit(addr, size) find_next_bit((addr), (size), 0)
^
>> include/linux/bitops.h:22:15: note: in expansion of macro 'find_first_bit'
for ((bit) = find_first_bit((addr), (size)); \
^~~~~~~~~~~~~~
drivers/gpio/gpio-mpc8xxx.c:140:2: note: in expansion of macro 'for_each_set_bit'
for_each_set_bit(i, &mask, 32)
^~~~~~~~~~~~~~~~
include/asm-generic/bitops/find.h:15:22: note: expected 'const long unsigned int *' but argument is of type 'unsigned int *'
extern unsigned long find_next_bit(const unsigned long *addr, unsigned long
^~~~~~~~~~~~~
In file included from include/linux/kernel.h:12:0,
from drivers/gpio/gpio-mpc8xxx.c:12:
include/linux/bitops.h:24:29: error: passing argument 1 of 'find_next_bit' from incompatible pointer type [-Werror=incompatible-pointer-types]
(bit) = find_next_bit((addr), (size), (bit) + 1))
^
drivers/gpio/gpio-mpc8xxx.c:140:2: note: in expansion of macro 'for_each_set_bit'
for_each_set_bit(i, &mask, 32)
^~~~~~~~~~~~~~~~
In file included from arch/mips/include/asm/bitops.h:625:0,
from include/linux/bitops.h:19,
from include/linux/kernel.h:12,
from drivers/gpio/gpio-mpc8xxx.c:12:
include/asm-generic/bitops/find.h:15:22: note: expected 'const long unsigned int *' but argument is of type 'unsigned int *'
extern unsigned long find_next_bit(const unsigned long *addr, unsigned long
^~~~~~~~~~~~~
cc1: some warnings being treated as errors
--
In file included from arch/mips/include/asm/bitops.h:625:0,
from include/linux/bitops.h:19,
from include/linux/kernel.h:12,
from drivers//gpio/gpio-mpc8xxx.c:12:
drivers//gpio/gpio-mpc8xxx.c: In function 'mpc8xxx_gpio_irq_cascade':
>> include/asm-generic/bitops/find.h:75:50: error: passing argument 1 of 'find_next_bit' from incompatible pointer type [-Werror=incompatible-pointer-types]
#define find_first_bit(addr, size) find_next_bit((addr), (size), 0)
^
>> include/linux/bitops.h:22:15: note: in expansion of macro 'find_first_bit'
for ((bit) = find_first_bit((addr), (size)); \
^~~~~~~~~~~~~~
drivers//gpio/gpio-mpc8xxx.c:140:2: note: in expansion of macro 'for_each_set_bit'
for_each_set_bit(i, &mask, 32)
^~~~~~~~~~~~~~~~
include/asm-generic/bitops/find.h:15:22: note: expected 'const long unsigned int *' but argument is of type 'unsigned int *'
extern unsigned long find_next_bit(const unsigned long *addr, unsigned long
^~~~~~~~~~~~~
In file included from include/linux/kernel.h:12:0,
from drivers//gpio/gpio-mpc8xxx.c:12:
include/linux/bitops.h:24:29: error: passing argument 1 of 'find_next_bit' from incompatible pointer type [-Werror=incompatible-pointer-types]
(bit) = find_next_bit((addr), (size), (bit) + 1))
^
drivers//gpio/gpio-mpc8xxx.c:140:2: note: in expansion of macro 'for_each_set_bit'
for_each_set_bit(i, &mask, 32)
^~~~~~~~~~~~~~~~
In file included from arch/mips/include/asm/bitops.h:625:0,
from include/linux/bitops.h:19,
from include/linux/kernel.h:12,
from drivers//gpio/gpio-mpc8xxx.c:12:
include/asm-generic/bitops/find.h:15:22: note: expected 'const long unsigned int *' but argument is of type 'unsigned int *'
extern unsigned long find_next_bit(const unsigned long *addr, unsigned long
^~~~~~~~~~~~~
cc1: some warnings being treated as errors
vim +/find_first_bit +22 include/linux/bitops.h
4677d4a53e0d56 Borislav Petkov 2010-05-03 14
^1da177e4c3f41 Linus Torvalds 2005-04-16 15 /*
^1da177e4c3f41 Linus Torvalds 2005-04-16 16 * Include this here because some architectures need generic_ffs/fls in
^1da177e4c3f41 Linus Torvalds 2005-04-16 17 * scope
^1da177e4c3f41 Linus Torvalds 2005-04-16 18 */
^1da177e4c3f41 Linus Torvalds 2005-04-16 @19 #include <asm/bitops.h>
^1da177e4c3f41 Linus Torvalds 2005-04-16 20
984b3f5746ed2c Akinobu Mita 2010-03-05 21 #define for_each_set_bit(bit, addr, size) \
3e037454bcfa4b Shannon Nelson 2007-10-16 @22 for ((bit) = find_first_bit((addr), (size)); \
3e037454bcfa4b Shannon Nelson 2007-10-16 23 (bit) < (size); \
3e037454bcfa4b Shannon Nelson 2007-10-16 24 (bit) = find_next_bit((addr), (size), (bit) + 1))
3e037454bcfa4b Shannon Nelson 2007-10-16 25
:::::: The code at line 22 was first introduced by commit
:::::: 3e037454bcfa4b187e8293d2121bd8c0f5a5c31c I/OAT: Add support for MSI and MSI-X
:::::: TO: Shannon Nelson <[email protected]>
:::::: CC: Linus Torvalds <[email protected]>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
On Fri, Sep 27, 2019 at 5:26 AM Hui Song <[email protected]> wrote:
> From: Song Hui <[email protected]>
>
> More than one gpio controllers can share one interrupt, change the
> driver to request shared irq.
>
> While this will work, it will mess up userspace accounting of the number
> of interrupts per second in tools such as vmstat. The reason is that
> for every GPIO interrupt, /proc/interrupts records the count against GIC
> interrupt 68 or 69, as well as the GPIO itself. So, for every GPIO
> interrupt, the total number of interrupts that the system has seen
> increments by two
>
> Signed-off-by: Laurentiu Tudor <[email protected]>
> Signed-off-by: Alex Marginean <[email protected]>
> Signed-off-by: Song Hui <[email protected]>
> ---
> Changes in v6:
> - change request_irq to devm_request_irq and add commit message
There is some build error on the patch, can you look into it?
Yours,
Linus Walleij