From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 90F40606A31A for ; Fri, 30 Oct 2026 16:21:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=bNXOHawj; dkim=fail reason="signature verification failed" (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=PzCmu1Od DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Unsubscribe-Post:List-Owner; bh=dGdlwYQp8lf8cWyjQXEvl/Sw+W2yVfkwqEj+h+SvpF0=; b=bNXOHawj3vyZS37YA8YNrffEyN q5YSjHlsnk02W9eP52pKE/fQGoLjd7AhBklSNfoYkWXGL/DHdoDJKCCFYQjTSD/C0pB7LAf1fT39y eHXIBGjjbBeaDmZkbdwRdHA9Yn2Viq6TH8WDosEX5WY3a/cCJL6w1N9C7UoWKkfgSqxKicanorMB0 a7sunN7fCPKxQ9XnbZ6Yqi1isj2ko4CL690+KLDVBgs74jWK29YYn0sAv8Ra0otVoA/7PoCQHN6vD iAaOx2NryN9bMpxpcTg776M9Z0FzafkRu2DhkVJZfRWGE7UCU9CGg9I7sbY34/ITx/vZ04lw/RGfF pB2sftNA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.100.1 #2 (Red Hat Linux)) id 1xMpLp-0000000C6jh-14BL; Fri, 30 Oct 2026 16:21:09 +0000 Received: from mail-ot1-x32d.google.com ([2607:f8b0:4864:20::32d]) by bombadil.infradead.org with esmtps (Exim 4.100.1 #2 (Red Hat Linux)) id 1xMpLm-0000000C6gu-0W2l for linux-mtd@lists.infradead.org; Fri, 30 Oct 2026 16:21:07 +0000 Received: by mail-ot1-x32d.google.com with SMTP id 46e09a7af769-84e513874f8so683954a34.2 for ; Fri, 30 Oct 2026 09:21:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1793377264; x=1793982064; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=3LJfsKdpKDX4HmeIK5NT3BudGEfehV1hBOYrKs1Or3g=; b=PzCmu1OdWaLiXRdB+8pdtijghFfra+U4pUVE5MTS/4YYnGqbXg42TwY5Zy5BM2JGFE PI0df8Gf4bsSuibFXrurIjw+m/4K7bRCIyvdTJJDmdNUZXM3POf9aSlZ4AcJIuyCe7Jm ciu+nctPFiFezDFsCAL9PL9b5/Kn1ji4z2LYiaFmIBOZWHsqxkgA5Ta6xz6V4twLg5lJ Yr1ICqsPrxyLLGgfIKHP2n6gHMUvUY5dBIGiWSFAzFylgTbbPkVyVR1TdfSGOKOyMB7F bbF9DSStqQ021egqZgGPEO2DfOKD/zGHLeBlSrTPEbsNzfuOj6eW5lr27M4GgJ32kkc/ hPSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793377264; x=1793982064; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=3LJfsKdpKDX4HmeIK5NT3BudGEfehV1hBOYrKs1Or3g=; b=skVKrS8sI9MhhvpyxpEUAK6vCEB3VJu6VE+9CSIi0YEIfX5QB0gLNgb66gyPajdrMQ 73OCWYYvm4vUzkrbtqtDKstF+hrU4fBcQGGezZWB7zSYpPZIK7ZOkhT3G2tQXws8yBqF XW2dMQy+Sq6Sb06Mkc5nMahpw6tm7U2z+Yn9vfUNeBHzVY9Ol9LkvTdRVJfR8bUVbLVc oDtnQTmXeKWvY54mebwzWqTpcLlSAXt1b2UviyNyBwLVd/yUbWPgdvhqTI2SeghQvEE+ fRcQzUP1BuD8N2Jc9oyBI9lmCQYOlw8WceSPsrKfYeS+pBnx1hlwqCZS9rv2GK+bVVJw KdWA== X-Forwarded-Encrypted: i=1; AKwUvBwoxmUjWnY6uQrTFIDuSQdjvkN5NL7v4XHkhU1T8K6ZgE5gGyfylohQGy8wYqTBjBoES9I6kr4ZTrU=@lists.infradead.org X-Gm-Message-State: AFq9FYJ4b/wC3jZmgteAwu3rs4tDKMzgN2HRkZO/AL+i4ldvihMNL2Uq ED8IYfuPqYyv+o9M9nG4UKW3ZfyeqfHP8fN2YN7OWtxF3T/dJYhn3gvP X-Gm-Gg: AYBFou1VszyeeqOw6RccbCvvs23Jje6Z6IJF7DeO7Cj1dKBxY7aq6IhKslRwsOnUNxM Q7gI1gMIhLrMe0rRwAAehZieJk4vJY0oorjstMmIAb4tkKGXO4iPvm55ImNYGz+bgvZCSfGIMkf vD0Lv/9kgrt4gI/OmqDhu6/v0SeZTUYV6lrJKyHKnrwVwMA2/pVhYBeyPbvRC5gb3ycZIUOAX+Q LC2rlmaveT5nyR3ofNs1sq7XPxkZgKtd8/T/RcCt+QskqHZxMShl6ZzA7IfZL7Fa/wz0U1xk11B d2lbqoR7I/4k1wRYJXXbhfnLhjToBsaRaKMkS7UB4h+Ee9a+5a62q6ADH/K42972A/r3gpWKxzB 3hBRop0StM1cK2iRAi6biC5zsfPYRjlTl1wjeXTznED581m+Ypx9LtCUhsXgUkKIBshNWgFUQ3O C37PRCu4HtTDo86hawimQInwOrlRmdCwG4m5HN/PxcrArOR1bU10qYtx8kH1BeZFT8EpxUyjKDM eHyVYjlfxIF5/A5v9rktUEv76XPcrPWAAzL1hClCiCnQ2sUlvi9dQ8D74YIMInsbpDRDm1JRLZ/ Vae9nACoglvtrN/vvOia4wdrsQbngHq2j1yFVxfSvJKQ28laWKRxgabnCzfyqPW+ZzF0IfxkE3W HdLQPNDbLMFG/2HAyYxqC5+RkAIsDA/BJ0lyajPjQXCOIlApw1sedDgjgqQBtwShP2bXYLK87ax Tljdvs3WLy3CnkyDI= X-Received: by 2002:a05:6808:4fd4:b0:4cb:f21b:6f8d with SMTP id 5614622812f47-5640dd9e77cmr2333862b6e.32.1793377264401; Fri, 30 Oct 2026 09:21:04 -0700 (PDT) Received: from brev-9gdpyq8lp.ap-south-1.compute.internal (ec2-3-110-210-194.ap-south-1.compute.amazonaws.com. [3.110.210.194]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-4a92167b03csm322536fac.2.2026.10.30.09.20.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Oct 2026 09:20:59 -0700 (PDT) From: Samarth Narang To: Miquel Raynal , Vignesh Raghavendra , Han Xu , Manivannan Sadhasivam , Maxime Coquelin , Alexandre Torgue Cc: Richard Weinberger , linux-mtd@lists.infradead.org, imx@lists.linux.dev, linux-arm-msm@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Samarth Narang Subject: [PATCH v2 2/6] mtd: nand: qpic_common: terminate DMA channels on transfer timeout Date: Fri, 30 Oct 2026 16:20:37 +0000 Message-Id: <20261030162041.2998170-3-samarth.colleges@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20261030162041.2998170-1-samarth.colleges@gmail.com> References: <20261030162041.2998170-1-samarth.colleges@gmail.com> X-Archived-By: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20261030_092106_171695_3DE833A3 X-CRM114-Status: GOOD ( 13.47 ) X-Spam-Score: -2.1 (--) X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux MTD discussion mailing list List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-mtd" X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 When DMA completion times out in qcom_submit_descs(), the driver unmaps the descriptors' scatterlists without stopping the BAM DMA channels. Since the issued descriptors may still be active, the RX and TX channels can continue accessing the caller's buffer after it has been unmapped and returned to the NAND core. The ADM path has a similar issue when dma_sync_wait() times out. Terminate the affected channels with dmaengine_terminate_sync() before unmapping, ensuring that outstanding DMA transfers are stopped before their mappings are released. On BAM, termination resets the pipe and discards pending descriptors. Fixes: 381dd24539a8 ("mtd: nand: qcom: add BAM DMA descriptor handling") Fixes: c76b78d8ec05 ("mtd: nand: Qualcomm NAND controller driver") Assisted-by: LLM Signed-off-by: Samarth Narang --- drivers/mtd/nand/qpic_common.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/nand/qpic_common.c b/drivers/mtd/nand/qpic_common.c index 4f3e4dd76..250154a08 100644 --- a/drivers/mtd/nand/qpic_common.c +++ b/drivers/mtd/nand/qpic_common.c @@ -592,11 +592,18 @@ int qcom_submit_descs(struct qcom_nand_controller *nandc) dma_async_issue_pending(nandc->cmd_chan); if (!wait_for_completion_timeout(&bam_txn->txn_done, - QPIC_NAND_COMPLETION_TIMEOUT)) + QPIC_NAND_COMPLETION_TIMEOUT)) { + /* Retire every issued pipe before unmapping its buffers. */ + dmaengine_terminate_sync(nandc->tx_chan); + dmaengine_terminate_sync(nandc->rx_chan); + dmaengine_terminate_sync(nandc->cmd_chan); ret = -ETIMEDOUT; + } } else { - if (dma_sync_wait(nandc->chan, cookie) != DMA_COMPLETE) + if (dma_sync_wait(nandc->chan, cookie) != DMA_COMPLETE) { + dmaengine_terminate_sync(nandc->chan); ret = -ETIMEDOUT; + } } err_unmap_free_desc: -- 2.34.1 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/ From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.160.49 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793377265; b=aSZpZu4gmoPDFovoqUM4pGczL1NDnOXziGq5uTN7kbEgOB7JFjkjktaunvfLgOjIj5Fg eUyjcvcCRTGR7nN85jKO2qAUtdh8mQ8jzaoCQ6T6MNg3p/I6LVc5hznSLoSkJ1Akt3jcN N4rmK5+LPHtKJUgOEU0DoUwP4mrkngFMz/Ow+GSRxs+zC5NyRXP1jkZeh4so6W5lIV0F7 iU8+qsEAn4Z7AEfJVmb26dpP3m0/TQxw9K9GcTh97RikonwtTe7FTS3QIE/nXMC/V86xA eclMQv75Ym5DOQWNQ2N63QV33VeZnJG/3bZfb1G9XW7s/t4h+rPgJT5MnGPkEsx15cQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793377265; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding; bh=3LJfsKdpKDX4HmeIK5NT3BudGEfehV1hBOYrKs1Or3g=; b=dd9eL4KXp9rv0Pntw+FocJYDSQTbel9FSy6h9zISIrk4wTIJCA7hr0QhO0IMMB/KxGh0 AgJpvvPLADQAQBBNP2iiIzEdPzrKPbh2FBNBeaBVursZVelvTUwDuOqmerOuymKxwV96c P2pYGC0ukZ+Z0j429kw2ZEWN61+a4B2PoITYl4wQfWGgCzvT51kcRX7hO1AoOqtUUa/Kc ej1uYJMafn77PTZHwZfmFfdd+q2pEaG3wTnfXR/rxof071wT2l1J1Wp3+RlFTcKPxbvdC TPp5AV3kHrmwt1f6Ze5Z3AJmpQ7Do+fR6RxwCZoh+IS8VMsdfIUKNuBKWjo1ceGeE4w== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=YDd+Ct5C; arc=none smtp.remote-ip=209.85.160.49 Received: from mail-oa1-f49.google.com (mail-oa1-f49.google.com [209.85.160.49]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 93B5C606A31C for ; Fri, 30 Oct 2026 16:21:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 93B5C606A31C Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=YDd+Ct5C Received: by mail-oa1-f49.google.com with SMTP id 586e51a60fabf-48ed0b68895so627903fac.1 for ; Fri, 30 Oct 2026 09:21:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1793377264; x=1793982064; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=3LJfsKdpKDX4HmeIK5NT3BudGEfehV1hBOYrKs1Or3g=; b=YDd+Ct5CEW0DUVzy15QsiYMjh18SzUL6bdSDoUV2lAXZ7Sc4w+szrEn8tKFL543s6L MsNz5N1Z953jrGGGo4IKLmznHdPxrQR8zEipJMECRDi0+iw2Nwydfaz3zVjHBoXFtN/c kI2vID8TRMOM/6tCv//MlWyoOh4PqMDbu/fMtS0YN0uHDpCniDC2pto0limS/OHOXwk0 oOuKy6i0LnmhNVWnKz29mSkoTwGAwE2OOYcsMMjhYTXgRb39+qwNNh8LhicENjBQTfp+ DhcQTWMaP/bO2v17ZAktye6i5ZXdpNvvhdmPepO7w/xgA/N/eg54UTZtOpRMgcxecNLh BUNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793377264; x=1793982064; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=3LJfsKdpKDX4HmeIK5NT3BudGEfehV1hBOYrKs1Or3g=; b=tJOqyS/SYBIaULrkU0JOLi0rBGhmL0ozmGp/tgzlMPNMAAM772rl0t3LKZF37POVCg QAhKjQBalnjNDlNFwZWKizNDt27v7v7rsUI0SBo+9t0JgLigjcgVEjIDlzGie7wbyLzb fNEj/ZYMU8vDTdMPLnJbujO7jc7gFVkVKIrLQucU8WYqA0SI424iiNvLZ4PBymGQ/sYv 3LoMbj8XClAKEsOyPlSlZPAcw4x+PI+M0F/ZoF3P5PZVqtvUnNfKo1Fy2m1Cu8bXJQ5f Zrq9hRpAT+Y2AhkvJUdWril8HWq0a18AweWh4m28VxuxgkGsAhGNZqWBFodtacZajOsH nfyw== X-Forwarded-Encrypted: i=1; AKwUvByzvLQ5pUZhiGg5h0ggKelnbjbB+w3C5yhjKAQq5yVa9QSiwuAFV90x2YyoBbc1/NvIzJo=@lists.linux.dev X-Gm-Message-State: AFq9FYIyBe/MbFta/HZgxvjni8oULRKvzrYz2I4KITmBSeO9lamJaO7h hjFoLOc1KOQSzS9KNzeutBBDvjW3ACFN0vTnqiqjJm+2uB7qdFwWUWfz X-Gm-Gg: AYBFou0viT4mRJxSp4z3GKdbYbhXyYQMkeFgWGg0bJD3j2uxMl620PfJEvCk7CWz7IE IrRdimrp5geCHntySnuQHfL1xqarBHqJWux9qBOR063kOkbPJqp+VOwRKeI7v0AI7vEeuiUkFvq LKPmaUw8r+9OyaRLiqnzTUMVozO8TXPL9kRbCpvWtStt4rqbrqQ83dFo/KyKhLoJTz+bHpigLED 0Dt6incCJ3n/R2kuBRuMqGt3R8OvqzPkP+iJ9sfpjYBzRI/bFy1W8RmAXiAYn8ns54jag31jiVt sXxC55EZMzq6LmpkH6i0gTTURLsEVt/fX9eVUUIG4k6wyfl0RD7xHZsGr8IP4pEDL9QG3c6CM0S nYEPNO9XB0STvoomtw4QNineVFMC+kiMhi4angEij+2LSj/aaM2jKkMkjIUzYE5AZx/nWDGgVEk wIxLFlLeEKbM0VnQDn76m2IGZDgedfL827m+pVOY/jvEiIuupHmBxF4f/zZQnI30zAqtVV3FqL0 cunYzrY5iq+1KncoV9s9s6qRuAX5I+Q2t7dgEwqkH/9TGf/s0bXfQl0M7IXYhr/BcGz35+ZqwA1 XjIQNqHuV3kcHFKytTEiwWEuFyeF/1fWAkCm1TmfRPeTF3fNFXsmkbxlnph+dMKOX5o7FaCST5G yM79nkyTrtcwZ/jujDyf7nsUtLCW7epKeR74PYoQD35gE4gwznxZXCbCN1QHtJo612frkBUs86r yrHLfuaHMW71d5cBw= X-Received: by 2002:a05:6808:4fd4:b0:4cb:f21b:6f8d with SMTP id 5614622812f47-5640dd9e77cmr2333862b6e.32.1793377264401; Fri, 30 Oct 2026 09:21:04 -0700 (PDT) Received: from brev-9gdpyq8lp.ap-south-1.compute.internal (ec2-3-110-210-194.ap-south-1.compute.amazonaws.com. [3.110.210.194]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-4a92167b03csm322536fac.2.2026.10.30.09.20.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Oct 2026 09:20:59 -0700 (PDT) From: Samarth Narang To: Miquel Raynal , Vignesh Raghavendra , Han Xu , Manivannan Sadhasivam , Maxime Coquelin , Alexandre Torgue Cc: Richard Weinberger , linux-mtd@lists.infradead.org, imx@lists.linux.dev, linux-arm-msm@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Samarth Narang Subject: [PATCH v2 2/6] mtd: nand: qpic_common: terminate DMA channels on transfer timeout Date: Fri, 30 Oct 2026 16:20:37 +0000 Message-Id: <20261030162041.2998170-3-samarth.colleges@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20261030162041.2998170-1-samarth.colleges@gmail.com> References: <20261030162041.2998170-1-samarth.colleges@gmail.com> X-Mailing-List: imx@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit When DMA completion times out in qcom_submit_descs(), the driver unmaps the descriptors' scatterlists without stopping the BAM DMA channels. Since the issued descriptors may still be active, the RX and TX channels can continue accessing the caller's buffer after it has been unmapped and returned to the NAND core. The ADM path has a similar issue when dma_sync_wait() times out. Terminate the affected channels with dmaengine_terminate_sync() before unmapping, ensuring that outstanding DMA transfers are stopped before their mappings are released. On BAM, termination resets the pipe and discards pending descriptors. Fixes: 381dd24539a8 ("mtd: nand: qcom: add BAM DMA descriptor handling") Fixes: c76b78d8ec05 ("mtd: nand: Qualcomm NAND controller driver") Assisted-by: LLM Signed-off-by: Samarth Narang --- drivers/mtd/nand/qpic_common.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/nand/qpic_common.c b/drivers/mtd/nand/qpic_common.c index 4f3e4dd76..250154a08 100644 --- a/drivers/mtd/nand/qpic_common.c +++ b/drivers/mtd/nand/qpic_common.c @@ -592,11 +592,18 @@ int qcom_submit_descs(struct qcom_nand_controller *nandc) dma_async_issue_pending(nandc->cmd_chan); if (!wait_for_completion_timeout(&bam_txn->txn_done, - QPIC_NAND_COMPLETION_TIMEOUT)) + QPIC_NAND_COMPLETION_TIMEOUT)) { + /* Retire every issued pipe before unmapping its buffers. */ + dmaengine_terminate_sync(nandc->tx_chan); + dmaengine_terminate_sync(nandc->rx_chan); + dmaengine_terminate_sync(nandc->cmd_chan); ret = -ETIMEDOUT; + } } else { - if (dma_sync_wait(nandc->chan, cookie) != DMA_COMPLETE) + if (dma_sync_wait(nandc->chan, cookie) != DMA_COMPLETE) { + dmaengine_terminate_sync(nandc->chan); ret = -ETIMEDOUT; + } } err_unmap_free_desc: -- 2.34.1