| Message ID | 20211018112201.25424-1-noralf@tronnes.org |
|---|---|
| State | New |
| Headers | show |
| Series | gpio: dln2: Fix interrupts when replugging the device | expand |
On Mon, Oct 18, 2021 at 1:23 PM Noralf Trønnes <noralf@tronnes.org> wrote: > When replugging the device the following message shows up: > > gpio gpiochip2: (dln2): detected irqchip that is shared with multiple gpiochips: please fix the driver. > > This also has the effect that interrupts won't work. > The same problem would also show up if multiple devices where plugged in. > > Fix this by allocating the irq_chip data structure per instance like other > drivers do. > > I don't know when this problem appeared, but it is present in 5.10. > > Cc: <stable@vger.kernel.org> # 5.10+ > Cc: Daniel Baluta <daniel.baluta@gmail.com> > Signed-off-by: Noralf Trønnes <noralf@tronnes.org> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
Den 24.10.2021 23.09, skrev Linus Walleij: > On Mon, Oct 18, 2021 at 1:23 PM Noralf Trønnes <noralf@tronnes.org> wrote: > >> When replugging the device the following message shows up: >> >> gpio gpiochip2: (dln2): detected irqchip that is shared with multiple gpiochips: please fix the driver. >> >> This also has the effect that interrupts won't work. >> The same problem would also show up if multiple devices where plugged in. >> >> Fix this by allocating the irq_chip data structure per instance like other >> drivers do. >> >> I don't know when this problem appeared, but it is present in 5.10. >> >> Cc: <stable@vger.kernel.org> # 5.10+ >> Cc: Daniel Baluta <daniel.baluta@gmail.com> >> Signed-off-by: Noralf Trønnes <noralf@tronnes.org> > > Reviewed-by: Linus Walleij <linus.walleij@linaro.org> > Has this been applied, I can't see it in -next? Noralf.
On Mon, Nov 22, 2021 at 9:28 PM Noralf Trønnes <noralf@tronnes.org> wrote:
> Has this been applied, I can't see it in -next?
Bartosz is applying patches for the recent kernels, I bet he will
get to it.
Yours,
Linus Walleij
Den 24.10.2021 23.09, skrev Linus Walleij: > On Mon, Oct 18, 2021 at 1:23 PM Noralf Trønnes <noralf@tronnes.org> wrote: > >> When replugging the device the following message shows up: >> >> gpio gpiochip2: (dln2): detected irqchip that is shared with multiple gpiochips: please fix the driver. >> >> This also has the effect that interrupts won't work. >> The same problem would also show up if multiple devices where plugged in. >> >> Fix this by allocating the irq_chip data structure per instance like other >> drivers do. >> >> I don't know when this problem appeared, but it is present in 5.10. >> >> Cc: <stable@vger.kernel.org> # 5.10+ >> Cc: Daniel Baluta <daniel.baluta@gmail.com> >> Signed-off-by: Noralf Trønnes <noralf@tronnes.org> > > Reviewed-by: Linus Walleij <linus.walleij@linaro.org> > Ping, has this been forgotten? Can't see it in -next. Noralf.
On Sun, Dec 19, 2021 at 1:01 AM Noralf Trønnes <noralf@tronnes.org> wrote: > > > > Den 24.10.2021 23.09, skrev Linus Walleij: > > On Mon, Oct 18, 2021 at 1:23 PM Noralf Trønnes <noralf@tronnes.org> wrote: > > > >> When replugging the device the following message shows up: > >> > >> gpio gpiochip2: (dln2): detected irqchip that is shared with multiple gpiochips: please fix the driver. > >> > >> This also has the effect that interrupts won't work. > >> The same problem would also show up if multiple devices where plugged in. > >> > >> Fix this by allocating the irq_chip data structure per instance like other > >> drivers do. > >> > >> I don't know when this problem appeared, but it is present in 5.10. > >> > >> Cc: <stable@vger.kernel.org> # 5.10+ > >> Cc: Daniel Baluta <daniel.baluta@gmail.com> > >> Signed-off-by: Noralf Trønnes <noralf@tronnes.org> > > > > Reviewed-by: Linus Walleij <linus.walleij@linaro.org> > > > > Ping, has this been forgotten? Can't see it in -next. > > Noralf. Hi Noralf, As of commit d1d598104336075e7475d932d200b33108399225 my email address has changed and the relevant commit has been in mainline for a while now. I only by accident noticed this patch now. Please use scripts/get_maintainer.pl in the future. Now queued, thanks! Bart
diff --git a/drivers/gpio/gpio-dln2.c b/drivers/gpio/gpio-dln2.c index 4c5f6d0c8d74..22f11dd5210d 100644 --- a/drivers/gpio/gpio-dln2.c +++ b/drivers/gpio/gpio-dln2.c @@ -46,6 +46,7 @@ struct dln2_gpio { struct platform_device *pdev; struct gpio_chip gpio; + struct irq_chip irqchip; /* * Cache pin direction to save us one transfer, since the hardware has @@ -383,15 +384,6 @@ static void dln2_irq_bus_unlock(struct irq_data *irqd) mutex_unlock(&dln2->irq_lock); } -static struct irq_chip dln2_gpio_irqchip = { - .name = "dln2-irq", - .irq_mask = dln2_irq_mask, - .irq_unmask = dln2_irq_unmask, - .irq_set_type = dln2_irq_set_type, - .irq_bus_lock = dln2_irq_bus_lock, - .irq_bus_sync_unlock = dln2_irq_bus_unlock, -}; - static void dln2_gpio_event(struct platform_device *pdev, u16 echo, const void *data, int len) { @@ -477,8 +469,15 @@ static int dln2_gpio_probe(struct platform_device *pdev) dln2->gpio.direction_output = dln2_gpio_direction_output; dln2->gpio.set_config = dln2_gpio_set_config; + dln2->irqchip.name = "dln2-irq", + dln2->irqchip.irq_mask = dln2_irq_mask, + dln2->irqchip.irq_unmask = dln2_irq_unmask, + dln2->irqchip.irq_set_type = dln2_irq_set_type, + dln2->irqchip.irq_bus_lock = dln2_irq_bus_lock, + dln2->irqchip.irq_bus_sync_unlock = dln2_irq_bus_unlock, + girq = &dln2->gpio.irq; - girq->chip = &dln2_gpio_irqchip; + girq->chip = &dln2->irqchip; /* The event comes from the outside so no parent handler */ girq->parent_handler = NULL; girq->num_parents = 0;
When replugging the device the following message shows up: gpio gpiochip2: (dln2): detected irqchip that is shared with multiple gpiochips: please fix the driver. This also has the effect that interrupts won't work. The same problem would also show up if multiple devices where plugged in. Fix this by allocating the irq_chip data structure per instance like other drivers do. I don't know when this problem appeared, but it is present in 5.10. Cc: <stable@vger.kernel.org> # 5.10+ Cc: Daniel Baluta <daniel.baluta@gmail.com> Signed-off-by: Noralf Trønnes <noralf@tronnes.org> --- drivers/gpio/gpio-dln2.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)