From nobody Sat Jul 25 06:09:12 2026 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9AA83277C9E; Fri, 17 Jul 2026 03:55:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.17 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784260533; cv=none; b=noeObmHkCCNJKxNGNahfdt26yK4Syt7IJPgMLVruYnwBDXdbgt/ss/gESMTKUxJ2rp+mAMlXMVfb1tbaJ1lUL9cY/G/6rSnFgX+JyeiIPChTzdYQFoBpWCytJQumqSnIeCZ7EoJXLZegqAUrPcYIdzJJM09OPkKUeMGa7KupP3c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784260533; c=relaxed/simple; bh=eX5vbVH5k+ZNjlDmhVGDDrAmZC4b0h2BMEuA3PVPYc8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HqiIHJ/oVG9fmLsIefAHZhFrEZE/vNnVQzXJ/zzPCNLWMBNvbN2W+eXQnDRCKiwghv/tyDXOT6Z7ziu3IvbtFtCFCMzL8N9wp7bk0XSNMVUSBnb+rQEulOaD6VLfARlF/jZ/98L0PSkTSDYF5C0NqO2HBoBXeIy3W7cv/9PuPhM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=Fl+4V52K; arc=none smtp.client-ip=192.198.163.17 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Fl+4V52K" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1784260532; x=1815796532; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=eX5vbVH5k+ZNjlDmhVGDDrAmZC4b0h2BMEuA3PVPYc8=; b=Fl+4V52KE1nZ5RQ2AXkIDoA61JtM8pgU1eCymIWnCLqeDfcfDM93Fe4n nsg6piMFl+xopFTr18EVnWhG6RCCWUf5WeO+vo7pf6MFx9dzVHFiqDtIO P9wh8igvu9H3V1D4R+gYBscmryjtayfk5scoLyb49IBCzBUxGYbUEynw3 hAa6y7/CDg58StXsZeMzVac/frJAIR3qLA5CYQ3722x5Z+eSZ1WJn7PFy o1qjm2ac4vw5BGRXdYeW54t5qZM3odZW6wGEFNRCkH47Vcz6Zb0tTMEYN 2pvchk1PB6ap/jT5YaJwjk0Wmq6bvLH8lSwjNFSA7blxmIRcLiycGdsQr w==; X-CSE-ConnectionGUID: nLqDtjWKSrW/xsY1g1ld1g== X-CSE-MsgGUID: nEgb/2sgRpCX0iEC9htDNA== X-IronPort-AV: E=McAfee;i="6800,10657,11848"; a="84808738" X-IronPort-AV: E=Sophos;i="6.25,168,1779174000"; d="scan'208";a="84808738" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jul 2026 20:55:31 -0700 X-CSE-ConnectionGUID: ksdxd0QZT0WKPF2vRgU5sw== X-CSE-MsgGUID: u78UC3X3SqaQvPAypDfWkg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.25,168,1779174000"; d="scan'208";a="254029646" Received: from shsensorbuild.sh.intel.com ([10.239.132.250]) by fmviesa008.fm.intel.com with ESMTP; 16 Jul 2026 20:55:30 -0700 From: Even Xu To: bentiss@kernel.org, jikos@kernel.org Cc: srinivas.pandruvada@linux.intel.com, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Even Xu Subject: [PATCH v4 1/3] HID: Intel-thc-hid: Intel-thc: Add API to reset read DMA Date: Fri, 17 Jul 2026 11:56:07 +0800 Message-ID: <20260717035609.3874015-2-even.xu@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260717035609.3874015-1-even.xu@intel.com> References: <20260717035609.3874015-1-even.xu@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add a helper function thc_rxdma_reset() to do read DMA reset, it can be called when fatal DMA error happens. Signed-off-by: Even Xu --- .../intel-thc-hid/intel-thc/intel-thc-dma.c | 51 +++++++++++++++++++ .../intel-thc-hid/intel-thc/intel-thc-dma.h | 1 + 2 files changed, 52 insertions(+) diff --git a/drivers/hid/intel-thc-hid/intel-thc/intel-thc-dma.c b/drivers/= hid/intel-thc-hid/intel-thc/intel-thc-dma.c index 6ee675e0a738..7ceb8aeeccd3 100644 --- a/drivers/hid/intel-thc-hid/intel-thc/intel-thc-dma.c +++ b/drivers/hid/intel-thc-hid/intel-thc/intel-thc-dma.c @@ -561,6 +561,57 @@ static int thc_wait_for_dma_pause(struct thc_device *d= ev, enum thc_dma_channel c return 0; } =20 +/** + * thc_rxdma_reset - Reset all read DMA engines + * + * @dev: The pointer of THC private device context + * + * This is a helper function to reset RxDMA configure. It's typically used + * for RxDMA recovery when fatal error happens. + * + * Return: 0 if successful or error code on failure. + */ +int thc_rxdma_reset(struct thc_device *dev) +{ + int ret; + + if (mutex_lock_interruptible(&dev->thc_bus_lock)) + return -EINTR; + + ret =3D thc_interrupt_quiesce(dev, true); + if (ret) { + dev_err(dev->dev, "Quiesce interrupt failed during RxDMA reset\n"); + goto end; + } + + ret =3D thc_wait_for_dma_pause(dev, THC_RXDMA1); + if (ret) { + dev_err(dev->dev, "Wait for RxDMA1 pause failed during RxDMA reset\n"); + goto end; + } + + ret =3D thc_wait_for_dma_pause(dev, THC_RXDMA2); + if (ret) { + dev_err(dev->dev, "Wait for RxDMA2 pause failed during RxDMA reset\n"); + goto end; + } + + thc_dma_unconfigure(dev); + + ret =3D thc_dma_configure(dev); + if (ret) { + dev_err(dev->dev, "Re-config DMA failed during RxDMA reset\n"); + goto end; + } + + thc_interrupt_quiesce(dev, false); + +end: + mutex_unlock(&dev->thc_bus_lock); + return ret; +} +EXPORT_SYMBOL_NS_GPL(thc_rxdma_reset, "INTEL_THC"); + static int read_dma_buffer(struct thc_device *dev, struct thc_dma_configuration *read_config, u8 prd_table_index, void *read_buff) diff --git a/drivers/hid/intel-thc-hid/intel-thc/intel-thc-dma.h b/drivers/= hid/intel-thc-hid/intel-thc/intel-thc-dma.h index 541d33995baf..715423453a9d 100644 --- a/drivers/hid/intel-thc-hid/intel-thc/intel-thc-dma.h +++ b/drivers/hid/intel-thc-hid/intel-thc/intel-thc-dma.h @@ -145,6 +145,7 @@ int thc_dma_allocate(struct thc_device *dev); int thc_dma_configure(struct thc_device *dev); void thc_dma_unconfigure(struct thc_device *dev); void thc_dma_release(struct thc_device *dev); +int thc_rxdma_reset(struct thc_device *dev); int thc_rxdma_read(struct thc_device *dev, enum thc_dma_channel dma_chann= el, void *read_buff, size_t *read_len, int *read_finished); int thc_swdma_read(struct thc_device *dev, void *write_buff, size_t write= _len, --=20 2.43.0 From nobody Sat Jul 25 06:09:12 2026 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 20882277C9E; Fri, 17 Jul 2026 03:55:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.17 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784260538; cv=none; b=jQoNehjQzunZqJXNYi7lIYRzSwLZmVaYsW1HYt11Sj9N8cu7rx1qeC5LbGyciSBJIx28OtBTTDTFoVRosajSPG+wtUS+HtRgRG7/6zOs19TEhF1VgU04punCJhgFB5wePlhBL8i2OQ32IAH/zvY35p8/xbyFdC+MVW9X/1ZF7Po= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784260538; c=relaxed/simple; bh=LATK8OS19UxRPjq3bFe3mQh25meaqw6STkll97LEDG0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=u5uSHR1/1feaePoXiT52VDd0ztLdwm8gAo6COXBgBcw1ZxaGF4bCD8Z8pRt7mClDch5elMRspqjnrT+8oF0v8rVzf/aGo2o40ASrjbOhQNbchNmxwrW14igv0g9a+LjbJyd/Dlnhk//OQprDP/KauCwbSZYXKYH4ZVaJc6d39fE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=Kf3cml6F; arc=none smtp.client-ip=192.198.163.17 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Kf3cml6F" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1784260536; x=1815796536; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=LATK8OS19UxRPjq3bFe3mQh25meaqw6STkll97LEDG0=; b=Kf3cml6F9LmTqXJx99dApxt3ApML/hgLSSC9FA+mRciHgQBiY1JsQKYY 2bpIQGKmREBR2gxThA6B6FGDyjgXvyasR9E+e2sJyUn8ZNSeTXqbReht1 HhDHfy6ko140+63PTe/HLcQDd+iPLzE1293VFL/yPutrR8577MzbbpAye axElpz11LJ8SZR3gvNmhAdgIeVLzUsZzpfoQ8outbGEF5fmFoGNBNEh56 nDHDBp757Zw9LmRRApwHBpOuUU2aygu51Ig/WKYd0MpKVze92ggQ7TFWE Ks7oyBEBTe3XrhDkq38ygfy4HtbafzYmnAWdgTpXL6/1aoUVywj+L4Y0k w==; X-CSE-ConnectionGUID: mhBbQlGoQE+VcL5nd2UF2w== X-CSE-MsgGUID: 22uu0QOBTUiS0Dh9heDj4g== X-IronPort-AV: E=McAfee;i="6800,10657,11848"; a="84808740" X-IronPort-AV: E=Sophos;i="6.25,168,1779174000"; d="scan'208";a="84808740" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jul 2026 20:55:36 -0700 X-CSE-ConnectionGUID: cIqn3gJ7TYafGWg5PqQ0hQ== X-CSE-MsgGUID: jiMTjF3OQGSHgVg+UDBmsg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.25,168,1779174000"; d="scan'208";a="254029649" Received: from shsensorbuild.sh.intel.com ([10.239.132.250]) by fmviesa008.fm.intel.com with ESMTP; 16 Jul 2026 20:55:34 -0700 From: Even Xu To: bentiss@kernel.org, jikos@kernel.org Cc: srinivas.pandruvada@linux.intel.com, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Even Xu Subject: [PATCH v4 2/3] HID: Intel-thc-hid: Intel-quicki2c: Refine recover callback Date: Fri, 17 Jul 2026 11:56:08 +0800 Message-ID: <20260717035609.3874015-3-even.xu@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260717035609.3874015-1-even.xu@intel.com> References: <20260717035609.3874015-1-even.xu@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Refine recover flow: 1. Use workqueue to handle recover flow instead of processing in irq handler. 2. Call thc_rxdma_reset() API to simplify the recover operation. 3. Disable interrupt during whole recover flow. 4. If recover fails, disable interrupt to avoid interrupt storm. Signed-off-by: Even Xu --- .../intel-quicki2c/pci-quicki2c.c | 66 ++++++++++++------- .../intel-quicki2c/quicki2c-dev.h | 5 ++ 2 files changed, 48 insertions(+), 23 deletions(-) diff --git a/drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c b/driv= ers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c index 46d3e9a01999..3ccbddfe8e5e 100644 --- a/drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c +++ b/drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c @@ -245,28 +245,31 @@ static irqreturn_t quicki2c_irq_quick_handler(int irq= , void *dev_id) } =20 /** - * try_recover - Try to recovery THC and Device - * @qcdev: Pointer to quicki2c_device structure + * try_recover - Recover callback to recover THC + * @work: pointer to work_struct * * This function is an error handler, called when fatal error happens. - * It try to reset touch device and re-configure THC to recovery - * communication between touch device and THC. - * - * Return: 0 if successful or error code on failure + * It try to reset Touch Device and re-configure THC to recover + * transferring between Device and THC. */ -static int try_recover(struct quicki2c_device *qcdev) +static void try_recover(struct work_struct *work) { - int ret; + struct quicki2c_device *qcdev =3D container_of(work, struct quicki2c_devi= ce, recover_work); =20 - thc_dma_unconfigure(qcdev->thc_hw); + if (READ_ONCE(qcdev->recovery_disabled)) + return; =20 - ret =3D thc_dma_configure(qcdev->thc_hw); - if (ret) { - dev_err(qcdev->dev, "Reconfig DMA failed\n"); - return ret; - } + if (pm_runtime_resume_and_get(qcdev->dev)) + return; =20 - return 0; + thc_interrupt_enable(qcdev->thc_hw, false); + + if (thc_rxdma_reset(qcdev->thc_hw)) + qcdev->state =3D QUICKI2C_DISABLED; + else + thc_interrupt_enable(qcdev->thc_hw, true); + + pm_runtime_put_autosuspend(qcdev->dev); } =20 static int handle_input_report(struct quicki2c_device *qcdev) @@ -343,11 +346,10 @@ static irqreturn_t quicki2c_irq_thread_handler(int ir= q, void *dev_id) } =20 exit: - thc_interrupt_enable(qcdev->thc_hw, true); - if (err_recover) - if (try_recover(qcdev)) - qcdev->state =3D QUICKI2C_DISABLED; + schedule_work(&qcdev->recover_work); + else + thc_interrupt_enable(qcdev->thc_hw, true); =20 pm_runtime_put_autosuspend(qcdev->dev); =20 @@ -386,6 +388,8 @@ static struct quicki2c_device *quicki2c_dev_init(struct= pci_dev *pdev, void __io qcdev->ddata =3D ddata; =20 init_waitqueue_head(&qcdev->reset_ack_wq); + WRITE_ONCE(qcdev->recovery_disabled, false); + INIT_WORK(&qcdev->recover_work, try_recover); =20 /* THC hardware init */ qcdev->thc_hw =3D thc_dev_init(qcdev->dev, qcdev->mem_addr); @@ -439,6 +443,9 @@ static struct quicki2c_device *quicki2c_dev_init(struct= pci_dev *pdev, void __io */ static void quicki2c_dev_deinit(struct quicki2c_device *qcdev) { + WRITE_ONCE(qcdev->recovery_disabled, true); + cancel_work_sync(&qcdev->recover_work); + thc_interrupt_quiesce(qcdev->thc_hw, true); thc_interrupt_enable(qcdev->thc_hw, false); thc_ltr_unconfig(qcdev->thc_hw); @@ -772,12 +779,13 @@ static void quicki2c_remove(struct pci_dev *pdev) return; =20 quicki2c_hid_remove(qcdev); + + quicki2c_dev_deinit(qcdev); + quicki2c_dma_deinit(qcdev); =20 pm_runtime_get_noresume(qcdev->dev); =20 - quicki2c_dev_deinit(qcdev); - pci_clear_master(pdev); } =20 @@ -796,10 +804,10 @@ static void quicki2c_shutdown(struct pci_dev *pdev) if (!qcdev) return; =20 + quicki2c_dev_deinit(qcdev); + /* Must stop DMA before reboot to avoid DMA entering into unknown state */ quicki2c_dma_deinit(qcdev); - - quicki2c_dev_deinit(qcdev); } =20 static int quicki2c_suspend(struct device *device) @@ -826,6 +834,9 @@ static int quicki2c_suspend(struct device *device) if (ret) return ret; =20 + WRITE_ONCE(qcdev->recovery_disabled, true); + cancel_work_sync(&qcdev->recover_work); + ret =3D thc_interrupt_quiesce(qcdev->thc_hw, true); if (ret) return ret; @@ -867,6 +878,8 @@ static int quicki2c_resume(struct device *device) if (ret) return ret; =20 + WRITE_ONCE(qcdev->recovery_disabled, false); + if (!device_may_wakeup(qcdev->dev)) return quicki2c_set_power(qcdev, HIDI2C_ON); =20 @@ -883,6 +896,9 @@ static int quicki2c_freeze(struct device *device) if (!qcdev) return -ENODEV; =20 + WRITE_ONCE(qcdev->recovery_disabled, true); + cancel_work_sync(&qcdev->recover_work); + ret =3D thc_interrupt_quiesce(qcdev->thc_hw, true); if (ret) return ret; @@ -914,6 +930,8 @@ static int quicki2c_thaw(struct device *device) if (ret) return ret; =20 + WRITE_ONCE(qcdev->recovery_disabled, false); + return 0; } =20 @@ -938,6 +956,8 @@ static int quicki2c_poweroff(struct device *device) =20 thc_ltr_unconfig(qcdev->thc_hw); =20 + quicki2c_dev_deinit(qcdev); + quicki2c_dma_deinit(qcdev); =20 return 0; diff --git a/drivers/hid/intel-thc-hid/intel-quicki2c/quicki2c-dev.h b/driv= ers/hid/intel-thc-hid/intel-quicki2c/quicki2c-dev.h index 61dbdece59a1..d72565de67b9 100644 --- a/drivers/hid/intel-thc-hid/intel-quicki2c/quicki2c-dev.h +++ b/drivers/hid/intel-thc-hid/intel-quicki2c/quicki2c-dev.h @@ -191,6 +191,8 @@ struct acpi_device; * @i2c_max_frame_size: Max RX frame size (unit in Bytes) * @i2c_int_delay_enable: Indicate interrupt delay feature enabled or not * @i2c_int_delay: Interrupt detection delay value (unit in 10 us) + * @recover_work: Work structure for recovery + * @recovery_disabled: Whether recovery work is blocked during teardown */ struct quicki2c_device { struct device *dev; @@ -226,6 +228,9 @@ struct quicki2c_device { u32 i2c_max_frame_size; u32 i2c_int_delay_enable; u32 i2c_int_delay; + + struct work_struct recover_work; + bool recovery_disabled; }; =20 #endif /* _QUICKI2C_DEV_H_ */ --=20 2.43.0 From nobody Sat Jul 25 06:09:12 2026 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E913437A827; Fri, 17 Jul 2026 03:55:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.17 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784260541; cv=none; b=BUsmEel2QyNvJA8Rdv8EltoqeHb2De/tM08CXTAkK7/u/rIPC7PhiOdcCOKBVYwTgcnIFGJ0zFNTz5TMHqZHjE0GNV7A5Vj6EzUsQVFH+D9NjGWOHSaDFF5x9/+AXm4LE7kr7KYrjefuqGqjn86FoUjEe7qP/CfizzUjX1Lp618= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784260541; c=relaxed/simple; bh=IBh82XJz342msgOwUhjUXz4LSpkH3K4rj3dWRMXDUvc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ctf6HyIhmf41/+Sfh+O72+Mb5er5UBuJZh4+fYIy+mv4W3Xk+Dl3e4Tw/ia3z7uPgYwUovHyAfrHvqBNGPVUjPyliqmsJR+Pd0F/SEKESet2JyQpeHeLEg0bAQSFQfWbhnObExiN40eiYAMiRVl+3Zg6wPJA9f95YIeq+HaTGNM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=CUeR702v; arc=none smtp.client-ip=192.198.163.17 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="CUeR702v" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1784260540; x=1815796540; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=IBh82XJz342msgOwUhjUXz4LSpkH3K4rj3dWRMXDUvc=; b=CUeR702vabm8WOoaUKHm2TrczLtO2C4Y0e92Y8o30s8UdyZNyLxeooKm ANkXW4Z5Ohahi7vRnE2Cqcx3Eak6a1c8PIvD75J1nlv6m+Z/Nb8Hnm8xX +gVNAOUckDLbztj9mecJgwkMAhK8KpGmJfwpP3BJGreq6J70feQjcwpgW 6RUqqXUQzpCZuJ8Yr/gSY/m2Ig12eoBigmFcqBC2wUN5b7cpcyC1hHm4k dHlbGmq/CTd7MC3mxIt1RNnIkeiqRwN5gA3jqzXyqvoU+PwyfW92i8ltb bd/FWz1kPpooa4NQGJIV4Q4CiTlTHrByi/QNFZNTz0izCSNeoCZuuxbEY A==; X-CSE-ConnectionGUID: nq/dgSXbSNOa+CqX09d9vw== X-CSE-MsgGUID: zttz1/zoTH2sV/Vh4c91dQ== X-IronPort-AV: E=McAfee;i="6800,10657,11848"; a="84808747" X-IronPort-AV: E=Sophos;i="6.25,168,1779174000"; d="scan'208";a="84808747" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jul 2026 20:55:40 -0700 X-CSE-ConnectionGUID: Po3C7orvTcCo9Kw8jsqo4Q== X-CSE-MsgGUID: pReiwcnWR0igZ6wtTxe99Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.25,168,1779174000"; d="scan'208";a="254029654" Received: from shsensorbuild.sh.intel.com ([10.239.132.250]) by fmviesa008.fm.intel.com with ESMTP; 16 Jul 2026 20:55:38 -0700 From: Even Xu To: bentiss@kernel.org, jikos@kernel.org Cc: srinivas.pandruvada@linux.intel.com, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Even Xu Subject: [PATCH v4 3/3] HID: Intel-thc-hid: Intel-quickspi: Refine recover callback Date: Fri, 17 Jul 2026 11:56:09 +0800 Message-ID: <20260717035609.3874015-4-even.xu@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260717035609.3874015-1-even.xu@intel.com> References: <20260717035609.3874015-1-even.xu@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Refine recover flow: 1. Use workqueue to handle recover flow instead of processing in irq handler. 2. Call thc_rxdma_reset() API to simplify the recover operation. 3. Disable interrupt during whole recover flow. 4. If recover fails, disable interrupt to avoid interrupt storm. Signed-off-by: Even Xu --- .../intel-quickspi/pci-quickspi.c | 71 +++++++++++-------- .../intel-quickspi/quickspi-dev.h | 6 ++ 2 files changed, 49 insertions(+), 28 deletions(-) diff --git a/drivers/hid/intel-thc-hid/intel-quickspi/pci-quickspi.c b/driv= ers/hid/intel-thc-hid/intel-quickspi/pci-quickspi.c index 4ae2e1718b30..db7ede5cc7a2 100644 --- a/drivers/hid/intel-thc-hid/intel-quickspi/pci-quickspi.c +++ b/drivers/hid/intel-thc-hid/intel-quickspi/pci-quickspi.c @@ -252,34 +252,31 @@ static irqreturn_t quickspi_irq_quick_handler(int irq= , void *dev_id) } =20 /** - * try_recover - Try to recovery THC and Device - * @qsdev: pointer to quickspi device + * try_recover - Recover callback to recover THC + * @work: pointer to work_struct * - * This function is a error handler, called when fatal error happens. - * It try to reset Touch Device and re-configure THC to recovery + * This function is an error handler, called when fatal error happens. + * It try to reset Touch Device and re-configure THC to recover * transferring between Device and THC. - * - * Return: 0 if successful or error code on failed. */ -static int try_recover(struct quickspi_device *qsdev) +static void try_recover(struct work_struct *work) { - int ret; + struct quickspi_device *qsdev =3D container_of(work, struct quickspi_devi= ce, recover_work); =20 - ret =3D reset_tic(qsdev); - if (ret) { - dev_err(qsdev->dev, "Reset touch device failed, ret =3D %d\n", ret); - return ret; - } + if (READ_ONCE(qsdev->recovery_disabled)) + return; =20 - thc_dma_unconfigure(qsdev->thc_hw); + if (pm_runtime_resume_and_get(qsdev->dev)) + return; =20 - ret =3D thc_dma_configure(qsdev->thc_hw); - if (ret) { - dev_err(qsdev->dev, "Re-configure THC DMA failed, ret =3D %d\n", ret); - return ret; - } + thc_interrupt_enable(qsdev->thc_hw, false); =20 - return 0; + if (thc_rxdma_reset(qsdev->thc_hw)) + qsdev->state =3D QUICKSPI_DISABLED; + else + thc_interrupt_enable(qsdev->thc_hw, true); + + pm_runtime_put_autosuspend(qsdev->dev); } =20 /** @@ -337,11 +334,10 @@ static irqreturn_t quickspi_irq_thread_handler(int ir= q, void *dev_id) } =20 end: - thc_interrupt_enable(qsdev->thc_hw, true); - if (err_recover) - if (try_recover(qsdev)) - qsdev->state =3D QUICKSPI_DISABLED; + schedule_work(&qsdev->recover_work); + else + thc_interrupt_enable(qsdev->thc_hw, true); =20 pm_runtime_put_autosuspend(qsdev->dev); =20 @@ -385,6 +381,8 @@ static struct quickspi_device *quickspi_dev_init(struct= pci_dev *pdev, void __io init_waitqueue_head(&qsdev->report_desc_got_wq); init_waitqueue_head(&qsdev->get_report_cmpl_wq); init_waitqueue_head(&qsdev->set_report_cmpl_wq); + WRITE_ONCE(qsdev->recovery_disabled, false); + INIT_WORK(&qsdev->recover_work, try_recover); =20 /* thc hw init */ qsdev->thc_hw =3D thc_dev_init(qsdev->dev, qsdev->mem_addr); @@ -461,6 +459,10 @@ static struct quickspi_device *quickspi_dev_init(struc= t pci_dev *pdev, void __io */ static void quickspi_dev_deinit(struct quickspi_device *qsdev) { + WRITE_ONCE(qsdev->recovery_disabled, true); + cancel_work_sync(&qsdev->recover_work); + + thc_interrupt_quiesce(qsdev->thc_hw, true); thc_interrupt_enable(qsdev->thc_hw, false); thc_ltr_unconfig(qsdev->thc_hw); thc_wot_unconfig(qsdev->thc_hw); @@ -711,12 +713,13 @@ static void quickspi_remove(struct pci_dev *pdev) return; =20 quickspi_hid_remove(qsdev); + + quickspi_dev_deinit(qsdev); + quickspi_dma_deinit(qsdev); =20 pm_runtime_get_noresume(qsdev->dev); =20 - quickspi_dev_deinit(qsdev); - pci_clear_master(pdev); } =20 @@ -737,10 +740,10 @@ static void quickspi_shutdown(struct pci_dev *pdev) if (!qsdev) return; =20 + quickspi_dev_deinit(qsdev); + /* Must stop DMA before reboot to avoid DMA entering into unknown state */ quickspi_dma_deinit(qsdev); - - quickspi_dev_deinit(qsdev); } =20 static int quickspi_suspend(struct device *device) @@ -759,6 +762,9 @@ static int quickspi_suspend(struct device *device) return ret; } =20 + WRITE_ONCE(qsdev->recovery_disabled, true); + cancel_work_sync(&qsdev->recover_work); + ret =3D thc_interrupt_quiesce(qsdev->thc_hw, true); if (ret) return ret; @@ -784,6 +790,8 @@ static int quickspi_resume(struct device *device) if (ret) return ret; =20 + WRITE_ONCE(qsdev->recovery_disabled, false); + /* * A wake-enabled device keeps its power and state across suspend, so * only restore the THC context. Resetting it here would discard a @@ -864,6 +872,9 @@ static int quickspi_freeze(struct device *device) if (!qsdev) return -ENODEV; =20 + WRITE_ONCE(qsdev->recovery_disabled, true); + cancel_work_sync(&qsdev->recover_work); + ret =3D thc_interrupt_quiesce(qsdev->thc_hw, true); if (ret) return ret; @@ -895,6 +906,8 @@ static int quickspi_thaw(struct device *device) if (ret) return ret; =20 + WRITE_ONCE(qsdev->recovery_disabled, false); + return 0; } =20 @@ -919,6 +932,8 @@ static int quickspi_poweroff(struct device *device) =20 thc_ltr_unconfig(qsdev->thc_hw); =20 + quickspi_dev_deinit(qsdev); + quickspi_dma_deinit(qsdev); =20 return 0; diff --git a/drivers/hid/intel-thc-hid/intel-quickspi/quickspi-dev.h b/driv= ers/hid/intel-thc-hid/intel-quickspi/quickspi-dev.h index bf5e18f5a5f4..2936c8b1532c 100644 --- a/drivers/hid/intel-thc-hid/intel-quickspi/quickspi-dev.h +++ b/drivers/hid/intel-thc-hid/intel-quickspi/quickspi-dev.h @@ -8,6 +8,7 @@ #include #include #include +#include =20 #include "quickspi-protocol.h" =20 @@ -126,6 +127,8 @@ struct acpi_device; * @get_feature_cmpl: indicate get feature received or not * @set_feature_cmpl_wq: workqueue for waiting set feature to device * @set_feature_cmpl: indicate set feature send complete or not + * @recover_work: Work structure for recovery + * @recovery_disabled: Whether recovery work is blocked during teardown */ struct quickspi_device { struct device *dev; @@ -173,6 +176,9 @@ struct quickspi_device { =20 wait_queue_head_t set_report_cmpl_wq; bool set_report_cmpl; + + struct work_struct recover_work; + bool recovery_disabled; }; =20 #endif /* _QUICKSPI_DEV_H_ */ --=20 2.43.0