From nobody Sat Jul 25 22:31:47 2026 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) (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 47048217F33; Mon, 13 Jul 2026 03:03:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.13 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783911827; cv=none; b=mT8Xgh2YI4YJUN8ls1WqWaUkSmj23bg4htyjWxjFFOXlKNWFgeBfm60762VFzyiYY7BwRLs6wDPKIZaGeZskksjkB5n4J/UxfhMr3AlOeG3XWIvrzTsq3owr4683rcLP9CnvD/kscz1rFLADVxWuefnD5Pc7ieYrbWOGYvIHxnE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783911827; c=relaxed/simple; bh=eX5vbVH5k+ZNjlDmhVGDDrAmZC4b0h2BMEuA3PVPYc8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AhvJQgezecRUdGZDCuMWlRQciuSryeWxblUsyv49e9OjgZ2ZkiJlebH2RSrnbS4+acUV7Vt5NZ6qxeCi/sw83F2rxPZY9wkZe8JkaJWegpCFLxrDXJzpx3gKeECJLreqWg3WAzcTF95DMC78B9smVp10GK9YP+nRZRFaXNAt7Ig= 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=ENelD9St; arc=none smtp.client-ip=192.198.163.13 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="ENelD9St" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1783911825; x=1815447825; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=eX5vbVH5k+ZNjlDmhVGDDrAmZC4b0h2BMEuA3PVPYc8=; b=ENelD9Sthiw0t3wQ26Y8d3kdIdvoN9WNLRK67GALRd8KCOAjyx2C/UUu N9DntFfccAe9yg3gS1hFon+sYJUbAtyCDAvxXQ2paNpJ9qWGO42zpWWNP pPRQvcyVs9TyascvtEGtv6PTTAc5wqZ08Hv+6272ol+3+TvbJAKAcczqA GaNm6kdEXj5/Wfwu6ID7kiyCqlR9aq/+dBAVodrM9xVHJ1SBGoROFjfaq 7INvALD/YzKmFskxDtqOwORKU4j/2sz9ZDPQ9GddcQNPlQms0t0fPeS8i 9aOL939RCmiQa96R4yJG7ZjHUyK0sadukCcdGabIMnjPAdbxVkXoQXYB4 Q==; X-CSE-ConnectionGUID: hBQ4VMPNT3yUpBJPBTTIhA== X-CSE-MsgGUID: LMaSougxRvmetsjQ/On1Cw== X-IronPort-AV: E=McAfee;i="6800,10657,11841"; a="87060313" X-IronPort-AV: E=Sophos;i="6.25,154,1779174000"; d="scan'208";a="87060313" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jul 2026 20:03:44 -0700 X-CSE-ConnectionGUID: XMTnmTU4Sku/sMlyZQQZjA== X-CSE-MsgGUID: 2dgLfHyVTRuO7zMuj59ehQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.25,154,1779174000"; d="scan'208";a="255499271" Received: from shsensorbuild.sh.intel.com ([10.239.132.250]) by orviesa007.jf.intel.com with ESMTP; 12 Jul 2026 20:03:43 -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 v3 1/3] HID: Intel-thc-hid: Intel-thc: Add API to reset read DMA Date: Mon, 13 Jul 2026 11:04:10 +0800 Message-ID: <20260713030412.2531933-2-even.xu@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260713030412.2531933-1-even.xu@intel.com> References: <20260713030412.2531933-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 22:31:47 2026 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) (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 96E39377566; Mon, 13 Jul 2026 03:03:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.13 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783911831; cv=none; b=d7rXOrpgcUiTaK/Oj1lYx4Dt9borjkuGr4tAzfuL+trphqzyDpoYGflltrm4qW0rXiHgahLe+VOTt9ymksOPeKFqeJ/8Dz3yLIzlUZJPrzgz6Id6CRLAiuV1ZzN1WGRszaVlQV9cJT7VBr1AxRuJcn4wUfjk7c/Un7qvmJdj0po= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783911831; c=relaxed/simple; bh=hhvzDt0ri+2rDs0cuzlxvY4QswvY4YED74zXdTHiL9Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Hi8lPeXwbbpHSPhlwO451dxt9FXhjQdv6eehi5eU//S2+BEcNvO3BQMZT4nutbNvg8mRI9zf6nmEjnVV0WGlXo23yFYoO/Q2KNS+zfgfS6HnTluZh/0nnaFAkzoffN+9+C3c+6+ihI5EXzDRLdtQlCVPCBtF+q+iiSEEbWpQ0h8= 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=JdUFXQSx; arc=none smtp.client-ip=192.198.163.13 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="JdUFXQSx" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1783911828; x=1815447828; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=hhvzDt0ri+2rDs0cuzlxvY4QswvY4YED74zXdTHiL9Y=; b=JdUFXQSxuygC8ajvWgGwilTYFcBEAOyEaDmZFr06vdEf4L2TLy2jo1gr l9RhpIR/1Y7RDfPKlqKqrZLiX8wiObuISL69BWAYmmeOQsNJfQjTRU4bF p0hO+oVU5f5rOXa6eAMKwaMf+8Pr6ZjnfLd/RHwQUYjL9gnPxK8S6cvY6 WHpanpe8zGDcnL2NL6SjF9zvySnAMkgv7aZh8oFJcgCEKZFYKIEcC3g4v cXyR/kJ8A5FByF4fE1lFajtxpjZO2jRwGivf/wVYbtyqDK1dLFIrAtDBs ReHYThr+dZ+l80enyIybLAfOtOdKPoJjfPrOMFVUidn4TO07JvwEHDnAC w==; X-CSE-ConnectionGUID: 4E6jfatqQfiJ0wvyf4XH1A== X-CSE-MsgGUID: q7+/GiDETACrMdC9tlYzcg== X-IronPort-AV: E=McAfee;i="6800,10657,11841"; a="87060315" X-IronPort-AV: E=Sophos;i="6.25,154,1779174000"; d="scan'208";a="87060315" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jul 2026 20:03:48 -0700 X-CSE-ConnectionGUID: 4dm52/tmT0yndLfMR0dunw== X-CSE-MsgGUID: ZCqCQccVSFGuwwtxtuo3FA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.25,154,1779174000"; d="scan'208";a="255499293" Received: from shsensorbuild.sh.intel.com ([10.239.132.250]) by orviesa007.jf.intel.com with ESMTP; 12 Jul 2026 20:03:47 -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 v3 2/3] HID: Intel-thc-hid: Intel-quicki2c: Refine recover callback Date: Mon, 13 Jul 2026 11:04:11 +0800 Message-ID: <20260713030412.2531933-3-even.xu@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260713030412.2531933-1-even.xu@intel.com> References: <20260713030412.2531933-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 | 49 ++++++++++++------- .../intel-quicki2c/quicki2c-dev.h | 2 + 2 files changed, 32 insertions(+), 19 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..2b586d0635b6 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,28 @@ 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 (pm_runtime_resume_and_get(qcdev->dev)) + return; =20 - ret =3D thc_dma_configure(qcdev->thc_hw); - if (ret) { - dev_err(qcdev->dev, "Reconfig DMA failed\n"); - return ret; - } + thc_interrupt_enable(qcdev->thc_hw, false); =20 - return 0; + 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 +343,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 +385,7 @@ 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); + INIT_WORK(&qcdev->recover_work, try_recover); =20 /* THC hardware init */ qcdev->thc_hw =3D thc_dev_init(qcdev->dev, qcdev->mem_addr); @@ -772,6 +772,12 @@ static void quicki2c_remove(struct pci_dev *pdev) return; =20 quicki2c_hid_remove(qcdev); + + thc_interrupt_quiesce(qcdev->thc_hw, true); + thc_interrupt_enable(qcdev->thc_hw, false); + + cancel_work_sync(&qcdev->recover_work); + quicki2c_dma_deinit(qcdev); =20 pm_runtime_get_noresume(qcdev->dev); @@ -796,6 +802,11 @@ static void quicki2c_shutdown(struct pci_dev *pdev) if (!qcdev) return; =20 + thc_interrupt_quiesce(qcdev->thc_hw, true); + thc_interrupt_enable(qcdev->thc_hw, false); + + cancel_work_sync(&qcdev->recover_work); + /* Must stop DMA before reboot to avoid DMA entering into unknown state */ quicki2c_dma_deinit(qcdev); =20 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..aedf85291e60 100644 --- a/drivers/hid/intel-thc-hid/intel-quicki2c/quicki2c-dev.h +++ b/drivers/hid/intel-thc-hid/intel-quicki2c/quicki2c-dev.h @@ -222,6 +222,8 @@ struct quicki2c_device { wait_queue_head_t reset_ack_wq; bool reset_ack; =20 + struct work_struct recover_work; + u32 i2c_max_frame_size_enable; u32 i2c_max_frame_size; u32 i2c_int_delay_enable; --=20 2.43.0 From nobody Sat Jul 25 22:31:47 2026 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) (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 1F0D43659EE; Mon, 13 Jul 2026 03:04:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.13 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783911844; cv=none; b=m0FT4YqOeAerJrhDumrlfAaBwrvd8OokDWDCqd2beiOQUhvWCn7+hVLCWWBEXZ+TUenDH1aDXd2czdPHPBX9C++nUPLG1EcTE9spvbTxEfwvIEnaQUJ8ycFNucTDvlIowij9B/ocBIrLsik2bIfrgDnZkslKPlbnRZNVty6JdLQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783911844; c=relaxed/simple; bh=+MZfPOhHbiQAz1xTm7BEysp1GdJDTeoVZHJ8pRZDYDc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=F3VNGn3q4rEvM8phxiSaWqIolSeV200kiN/Ki8YUmSqGe2gYQUCa+D2QhtwcTVC5VcJcag5zLPJCjjCegxXUIRxbuHaGE1B6WvKk+r7bSKwGQ15GvQvzOe2V58vGjO4EOG736u47ZMu2bvibK8EKnrDbONA79O08IHgGz6ukiNM= 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=Znm0Oir3; arc=none smtp.client-ip=192.198.163.13 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="Znm0Oir3" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1783911843; x=1815447843; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=+MZfPOhHbiQAz1xTm7BEysp1GdJDTeoVZHJ8pRZDYDc=; b=Znm0Oir3D0PLzlEGKEp2BLVQB4+liNYQp0Cn1KZnDAcvYGMo7QOEQaCv ZkF2U0tb/EVcEFlEDvbpokY/SkjwhmAYI7wm3ESLfw/gfrD/HNuI4Zvqq rl9maLfdxBxnTY9JFWtBcsbwyzMXV+30CVee+M9yitnJeIqtIMpwlS8Z+ MtlkzlMV0SMp7csm/opk2g8Io92b6svwB+cAYLXmLt7+AiWf5umZ8GrQF TAwp/N0d3zvkQwkfDdQjxz2AdRK2i1lsjhVdzigGDSTa/DabtomloncoT gP5GwPNJnbWIA66TqnWWEFS9KPzjI2FapP9nqAnlE3M+ZCRKyR0G9g3xp w==; X-CSE-ConnectionGUID: /g/rcHWPSImSuaSnzMJBEA== X-CSE-MsgGUID: 99omtO9QTq6ek+ubjI0/Zw== X-IronPort-AV: E=McAfee;i="6800,10657,11841"; a="87060329" X-IronPort-AV: E=Sophos;i="6.25,154,1779174000"; d="scan'208";a="87060329" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jul 2026 20:04:02 -0700 X-CSE-ConnectionGUID: eoTbaNC0SMe0k96+xP7KIQ== X-CSE-MsgGUID: /2giQ0HZTECMuQTiWD505Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.25,154,1779174000"; d="scan'208";a="255499366" Received: from shsensorbuild.sh.intel.com ([10.239.132.250]) by orviesa007.jf.intel.com with ESMTP; 12 Jul 2026 20:03:56 -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 v3 3/3] HID: Intel-thc-hid: Intel-quickspi: Refine recover callback Date: Mon, 13 Jul 2026 11:04:12 +0800 Message-ID: <20260713030412.2531933-4-even.xu@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260713030412.2531933-1-even.xu@intel.com> References: <20260713030412.2531933-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 | 53 ++++++++++--------- .../intel-quickspi/quickspi-dev.h | 3 ++ 2 files changed, 32 insertions(+), 24 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 f669235f1883..3690ddd061e1 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,28 @@ 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 (pm_runtime_resume_and_get(qsdev->dev)) + return; =20 - thc_dma_unconfigure(qsdev->thc_hw); + thc_interrupt_enable(qsdev->thc_hw, false); =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; - } + if (thc_rxdma_reset(qsdev->thc_hw)) + qsdev->state =3D QUICKSPI_DISABLED; + else + thc_interrupt_enable(qsdev->thc_hw, true); =20 - return 0; + pm_runtime_put_autosuspend(qsdev->dev); } =20 /** @@ -337,11 +331,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 +378,7 @@ 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); + INIT_WORK(&qsdev->recover_work, try_recover); =20 /* thc hw init */ qsdev->thc_hw =3D thc_dev_init(qsdev->dev, qsdev->mem_addr); @@ -711,6 +705,12 @@ static void quickspi_remove(struct pci_dev *pdev) return; =20 quickspi_hid_remove(qsdev); + + thc_interrupt_quiesce(qsdev->thc_hw, true); + thc_interrupt_enable(qsdev->thc_hw, false); + + cancel_work_sync(&qsdev->recover_work); + quickspi_dma_deinit(qsdev); =20 pm_runtime_get_noresume(qsdev->dev); @@ -737,6 +737,11 @@ static void quickspi_shutdown(struct pci_dev *pdev) if (!qsdev) return; =20 + thc_interrupt_quiesce(qsdev->thc_hw, true); + thc_interrupt_enable(qsdev->thc_hw, false); + + cancel_work_sync(&qsdev->recover_work); + /* Must stop DMA before reboot to avoid DMA entering into unknown state */ quickspi_dma_deinit(qsdev); =20 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..363e589b0bde 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 @@ -173,6 +174,8 @@ struct quickspi_device { =20 wait_queue_head_t set_report_cmpl_wq; bool set_report_cmpl; + + struct work_struct recover_work; }; =20 #endif /* _QUICKSPI_DEV_H_ */ --=20 2.43.0