mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Jack Wang <jinpu.wang@ionos.com>
To: linux-kernel@vger.kernel.org
Cc: Miquel Raynal <miquel.raynal@bootlin.com>,
	Richard Weinberger <richard@nod.at>,
	Vignesh Raghavendra <vigneshr@ti.com>,
	Maxime Coquelin <mcoquelin.stm32@gmail.com>,
	Alexandre Torgue <alexandre.torgue@foss.st.com>,
	Philipp Zabel <p.zabel@pengutronix.de>,
	Christophe Kerello <christophe.kerello@foss.st.com>,
	Cai Huoqing <cai.huoqing@linux.dev>,
	linux-mtd@lists.infradead.org,
	linux-stm32@st-md-mailman.stormreply.com,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH v1 05/19] mtd: rawnand: marvell: Fix error handle regarding dma_map_sg
Date: Fri, 19 Aug 2022 08:07:47 +0200	[thread overview]
Message-ID: <20220819060801.10443-6-jinpu.wang@ionos.com> (raw)
In-Reply-To: <20220819060801.10443-1-jinpu.wang@ionos.com>

dma_map_sg return 0 on error, in case of error return -EIO,
also add the dma_unmap_sg as rollback on the following error.

Cc: Miquel Raynal <miquel.raynal@bootlin.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Vignesh Raghavendra <vigneshr@ti.com>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Alexandre Torgue <alexandre.torgue@foss.st.com>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: Christophe Kerello <christophe.kerello@foss.st.com>
Cc: Cai Huoqing <cai.huoqing@linux.dev>
Cc: linux-mtd@lists.infradead.org
Cc: linux-stm32@st-md-mailman.stormreply.com
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org

Signed-off-by: Jack Wang <jinpu.wang@ionos.com>
---
 drivers/mtd/nand/raw/marvell_nand.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/raw/marvell_nand.c b/drivers/mtd/nand/raw/marvell_nand.c
index 2455a581fd70..d9f2f1d0b5ef 100644
--- a/drivers/mtd/nand/raw/marvell_nand.c
+++ b/drivers/mtd/nand/raw/marvell_nand.c
@@ -865,13 +865,19 @@ static int marvell_nfc_xfer_data_dma(struct marvell_nfc *nfc,
 	marvell_nfc_enable_dma(nfc);
 	/* Prepare the DMA transfer */
 	sg_init_one(&sg, nfc->dma_buf, dma_len);
-	dma_map_sg(nfc->dma_chan->device->dev, &sg, 1, direction);
+	ret = dma_map_sg(nfc->dma_chan->device->dev, &sg, 1, direction);
+	if (!ret) {
+		dev_err(nfc->dev, "Could not map DMA S/G list\n");
+		return -ENXIO;
+	}
+
 	tx = dmaengine_prep_slave_sg(nfc->dma_chan, &sg, 1,
 				     direction == DMA_FROM_DEVICE ?
 				     DMA_DEV_TO_MEM : DMA_MEM_TO_DEV,
 				     DMA_PREP_INTERRUPT);
 	if (!tx) {
 		dev_err(nfc->dev, "Could not prepare DMA S/G list\n");
+		dma_unmap_sg(nfc->dma_chan->device->dev, &sg, 1, direction);
 		return -ENXIO;
 	}
 
-- 
2.34.1


  parent reply	other threads:[~2022-08-19  6:08 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-19  6:07 [PATCH v1 00/19] Fix dma_map_sg error check Jack Wang
2022-08-19  6:07 ` [PATCH v1 01/19] mailbox: bcm-ferxrm-mailbox: Fix error check for dma_map_sg Jack Wang
2022-08-22  5:07   ` Dan Carpenter
2022-08-22  9:58     ` Jinpu Wang
2022-08-19  6:07 ` [PATCH v1 02/19] infiniband/mthca: Fix dma_map_sg error check Jack Wang
2022-08-19 22:19   ` Kees Cook
2022-08-21 11:46   ` Leon Romanovsky
2022-08-22  5:11   ` Dan Carpenter
2022-08-19  6:07 ` [PATCH v1 03/19] HSI: omap_ssi_port: " Jack Wang
2022-08-19  6:07 ` [PATCH v1 04/19] mtd: rawnand: stm32_fmc2: " Jack Wang
2022-08-23  7:49   ` Christophe Kerello
2022-09-20  8:34   ` Miquel Raynal
2022-08-19  6:07 ` Jack Wang [this message]
2022-09-20  8:34   ` [PATCH v1 05/19] mtd: rawnand: marvell: Fix error handle regarding dma_map_sg Miquel Raynal
2022-08-19  6:07 ` [PATCH v1 06/19] usb/hcd: Fix dma_map_sg error check Jack Wang
2022-08-19  6:07 ` [PATCH v1 07/19] crypto: gemin: Fix error check for dma_map_sg Jack Wang
2022-08-26  8:13   ` Linus Walleij
2022-08-26 11:06   ` Herbert Xu
2022-08-26 12:04   ` LABBE Corentin
2022-08-26 12:08     ` Jinpu Wang
2022-08-19  6:07 ` [PATCH v1 08/19] crypto: sahara: " Jack Wang
2022-08-19  6:07 ` [PATCH v1 09/19] crypto: qce: Fix dma_map_sg error check Jack Wang
2022-08-19  6:07 ` [PATCH v1 10/19] crypto: amlogic: " Jack Wang
2022-08-26 12:46   ` LABBE Corentin
2022-08-19  6:07 ` [PATCH v1 11/19] crypto: allwinner: " Jack Wang
2022-08-19  6:07 ` [PATCH v1 12/19] crypto: ccree: " Jack Wang
2022-08-21  9:44   ` Gilad Ben-Yossef
2022-08-19  6:07 ` [PATCH v1 13/19] intel_th: " Jack Wang
2022-08-19  6:07 ` [PATCH v1 14/19] nvme-rdma: Fix error check for ib_dma_map_sg Jack Wang
2022-08-21  5:57   ` Christoph Hellwig
2022-08-22  5:12     ` Jinpu Wang
2022-08-22  6:25       ` Christoph Hellwig
2022-08-22  7:10         ` Jinpu Wang
2022-08-19  6:07 ` [PATCH v1 15/19] nvme-fc: Fix the error check for dma_map_sg Jack Wang
2022-08-19  6:07 ` [PATCH v1 16/19] scsi/qlogicpti: Fix dma_map_sg check Jack Wang
2022-08-19  6:07 ` [PATCH v1 17/19] mmc: meson-mx-sdhc: Fix error check for dma_map_sg Jack Wang
2022-08-20 17:25   ` Martin Blumenstingl
2022-08-22  5:15     ` Jinpu Wang
2022-08-19  6:08 ` [PATCH v1 18/19] mmc: jz4740_mmc: " Jack Wang
2022-08-19  6:08 ` [PATCH v1 19/19] net/mlx4: " Jack Wang
2022-08-21 11:42   ` Leon Romanovsky
2022-08-22 18:20   ` Jakub Kicinski
2022-08-24 14:39     ` Jinpu Wang

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=20220819060801.10443-6-jinpu.wang@ionos.com \
    --to=jinpu.wang@ionos.com \
    --cc=alexandre.torgue@foss.st.com \
    --cc=cai.huoqing@linux.dev \
    --cc=christophe.kerello@foss.st.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mtd@lists.infradead.org \
    --cc=linux-stm32@st-md-mailman.stormreply.com \
    --cc=mcoquelin.stm32@gmail.com \
    --cc=miquel.raynal@bootlin.com \
    --cc=p.zabel@pengutronix.de \
    --cc=richard@nod.at \
    --cc=vigneshr@ti.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

all inboxes | Powered by JetHome®