RE: [PATCH v3 2/2] HID: intel-thc-hid: quicki2c: quiesce IRQs during teardown
From: Xu, Even
Date: Thu Nov 12 2026 - 03:58:20 EST
> -----Original Message-----
> From: Myeonghun Pak <mhun512@xxxxxxxxx>
> Sent: Thursday, November 12, 2026 2:38 PM
> To: Xu, Even <even.xu@xxxxxxxxx>; Sun, Xinpeng <xinpeng.sun@xxxxxxxxx>;
> jikos@xxxxxxxxxx; bentiss@xxxxxxxxxx
> Cc: srinivas.pandruvada@xxxxxxxxxxxxxxx; mpearson-lenovo@xxxxxxxxx; linux-
> input@xxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx; ae878000@xxxxxxxxx
> Subject: [PATCH v3 2/2] HID: intel-thc-hid: quicki2c: quiesce IRQs during
> teardown
>
> The managed IRQ can access HID/DMA buffers or queue recovery work while
> remove or probe unwind tears down those resources.
>
> Disable and synchronize the IRQ, drain recovery work, then mask THC interrupts
> before freeing the IRQ and releasing HID/DMA resources.
> Track IRQ/DMA initialization for conditional probe cleanup.
>
> Disable the IRQ before shutdown deinit as well. Keep IRQ disabling and release
> outside the shared hibernation helper.
>
> Found by a static analysis tool under development.
>
> Fixes: 66b59bfce6d9 ("HID: intel-thc-hid: intel-quicki2c: Complete THC QuickI2C
> driver")
> Co-developed-by: Ijae Kim <ae878000@xxxxxxxxx>
> Signed-off-by: Ijae Kim <ae878000@xxxxxxxxx>
> Signed-off-by: Myeonghun Pak <mhun512@xxxxxxxxx>
> ---
>
> Changes in v3:
> - Add blank lines in the probe error path (Even).
>
> drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c | 32
> ++++++++++++++++++++++++++------
> 1 file changed, 26 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c
> b/drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c
> index 29319b6227f3..84e458fdd69c 100644
> --- a/drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c
> +++ b/drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c
> @@ -652,6 +652,8 @@
> {
> const struct quicki2c_ddata *ddata = (const struct quicki2c_ddata *)id-
> >driver_data;
> struct quicki2c_device *qcdev;
> + bool dma_initialized = false;
> + bool irq_requested = false;
> void __iomem *mem_addr;
> int ret;
>
> @@ -704,6 +706,7 @@
> qcdev);
> if (ret)
> goto dev_deinit;
> + irq_requested = true;
>
> ret = quicki2c_get_device_descriptor(qcdev);
> if (ret) {
> @@ -722,6 +725,7 @@
> dev_err(&pdev->dev, "Setup THC DMA failed, ret= %d\n", ret);
> goto dev_deinit;
> }
> + dma_initialized = true;
>
> ret = thc_interrupt_quiesce(qcdev->thc_hw, false);
> if (ret)
> @@ -742,13 +746,13 @@
> ret = quicki2c_get_report_descriptor(qcdev);
> if (ret) {
> dev_err(&pdev->dev, "Get report descriptor failed, ret = %d\n",
> ret);
> - goto dma_deinit;
> + goto dev_deinit;
> }
>
> ret = quicki2c_hid_probe(qcdev);
> if (ret) {
> dev_err(&pdev->dev, "Failed to register HID device, ret = %d\n",
> ret);
> - goto dma_deinit;
> + goto dev_deinit;
> }
>
> qcdev->state = QUICKI2C_ENABLED;
> @@ -763,10 +767,20 @@
>
> return 0;
>
> -dma_deinit:
> - quicki2c_dma_deinit(qcdev);
> dev_deinit:
> + if (irq_requested) {
> + WRITE_ONCE(qcdev->recovery_disabled, true);
> + disable_irq(pdev->irq);
> + }
> +
> quicki2c_dev_deinit(qcdev);
> +
> + if (irq_requested)
> + devm_free_irq(&pdev->dev, pdev->irq, qcdev);
> +
> + if (dma_initialized)
> + quicki2c_dma_deinit(qcdev);
> +
> disable_pci_device:
> pci_clear_master(pdev);
>
> @@ -788,9 +802,12 @@
> if (!qcdev)
> return;
>
> + WRITE_ONCE(qcdev->recovery_disabled, true);
> + disable_irq(pdev->irq);
> + quicki2c_dev_deinit(qcdev);
> + devm_free_irq(&pdev->dev, pdev->irq, qcdev);
> +
> quicki2c_hid_remove(qcdev);
> -
> - quicki2c_dev_deinit(qcdev);
>
> quicki2c_dma_deinit(qcdev);
>
> @@ -814,6 +831,9 @@
> qcdev = pci_get_drvdata(pdev);
> if (!qcdev)
> return;
> +
> + WRITE_ONCE(qcdev->recovery_disabled, true);
> + disable_irq(pdev->irq);
>
> quicki2c_dev_deinit(qcdev);
Thanks for the patch!
Reviewed-by: Even Xu <even.xu@xxxxxxxxx>
>
>
> base-commit: b3dfbde62cf1981c4638939c159dfd087b7a72e9
> --
> 2.53.0