From patchwork Wed Jun 7 11:52:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 103254 Delivered-To: patch@linaro.org Received: by 10.182.29.35 with SMTP id g3csp1716601obh; Wed, 7 Jun 2017 05:00:19 -0700 (PDT) X-Received: by 10.98.85.130 with SMTP id j124mr25887974pfb.196.1496836818979; Wed, 07 Jun 2017 05:00:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496836818; cv=none; d=google.com; s=arc-20160816; b=WgY7C+Y6iEy+Oo+w3JCJEbbOQcqLiRCRCEkXcLmpHicgVLJKuI31fjgKh8DPZ7yfTW bnsgaMS0N1T3plz1XM6klz9QRkeVqJ9KIXaYQzESw6+DZcjLxyS2jRzzYzyFcadMkw7j ebHbczZ+Smu6BmXjqIzYXlgkqprRONEbmlROlBxqBFzml+YwusRTliJnjZCvx2r43jyX FcqJAzmFFjG938wQfp6c17FmMCQwxMIbuLZAjKTjNZRLSaJ9bOzqbRMeT9zt5iEUYL9S gA8C9+AV8lPGHMrpLPHq/8zZY06mues53rp1Bc8N9TSaRFEkQ3ormAW6nFjIgzxpRoRD E3pw== 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=EDOumMIY/Jq+Ck0TYXEGYmMT8ZvU2P2N2MaQXRl+GVg=; b=mHJfu1e4Tepl3SKOPJEl0CLgtpjSnjbqUU55gc/qpiDRRX+MkQi5quNp7BpGJ6Dtqy hcAtsRjKGosy1P1KjEX0y7vjuFXSCTykMRghi7tUiaXUlriOBuX+n4vp/LbljTD11eFj x4NEr0wwISOldfloChV6PPgrgsMpHXvdbAD0/gKxNNP6wfbXCDctPAEt3/iFXbXsknM8 JcW5FMasxIfBrSsLOrfyOeT+fC3Zp96jjItb2GXbDqC7MgScz868wMYpe9z3AX8uRPDS RX+QtutTbrJGrGUO4Js3+e/Djx5+ZF+tTBPXsKQv2aFC5kMbuh6UljSZtHKppz27s5/o jwlw== 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 w63si1614604pfj.165.2017.06.07.05.00.18; Wed, 07 Jun 2017 05:00:18 -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 S1751801AbdFGMAB (ORCPT + 25 others); Wed, 7 Jun 2017 08:00:01 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:42433 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751520AbdFGLzV (ORCPT ); Wed, 7 Jun 2017 07:55:21 -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 v57BqjZW014276; Wed, 7 Jun 2017 20:52:54 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com v57BqjZW014276 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1496836375; bh=EDOumMIY/Jq+Ck0TYXEGYmMT8ZvU2P2N2MaQXRl+GVg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=orLv55xvKivyY+JPOhbu2Np50DVQh+GnANb5vdiJtKVa86ddaItNj7xq8d/40h2sl JanSEMOJPS2wbD59RuaLid7I8R2K24czmrPEpDI3yHfjk7cY2RNy3aLKwKp6r57V+O R+DR3qjlFBKQUKH+/XkP11SlcTCujOqSYYDCAtWnlZ+T353X3MOPIp6Q8Wwse4ZziM 9HkzwatLCebssRQxgYmmaxbCE8iflB42lTzdB6YeE8KzaFeJSo/ueGOBFVaOpIxU+8 iXzG+8ifMPqxGjhYxqdSxOSgl6P5/8sT4v79eIrFkIv+loj9RDUiq8pN9VGJvlt/3V /zoNIP09qVWjA== 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 07/23] mtd: nand: denali: do not propagate NAND_STATUS_FAIL to waitfunc() Date: Wed, 7 Jun 2017 20:52:16 +0900 Message-Id: <1496836352-8016-8-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 Currently, the error handling of denali_write_page(_raw) is a bit complicated. If the program command fails, NAND_STATUS_FAIL is set to the driver internal denali->status, then read out later by denali_waitfunc(). We can avoid it by exploiting the nand_write_page() implementation. If chip->ecc.write_page(_raw) returns negative code (i.e. -EIO), it errors out immediately. This gives the same result as returning NAND_STATUS_FAIL from chip->waitfunc. In either way, -EIO is returned to the upper MTD layer. Signed-off-by: Masahiro Yamada --- Changes in v5: None Changes in v4: None Changes in v3: None Changes in v2: - Newly added drivers/mtd/nand/denali.c | 12 ++++-------- drivers/mtd/nand/denali.h | 1 - 2 files changed, 4 insertions(+), 9 deletions(-) -- 2.7.4 diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c index 1897fe238290..22acfc34b546 100644 --- a/drivers/mtd/nand/denali.c +++ b/drivers/mtd/nand/denali.c @@ -1005,6 +1005,7 @@ static int write_page(struct mtd_info *mtd, struct nand_chip *chip, size_t size = mtd->writesize + mtd->oobsize; uint32_t irq_status; uint32_t irq_mask = INTR__DMA_CMD_COMP | INTR__PROGRAM_FAIL; + int ret = 0; denali->page = page; @@ -1038,13 +1039,13 @@ static int write_page(struct mtd_info *mtd, struct nand_chip *chip, if (irq_status == 0) { dev_err(denali->dev, "timeout on write_page (type = %d)\n", raw_xfer); - denali->status = NAND_STATUS_FAIL; + ret = -EIO; } denali_enable_dma(denali, false); dma_sync_single_for_cpu(denali->dev, addr, size, DMA_TO_DEVICE); - return 0; + return ret; } /* NAND core entry points */ @@ -1196,12 +1197,7 @@ static void denali_select_chip(struct mtd_info *mtd, int chip) static int denali_waitfunc(struct mtd_info *mtd, struct nand_chip *chip) { - struct denali_nand_info *denali = mtd_to_denali(mtd); - int status = denali->status; - - denali->status = 0; - - return status; + return 0; } static int denali_erase(struct mtd_info *mtd, int page) diff --git a/drivers/mtd/nand/denali.h b/drivers/mtd/nand/denali.h index a06ed741b550..352d8328b94a 100644 --- a/drivers/mtd/nand/denali.h +++ b/drivers/mtd/nand/denali.h @@ -323,7 +323,6 @@ struct nand_buf { struct denali_nand_info { struct nand_chip nand; int flash_bank; /* currently selected chip */ - int status; int platform; struct nand_buf buf; struct device *dev;