[PATCH v2] hid: cp2112: Fix IRQ shutdown stopping polling for all IRQs on chip

[PATCH v2] hid: cp2112: Fix IRQ shutdown stopping polling for all IRQs on chip

[Danny Kaehn]

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>
---

Changes since v1 -- resolving comments from Andy:
- Addressed patch message missing parens
- Fixed opening bracket on newline


 drivers/hid/hid-cp2112.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/hid/hid-cp2112.c b/drivers/hid/hid-cp2112.c
index 54c33a24f844..b24d398f430f 100644
--- a/drivers/hid/hid-cp2112.c
+++ b/drivers/hid/hid-cp2112.c
@@ -1168,7 +1168,11 @@ 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)
-- 
2.25.1

Re: [PATCH v2] hid: cp2112: Fix IRQ shutdown stopping polling for all IRQs on chip

[Danny Kaehn]

Apologies for the duplicate email, realized too late that
this should likely also include a Fixes tag.

Fixes: 13de9cca514e ("HID: cp2112: add IRQ chip handling")

Re: [PATCH v2] hid: cp2112: Fix IRQ shutdown stopping polling for all IRQs on chip

[Benjamin Tissoires]

On Wed, 11 Oct 2023 13:23:17 -0500, Danny Kaehn wrote:
> 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.
> 
> [...]

Applied to hid/hid.git (for-6.7/cp2112), thanks!

[1/1] hid: cp2112: Fix IRQ shutdown stopping polling for all IRQs on chip
      https://git.kernel.org/hid/hid/c/dc3115e6c5d9

Cheers,
-- 
Benjamin Tissoires <bentiss@kernel.org>