From patchwork Wed Jun 7 11:52:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 103239 Delivered-To: patch@linaro.org Received: by 10.182.29.35 with SMTP id g3csp1714948obh; Wed, 7 Jun 2017 04:56:06 -0700 (PDT) X-Received: by 10.84.215.148 with SMTP id l20mr3313244pli.79.1496836566022; Wed, 07 Jun 2017 04:56:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496836566; cv=none; d=google.com; s=arc-20160816; b=fAkwkmIE18K72tLRNXp5ihIm6KaT5Iwp2RzCjzSpES9P1rrYXeSX4dpWZZpMXlN2jH SrR9ZwqBSGX2XRgNQ7EW5gpFwS2VgtlDTlGtSt6j4lZV0q48Xdyuc2eCNFy6Nbb5YrkK OJgNSShLcPY9AQ1IGnRhXYJD4uvNv7qP97U0UuZe0MbHKgIKkkMiwED4wvXTaC5dIdWY 15pSQoHaBo091VC3j4lx6KnsBmzBSTF4h3h+B5avFUxsKX0VBxaiXehkn4MYTzqMN1ud HYlyDbQ4hvMaI3T1SdyF65xjntIs6eJg6vhbR0QCxR19fLC90pvKwU2cq19Ovly6eU71 6pog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=1DzbAkNew2LV6VLBZ02RZlu73kX1MqAtvBmplDn4Vic=; b=VZ0Q/hO3qpc5rxb0k6FT1uwXoAnK86xZvbXkfBXCG1GqeQy15S/E0aYiHzcaSXAn7H /RORaD+FydDCAXYWu9UpVxzoUJXg2v3rmwuYN4SXvDc2rVqmf0TYK/BsZydX8BgkiSHZ 1NKBRL4ccpLQVyzjJUYnOFb2dhsruaeCdk06LbZuem41pFK7peRr5EgO63eSWrLcLeEW EzVDMe3I9GOw0PZ1D0dq76+FAQIXLK1Xqiwf/3Dm0aJ2/G+oLTWlr5rV6x2PRApP3K6L WKWv1alhgT0CDx5HtlIbyCakvxFOwt7afyIX7RSnp9wQvZpQbzEb2ZV7UKIiZaGu6y+u AvjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m24si1622370pfa.242.2017.06.07.04.56.05; Wed, 07 Jun 2017 04:56:06 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751788AbdFGLzt (ORCPT + 25 others); Wed, 7 Jun 2017 07:55:49 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:42713 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751758AbdFGLzr (ORCPT ); Wed, 7 Jun 2017 07:55:47 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id v57BqjZk014276; Wed, 7 Jun 2017 20:53:10 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com v57BqjZk014276 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1496836391; bh=1DzbAkNew2LV6VLBZ02RZlu73kX1MqAtvBmplDn4Vic=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1nWV9KVu0v5+bOuNwjzf4QxotFPNT/FvmwcixDx4ZuKhPdysICheV85UOrUhLiH2r cOPwc8T8k1CTRUVyOPZoh9nnKgMO+ECEy2ZPWmNN6RRTuRWsed0unORxZ9p2Dag165 ELGMixB3ENtERSRGxQgpCyU3jtdAqxROxLvxXWI0AiSFAFQjfrp93LKE/wEFtHfb67 aN4T0t2ALMch0OcOc6QV/Xw3Zc0wXg8k4TA3BIEu7D8xYb0leTA2lcSv3nc+aOrIyT jpjxssc6CDsi9S/dCkWJQCeQ3uRmj/5szfxLVhBS+ofr4pRptkKvAyQhwer0dl7MAO Jz7AQWvQncXZA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-mtd@lists.infradead.org Cc: Enrico Jorns , Artem Bityutskiy , Dinh Nguyen , Boris Brezillon , Marek Vasut , David Woodhouse , Masami Hiramatsu , Chuanxiao Dong , Jassi Brar , Masahiro Yamada , Cyrille Pitchen , linux-kernel@vger.kernel.org, Brian Norris , Richard Weinberger Subject: [PATCH v5 21/23] mtd: nand: denali: skip driver internal bounce buffer when possible Date: Wed, 7 Jun 2017 20:52:30 +0900 Message-Id: <1496836352-8016-22-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1496836352-8016-1-git-send-email-yamada.masahiro@socionext.com> References: <1496836352-8016-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org For ecc->read_page() and ecc->write_page(), it is possible to call dma_map_single() against the given buffer. This bypasses the driver internal bounce buffer and save the memcpy(). Signed-off-by: Masahiro Yamada --- Changes in v5: None Changes in v4: - Remove dma_unmap_single() from denali_remove() Changes in v3: - Set chip->buf_align to 16 Changes in v2: - Newly added drivers/mtd/nand/denali.c | 38 ++++++++++++-------------------------- 1 file changed, 12 insertions(+), 26 deletions(-) -- 2.7.4 diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c index 90c702b9f14c..963638693850 100644 --- a/drivers/mtd/nand/denali.c +++ b/drivers/mtd/nand/denali.c @@ -643,12 +643,16 @@ static int denali_pio_xfer(struct denali_nand_info *denali, void *buf, static int denali_dma_xfer(struct denali_nand_info *denali, void *buf, size_t size, int page, int raw, int write) { - dma_addr_t dma_addr = denali->dma_addr; + dma_addr_t dma_addr; uint32_t irq_mask, irq_status, ecc_err_mask; enum dma_data_direction dir = write ? DMA_TO_DEVICE : DMA_FROM_DEVICE; int ret = 0; - dma_sync_single_for_device(denali->dev, dma_addr, size, dir); + dma_addr = dma_map_single(denali->dev, buf, size, dir); + if (dma_mapping_error(denali->dev, dma_addr)) { + dev_dbg(denali->dev, "Failed to DMA-map buffer. Trying PIO.\n"); + return denali_pio_xfer(denali, buf, size, page, raw, write); + } if (write) { irq_mask = INTR__DMA_CMD_COMP | INTR__PROGRAM_FAIL; @@ -674,7 +678,7 @@ static int denali_dma_xfer(struct denali_nand_info *denali, void *buf, ret = -EBADMSG; denali_enable_dma(denali, false); - dma_sync_single_for_cpu(denali->dev, dma_addr, size, dir); + dma_unmap_single(denali->dev, dma_addr, size, dir); return ret; } @@ -857,12 +861,10 @@ static int denali_read_page(struct mtd_info *mtd, struct nand_chip *chip, int stat = 0; int ret; - ret = denali_data_xfer(denali, denali->buf, mtd->writesize, page, 0, 0); + ret = denali_data_xfer(denali, buf, mtd->writesize, page, 0, 0); if (ret && ret != -EBADMSG) return ret; - memcpy(buf, denali->buf, mtd->writesize); - if (denali->caps & DENALI_CAP_HW_ECC_FIXUP) stat = denali_hw_ecc_fixup(mtd, denali, &uncor_ecc_flags); else if (ret == -EBADMSG) @@ -966,10 +968,8 @@ static int denali_write_page(struct mtd_info *mtd, struct nand_chip *chip, { struct denali_nand_info *denali = mtd_to_denali(mtd); - memcpy(denali->buf, buf, mtd->writesize); - - return denali_data_xfer(denali, denali->buf, mtd->writesize, page, - 0, 1); + return denali_data_xfer(denali, (void *)buf, mtd->writesize, + page, 0, 1); } static void denali_select_chip(struct mtd_info *mtd, int chip) @@ -1408,14 +1408,8 @@ int denali_init(struct denali_nand_info *denali) } if (denali->dma_avail) { - denali->dma_addr = dma_map_single(denali->dev, denali->buf, - mtd->writesize + mtd->oobsize, - DMA_BIDIRECTIONAL); - if (dma_mapping_error(denali->dev, denali->dma_addr)) { - dev_info(denali->dev, - "Failed to map DMA buffer. Disabling DMA.\n"); - denali->dma_avail = 0; - }; + chip->options |= NAND_USE_BOUNCE_BUFFER; + chip->buf_align = 16; } /* @@ -1505,16 +1499,8 @@ EXPORT_SYMBOL(denali_init); void denali_remove(struct denali_nand_info *denali) { struct mtd_info *mtd = nand_to_mtd(&denali->nand); - /* - * Pre-compute DMA buffer size to avoid any problems in case - * nand_release() ever changes in a way that mtd->writesize and - * mtd->oobsize are not reliable after this call. - */ - int bufsize = mtd->writesize + mtd->oobsize; nand_release(mtd); denali_disable_irq(denali); - dma_unmap_single(denali->dev, denali->dma_addr, bufsize, - DMA_BIDIRECTIONAL); } EXPORT_SYMBOL(denali_remove);