From patchwork Mon Jun 5 23:21:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 103112 Delivered-To: patch@linaro.org Received: by 10.182.29.35 with SMTP id g3csp1009156obh; Mon, 5 Jun 2017 16:28:01 -0700 (PDT) X-Received: by 10.98.57.78 with SMTP id g75mr12659663pfa.9.1496705281459; Mon, 05 Jun 2017 16:28:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496705281; cv=none; d=google.com; s=arc-20160816; b=JS+byhfcGHGJUivF1tscB5s+PjipN0yUdF3CeLlM9MaXhj3UqTRi496r1/KMCVNCie Djpw1C0A/vxPFGitOXzmJsmBaiLe27iqqfVdBPOMQfB3L9aXVoWCdAUVQWzAbaJzebmG E5+DSgncEwiOgV+ZPNBJ/bsaAkN5HzZ38Rg+bDBLg8U6RDbAu8nHlkQIcST6FJ4zSPGu z6OlU5vmiGzdwddF+lZSMCog8FCkX0Ax72m5lWnMxQHEnjL+xWYQCStqbnstjFDNo5Km HKkieX2z+T8+oEzPkLb7ac85li+mMTEBIFcHZLh0HXZdX7h2+TMuRz3I6Sr6T11ilReQ fEcw== 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=lO3TPqzkN5H0BMAkw+GIFN611bf2lQu/4gkON1i0E5Y=; b=hIWMGjmFEDv2ggIk45iSksbrlomHK2KVrM0HVaQdd4vrQ7LYnRZlL3iEAEJk67wpsT V7Os0REGQ4drcKfYhxiHZy3KWIobWwR50r+apTW0Xqrj9Re++xso4FBhG9FGFAeRhulv 1bbuKHxu0ux8fLbChV81rquhvs3IxV2UTR87hX6i4KA6x09SHp4S0vxn9pespY+7rH0n ktF6M1wr/lkwl6qp0l7fR8QUWL9ulqYY5BwVwnGYqZDMKAIDCTabi+nOGOMFkS5qFUzh PrJ53ErsffaeWPyoev1iHs/Y/mUWkbHAvMwZvHKOmNo79k959x296ZVcxr/2fv+FGjpJ etVA== 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 b11si2641077pgr.410.2017.06.05.16.28.01; Mon, 05 Jun 2017 16:28:01 -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 S1751321AbdFEXZT (ORCPT + 25 others); Mon, 5 Jun 2017 19:25:19 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:32110 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751216AbdFEXZQ (ORCPT ); Mon, 5 Jun 2017 19:25:16 -0400 Received: from grover.sesame (FL1-118-110-19-204.osk.mesh.ad.jp [118.110.19.204]) (authenticated) by conuserg-10.nifty.com with ESMTP id v55NMD5i004412; Tue, 6 Jun 2017 08:22:36 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com v55NMD5i004412 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1496704957; bh=lO3TPqzkN5H0BMAkw+GIFN611bf2lQu/4gkON1i0E5Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dX+xStOPCWuUg2lK3MTJh3g2dB2TQYICvM972UgdUA0SVVmq9JIvx93NhRkIgCWi3 W4YKSrPhHRsufKpwhHfFVmlVIMBEeFGQmRQR6dxBqpQ4DqS6w6gz4gU+M9/+W9juCa TSw3Ebgh/UeUvwY1E2ukWYgQ40E7PuX4zCi7Q5yxZth+FfhKOGOL0QUNXsVpIOw2KS OxMmx7P89md0hVyu2XzxUSERBJvLmWfkfPgxI+6fqb3NebNsZM7xN52huEDAEJOhhm tJGeEWSfCyIXiK2HxXze+T52DnGi+8FvBBaRQ/w/6RO2TxuMpO6fNWiMmkZESPQPVA jrus3JNeW9jrw== X-Nifty-SrcIP: [118.110.19.204] From: Masahiro Yamada To: linux-mtd@lists.infradead.org Cc: Enrico Jorns , Artem Bityutskiy , Dinh Nguyen , Boris Brezillon , Marek Vasut , Graham Moore , David Woodhouse , Masami Hiramatsu , Chuanxiao Dong , Jassi Brar , Masahiro Yamada , Cyrille Pitchen , linux-kernel@vger.kernel.org, Brian Norris , Richard Weinberger Subject: [PATCH v4 08/23] mtd: nand: denali: do not propagate NAND_STATUS_FAIL to waitfunc() Date: Tue, 6 Jun 2017 08:21:47 +0900 Message-Id: <1496704922-12261-9-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1496704922-12261-1-git-send-email-yamada.masahiro@socionext.com> References: <1496704922-12261-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 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 3655284..4017262 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 5f08691..0e9297d 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;