From patchwork Fri Aug 19 06:07:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jinpu Wang X-Patchwork-Id: 12948376 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 58032C25B0E for ; Fri, 19 Aug 2022 06:09:36 +0000 (UTC) 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-Owner; bh=rSvUvAOkQ3/8oW81JH9xCJBn2nscv0XxHg53X5dJlIU=; b=tKqTJ6nkLYw8jw Iz2vbeq6Hxi5auJpEaX5D7ijsIGVXnjDFclBEVfiRdk+kjsRBjP5+o64PL8g+dqetvjsqrF53oHQa BXgkft+wfB932/CNix8wiS+xGtJ+ydbonqULqPRMbdOxXl7OHlx47HkZdiUabd+HutD73jD7SBmOR O0ECwYG7xzp+MvnfpYV/uiIi/A9iiMFPAJglKQpB0ePSw/8qJyuKu6L7pP6CJN9lpIVIwXImKW0hH LqDg9x5x4KmeokutovggHsFJkkAGdXV5NHeC1eFxAtF5zFUVX/6rSOvTCwzy+weLZ1ndWJH+KdxDv UxrhuZuN87CmkMTBqpUA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oOvBG-0029pD-HX; Fri, 19 Aug 2022 06:08:30 +0000 Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oOvB0-0029S7-66 for linux-arm-kernel@lists.infradead.org; Fri, 19 Aug 2022 06:08:15 +0000 Received: by mail-ej1-x635.google.com with SMTP id gi31so488081ejc.5 for ; Thu, 18 Aug 2022 23:08:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=zxM42Y9uEm9HYeKUiC4xFIG7yPyezX+CS6v5K5nZU8U=; b=DP1gLMIPVWB7ZYRop6oPt9NMumqgtsCGEOsM4vtsybhCRs5Dzp0CsQyLxargAIZINe ODmtV6u0iTI76C8ByXG7V1u+ccKF2e4qad3XsUzDIL6hye4OHE21JrXHHI932pE31adz R5XPcDmOIlBlW11EAcwZZ7lNflcuox+CFV9XjBDIN+0uCxGBFeyNFx2ldpUzzJncXSE0 1qtTuvw6sM8xrgjoFNXPjTWjVc/9E1DWxISdgmYV5jaFfPcDxncJ6b7lwd3QEA0UaswE kDGyILqBu+97OQjN5PmYrcF4nGuApHE1R3j50OpsFP7F3eX1tJg1XxbfZIv3QdZxdek/ 84fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=zxM42Y9uEm9HYeKUiC4xFIG7yPyezX+CS6v5K5nZU8U=; b=CApfblo/axc2YXa6Cn2TyxJCjGkgV77teMNWX6a4pHVuu6pUWijdZcb1cOLF90G9S8 sA7B0RKyQOhw6rof6B7GU6ZPJNFlyk4eaHvUvfbUX+KPc4wc4AVvWsGOWULA4+BEkui9 JfNB6WXxNqVRuulWC78/+GMb9BEfHuHW0W/vFT4suCL7ccudo7Na1SLFGl1GHcUestUe KBjDMz4W9JOzytetixcf5GXc7o7mWgmEnshuCUdpJFPBtoVOUUt03sx+huPBbduzWLRx bBACO2UMsD4Uotuda+8BBUl5RGTYC4FFqBjWebqZGaADYT3Idmb/qLdA7nCy4K8YpvZr MCtA== X-Gm-Message-State: ACgBeo2P2LKaVvj8UngDAQzwing9kG1LSkITanIa7dshlzOLUf1mQfHY IL6WyB+hP4CuGHO3fXJRF3dD0sd859tUWw== X-Google-Smtp-Source: AA6agR7AxvNaR5kMACgc+5EvILcU4znfyr/yCo9fq+C5k8P8mQOI0CDjA9l2YlHqPOv1CkuTKAdmLQ== X-Received: by 2002:a17:906:5d07:b0:738:b86d:df3d with SMTP id g7-20020a1709065d0700b00738b86ddf3dmr3767679ejt.617.1660889289504; Thu, 18 Aug 2022 23:08:09 -0700 (PDT) Received: from lb02065.fritz.box ([2001:9e8:143b:fd00:5207:8c7f:747a:b80d]) by smtp.gmail.com with ESMTPSA id y14-20020a1709063a8e00b0073a644ef803sm1809660ejd.101.2022.08.18.23.08.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 23:08:08 -0700 (PDT) From: Jack Wang To: linux-kernel@vger.kernel.org Cc: Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Maxime Coquelin , Alexandre Torgue , Philipp Zabel , Christophe Kerello , Cai Huoqing , 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 Message-Id: <20220819060801.10443-6-jinpu.wang@ionos.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220819060801.10443-1-jinpu.wang@ionos.com> References: <20220819060801.10443-1-jinpu.wang@ionos.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220818_230814_270120_B1602C40 X-CRM114-Status: GOOD ( 13.45 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 Cc: Richard Weinberger Cc: Vignesh Raghavendra Cc: Maxime Coquelin Cc: Alexandre Torgue Cc: Philipp Zabel Cc: Christophe Kerello Cc: Cai Huoqing 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 --- 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; }