From: Myeonghun Pak <mhun512@gmail.com>
To: Even Xu <even.xu@intel.com>, Xinpeng Sun <xinpeng.sun@intel.com>,
Jiri Kosina <jikos@kernel.org>,
Benjamin Tissoires <bentiss@kernel.org>
Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>,
Mark Pearson <mpearson-lenovo@squebb.ca>,
linux-input@vger.kernel.org, linux-kernel@vger.kernel.org,
Ijae Kim <ae878000@gmail.com>
Subject: [PATCH 1/2] HID: intel-thc-hid: quickspi: quiesce IRQs during teardown
Date: Sun, 11 Oct 2026 18:05:30 -0400 [thread overview]
Message-ID: <20261011220531.2073892-2-mhun512@gmail.com> (raw)
In-Reply-To: <20261011220531.2073892-1-mhun512@gmail.com>
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.
This issue was found by static analysis.
Fixes: 4138f21115ae ("HID: intel-thc-hid: intel-quickspi: Complete THC QuickSPI driver")
Assisted-by: LLM
Co-developed-by: Ijae Kim <ae878000@gmail.com>
Signed-off-by: Ijae Kim <ae878000@gmail.com>
Signed-off-by: Myeonghun Pak <mhun512@gmail.com>
---
Compile-tested with GCC, W=1 (x86_64). No runtime testing.
Related recovery-work review and series:
https://lore-kernel.gnuweeb.org/linux-input/20260717035609.3874015-1-even.xu@intel.com/T/
https://patchew.org/linux/20260729050145.2272597-1-even.xu@intel.com/
.../intel-quickspi/pci-quickspi.c | 28 +++++++++++++++----
1 file changed, 22 insertions(+), 6 deletions(-)
diff --git a/drivers/hid/intel-thc-hid/intel-quickspi/pci-quickspi.c b/drivers/hid/intel-thc-hid/intel-quickspi/pci-quickspi.c
index 89226f5ce45e..0bd22f285c78 100644
--- a/drivers/hid/intel-thc-hid/intel-quickspi/pci-quickspi.c
+++ b/drivers/hid/intel-thc-hid/intel-quickspi/pci-quickspi.c
@@ -597,6 +597,8 @@ static int quickspi_probe(struct pci_dev *pdev,
const struct pci_device_id *id)
{
struct quickspi_device *qsdev;
+ bool dma_initialized = false;
+ bool irq_requested = false;
void __iomem *mem_addr;
int ret;
@@ -649,6 +651,7 @@ static int quickspi_probe(struct pci_dev *pdev,
qsdev);
if (ret)
goto dev_deinit;
+ irq_requested = true;
ret = reset_tic(qsdev);
if (ret) {
@@ -667,17 +670,18 @@ static int quickspi_probe(struct pci_dev *pdev,
dev_err(&pdev->dev, "Setup THC DMA failed, ret= %d\n", ret);
goto dev_deinit;
}
+ dma_initialized = true;
ret = quickspi_get_report_descriptor(qsdev);
if (ret) {
dev_err(&pdev->dev, "Get report descriptor failed, ret = %d\n", ret);
- goto dma_deinit;
+ goto dev_deinit;
}
ret = quickspi_hid_probe(qsdev);
if (ret) {
dev_err(&pdev->dev, "Failed to register HID device, ret = %d\n", ret);
- goto dma_deinit;
+ goto dev_deinit;
}
qsdev->state = QUICKSPI_ENABLED;
@@ -692,10 +696,16 @@ static int quickspi_probe(struct pci_dev *pdev,
return 0;
-dma_deinit:
- quickspi_dma_deinit(qsdev);
dev_deinit:
+ if (irq_requested) {
+ WRITE_ONCE(qsdev->recovery_disabled, true);
+ disable_irq(pdev->irq);
+ }
quickspi_dev_deinit(qsdev);
+ if (irq_requested)
+ devm_free_irq(&pdev->dev, pdev->irq, qsdev);
+ if (dma_initialized)
+ quickspi_dma_deinit(qsdev);
disable_pci_device:
pci_clear_master(pdev);
@@ -718,9 +728,12 @@ static void quickspi_remove(struct pci_dev *pdev)
if (!qsdev)
return;
- quickspi_hid_remove(qsdev);
-
+ WRITE_ONCE(qsdev->recovery_disabled, true);
+ disable_irq(pdev->irq);
quickspi_dev_deinit(qsdev);
+ devm_free_irq(&pdev->dev, pdev->irq, qsdev);
+
+ quickspi_hid_remove(qsdev);
quickspi_dma_deinit(qsdev);
@@ -747,6 +760,9 @@ static void quickspi_shutdown(struct pci_dev *pdev)
if (!qsdev)
return;
+ WRITE_ONCE(qsdev->recovery_disabled, true);
+ disable_irq(pdev->irq);
+
quickspi_dev_deinit(qsdev);
/* Must stop DMA before reboot to avoid DMA entering into unknown state */
next prev parent reply other threads:[~2026-10-11 22:05 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-11 22:05 [PATCH 0/2] HID: intel-thc-hid: quiesce interrupts before final teardown Myeonghun Pak
2026-10-11 22:05 ` Myeonghun Pak [this message]
2026-10-11 22:21 ` [PATCH 1/2] HID: intel-thc-hid: quickspi: quiesce IRQs during teardown sashiko-bot
2026-10-13 0:52 ` Xu, Even
2026-10-11 22:05 ` [PATCH 2/2] HID: intel-thc-hid: quicki2c: " Myeonghun Pak
2026-10-11 22:20 ` sashiko-bot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261011220531.2073892-2-mhun512@gmail.com \
--to=mhun512@gmail.com \
--cc=ae878000@gmail.com \
--cc=bentiss@kernel.org \
--cc=even.xu@intel.com \
--cc=jikos@kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mpearson-lenovo@squebb.ca \
--cc=srinivas.pandruvada@linux.intel.com \
--cc=xinpeng.sun@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox