| Message ID | 1528954065-25563-1-git-send-email-yamada.masahiro@socionext.com |
|---|---|
| State | New |
| Headers | show |
| Series | gpio: uniphier: set legitimate irq trigger type in .to_irq hook | expand |
On Thu, Jun 14, 2018 at 7:27 AM, Masahiro Yamada <yamada.masahiro@socionext.com> wrote: > If a GPIO chip is a part of a hierarchy IRQ domain, there is no > way to specify the trigger type when gpio(d)_to_irq() allocates an > interrupt on-the-fly. > > Currently, uniphier_gpio_to_irq() sets IRQ_TYPE_NONE, but it causes > an error in the .alloc() hook of the parent domain. > (drivers/irq/irq-uniphier-aidet.c) > > Even if we change irq-uniphier-aidet.c to accept the NONE type, > GIC complains about it since commit 83a86fbb5b56 ("irqchip/gic: > Loudly complain about the use of IRQ_TYPE_NONE"). > > Instead, use IRQ_TYPE_LEVEL_HIGH as a temporary value when an irq > is allocated. irq_set_irq_type() will override it when the irq is > really requested. > > Fixes: dbe776c2ca54 ("gpio: uniphier: add UniPhier GPIO controller driver") > Reported-by: Katsuhiro Suzuki <suzuki.katsuhiro@socionext.com> > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > Tested-by: Katsuhiro Suzuki <suzuki.katsuhiro@socionext.com> Patch applied for fixes! Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/gpio/gpio-uniphier.c b/drivers/gpio/gpio-uniphier.c index d3cf950..58faeb1 100644 --- a/drivers/gpio/gpio-uniphier.c +++ b/drivers/gpio/gpio-uniphier.c @@ -181,7 +181,11 @@ static int uniphier_gpio_to_irq(struct gpio_chip *chip, unsigned int offset) fwspec.fwnode = of_node_to_fwnode(chip->parent->of_node); fwspec.param_count = 2; fwspec.param[0] = offset - UNIPHIER_GPIO_IRQ_OFFSET; - fwspec.param[1] = IRQ_TYPE_NONE; + /* + * IRQ_TYPE_NONE is rejected by the parent irq domain. Set LEVEL_HIGH + * temporarily. Anyway, ->irq_set_type() will override it later. + */ + fwspec.param[1] = IRQ_TYPE_LEVEL_HIGH; return irq_create_fwspec_mapping(&fwspec); }
If a GPIO chip is a part of a hierarchy IRQ domain, there is no way to specify the trigger type when gpio(d)_to_irq() allocates an interrupt on-the-fly. Currently, uniphier_gpio_to_irq() sets IRQ_TYPE_NONE, but it causes an error in the .alloc() hook of the parent domain. (drivers/irq/irq-uniphier-aidet.c) Even if we change irq-uniphier-aidet.c to accept the NONE type, GIC complains about it since commit 83a86fbb5b56 ("irqchip/gic: Loudly complain about the use of IRQ_TYPE_NONE"). Instead, use IRQ_TYPE_LEVEL_HIGH as a temporary value when an irq is allocated. irq_set_irq_type() will override it when the irq is really requested. Fixes: dbe776c2ca54 ("gpio: uniphier: add UniPhier GPIO controller driver") Reported-by: Katsuhiro Suzuki <suzuki.katsuhiro@socionext.com> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Tested-by: Katsuhiro Suzuki <suzuki.katsuhiro@socionext.com> --- drivers/gpio/gpio-uniphier.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)