From nobody Fri Feb 13 13:25:45 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 33E964D9F4; Tue, 28 May 2024 06:09:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716876565; cv=none; b=PSautrxn8KRjZk3cN2+D1BfrSD/1YxCw7WseHR4fFMlbUjud4QYK3C8jpVmS6IUnT6J3dpk888a0yDLFmG+Pr+yehLMdN4QQoykw1fWpxpeXaiW+94dYaVMEu4sbCLAFHZtHGrBdgxb+sA/TX7G31646feWR8Mq23BnRYkjtRqQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716876565; c=relaxed/simple; bh=ZSYu74n0jq7FH0Svutdp6klx3j4BlvlPnAQfADz0IqU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Wpgil4JylgbZ/zPZrxZz3kOlN5lLCv4W0/nxifnj8sCErNn42bc+xxl1PFytFPyU1YnBWSNB7/oVHph5mWtvTaigM4ZbqrQo/NCQ0CkdKoCRzp6yKxvjaPTmsWT2MzFFFZ7hEkIVLiVc+B4XRlLm39og3+D4HsqVl4dNEDO8ERA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=I/KYSXpG; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="I/KYSXpG" Received: by smtp.kernel.org (Postfix) with ESMTPS id D4EABC32782; Tue, 28 May 2024 06:09:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716876564; bh=ZSYu74n0jq7FH0Svutdp6klx3j4BlvlPnAQfADz0IqU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=I/KYSXpGK5Y+7Ze7M2UUTZJ196NMmqesbqijHwrYyRNEFIMwNxXgN5DiToUMZ+cD2 vYkO3Y5kYzTFRcFya3iMV0Hcwg1GgG2aJu7u3P0rIeXoafmoi4ghCB85eU4tik8l2x OK3SinNpNInFFXDbztZYm3feTSE2bDWGIu3BUxfzh4Rzeb/snjUoZF6jS5bXSw3fNF em+GBDxaFXKTmEN+m1re2Kd08NxhmKK9nqBbNv/UgkywPH4apb93yUF1DNYlOD1Gs5 a5x0p8bB9GLeGuYh+Paj4hwv6kEDYxNUEpZ/htEhCuZ2GSB1sx9ISGxefgIrDx3EeH T9QesbKvh6mvQ== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id BECA7C27C44; Tue, 28 May 2024 06:09:24 +0000 (UTC) From: Nikita Shubin via B4 Relay Date: Tue, 28 May 2024 09:09:24 +0300 Subject: [PATCH v2 2/3] dmaengine: ioatdma: Fix error path in ioat3_dma_probe() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240528-ioatdma-fixes-v2-2-a9f2fbe26ab1@yadro.com> References: <20240528-ioatdma-fixes-v2-0-a9f2fbe26ab1@yadro.com> In-Reply-To: <20240528-ioatdma-fixes-v2-0-a9f2fbe26ab1@yadro.com> To: Vinod Koul , Dave Jiang , Logan Gunthorpe Cc: Andy Shevchenko , Nikita Shubin , dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, linux@yadro.com, Nikita Shubin X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1716876563; l=2344; i=n.shubin@yadro.com; s=20230718; h=from:subject:message-id; bh=ndoUzkFelZyO92hJgOMyePUbXfzsIUrSz43B8VvnQSw=; b=wPSkPuxu2pQ/S9Wnfb/LNOSGOhJ/T6XgcFUSUkg+ERcfklrp/fTuxSQ2uetgygBmRXOPVY0/dI5J LdjVOBlmBqYjmezsWEvpefml+CHqRjgOmAPfvUvxxcW0msPMgAed X-Developer-Key: i=n.shubin@yadro.com; a=ed25519; pk=vqf5YIUJ7BJv3EJFaNNxWZgGuMgDH6rwufTLflwU9ac= X-Endpoint-Received: by B4 Relay for n.shubin@yadro.com/20230718 with auth_id=161 X-Original-From: Nikita Shubin Reply-To: n.shubin@yadro.com From: Nikita Shubin Make sure we are disabling interrupts and destroying DMA pool if pcie_capability_read/write_word() call failed. Fixes: 511deae0261c ("dmaengine: ioatdma: disable relaxed ordering for ioat= dma") Signed-off-by: Nikita Shubin --- drivers/dma/ioat/init.c | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/drivers/dma/ioat/init.c b/drivers/dma/ioat/init.c index e76e507ae898..26964b7c8cf1 100644 --- a/drivers/dma/ioat/init.c +++ b/drivers/dma/ioat/init.c @@ -534,18 +534,6 @@ static int ioat_probe(struct ioatdma_device *ioat_dma) return err; } =20 -static int ioat_register(struct ioatdma_device *ioat_dma) -{ - int err =3D dma_async_device_register(&ioat_dma->dma_dev); - - if (err) { - ioat_disable_interrupts(ioat_dma); - dma_pool_destroy(ioat_dma->completion_pool); - } - - return err; -} - static void ioat_dma_remove(struct ioatdma_device *ioat_dma) { struct dma_device *dma =3D &ioat_dma->dma_dev; @@ -1181,9 +1169,9 @@ static int ioat3_dma_probe(struct ioatdma_device *ioa= t_dma, int dca) ioat_chan->reg_base + IOAT_DCACTRL_OFFSET); } =20 - err =3D ioat_register(ioat_dma); + err =3D dma_async_device_register(&ioat_dma->dma_dev); if (err) - return err; + goto err_disable_interrupts; =20 ioat_kobject_add(ioat_dma, &ioat_ktype); =20 @@ -1192,20 +1180,29 @@ static int ioat3_dma_probe(struct ioatdma_device *i= oat_dma, int dca) =20 /* disable relaxed ordering */ err =3D pcie_capability_read_word(pdev, PCI_EXP_DEVCTL, &val16); - if (err) - return pcibios_err_to_errno(err); + if (err) { + err =3D pcibios_err_to_errno(err); + goto err_disable_interrupts; + } =20 /* clear relaxed ordering enable */ val16 &=3D ~PCI_EXP_DEVCTL_RELAX_EN; err =3D pcie_capability_write_word(pdev, PCI_EXP_DEVCTL, val16); - if (err) - return pcibios_err_to_errno(err); + if (err) { + err =3D pcibios_err_to_errno(err); + goto err_disable_interrupts; + } =20 if (ioat_dma->cap & IOAT_CAP_DPS) writeb(ioat_pending_level + 1, ioat_dma->reg_base + IOAT_PREFETCH_LIMIT_OFFSET); =20 return 0; + +err_disable_interrupts: + ioat_disable_interrupts(ioat_dma); + dma_pool_destroy(ioat_dma->completion_pool); + return err; } =20 static void ioat_shutdown(struct pci_dev *pdev) --=20 2.43.2