| Message ID | 20230919212426.489637-1-danny.kaehn@plexus.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Jiri Kosina |
| Headers | show |
| Series | hid: cp2112: Fix IRQ shutdown stopping polling for all IRQs on chip | expand |
On Tue, Sep 19, 2023 at 04:24:26PM -0500, Danny Kaehn wrote: > Previously cp2112_gpio_irq_shutdown always cancelled the cp2112_gpio_irq_shutdown() > gpio_poll_worker, even if other IRQs were still active, and did not set > the gpio_poll flag to false. This resulted in any call to _shutdown() > resulting in interrupts no longer functioning on the chip until a > _remove occurred (a.e. the cp2112 is unplugged or system rebooted). _remove() > Only cancel polling if all IRQs are disabled/masked, and correctly set > the gpio_poll flag, allowing polling to restart when an interrupt is > next enabled. ... > + if (!dev->irq_mask) > + { The style tells to use these on a single line. > + dev->gpio_poll = false; > + cancel_delayed_work_sync(&dev->gpio_poll_worker); > + }
On Wed, 2023-09-20 at 16:33 +0300, Andy Shevchenko wrote: > On Tue, Sep 19, 2023 at 04:24:26PM -0500, Danny Kaehn wrote: > > Previously cp2112_gpio_irq_shutdown always cancelled the > > cp2112_gpio_irq_shutdown() > > _remove occurred (a.e. the cp2112 is unplugged or system rebooted). > > _remove() > > > + if (!dev->irq_mask) > > + { > > The style tells to use these on a single line. ACK -- will fix all in v2. Thanks for the comments. Danny Kaehn
diff --git a/drivers/hid/hid-cp2112.c b/drivers/hid/hid-cp2112.c index 36f76c6dfa20..d589214834b9 100644 --- a/drivers/hid/hid-cp2112.c +++ b/drivers/hid/hid-cp2112.c @@ -1166,7 +1166,12 @@ static void cp2112_gpio_irq_shutdown(struct irq_data *d) struct cp2112_device *dev = gpiochip_get_data(gc); cp2112_gpio_irq_mask(d); - cancel_delayed_work_sync(&dev->gpio_poll_worker); + + if (!dev->irq_mask) + { + dev->gpio_poll = false; + cancel_delayed_work_sync(&dev->gpio_poll_worker); + } } static int cp2112_gpio_irq_type(struct irq_data *d, unsigned int type)
Previously cp2112_gpio_irq_shutdown always cancelled the gpio_poll_worker, even if other IRQs were still active, and did not set the gpio_poll flag to false. This resulted in any call to _shutdown() resulting in interrupts no longer functioning on the chip until a _remove occurred (a.e. the cp2112 is unplugged or system rebooted). Only cancel polling if all IRQs are disabled/masked, and correctly set the gpio_poll flag, allowing polling to restart when an interrupt is next enabled. Signed-off-by: Danny Kaehn <danny.kaehn@plexus.com> --- drivers/hid/hid-cp2112.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)