From patchwork Mon Mar 31 23:28:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Mosberger-Tang X-Patchwork-Id: 335631 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from casper.infradead.org (unknown [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 5119C1400AE for ; Tue, 1 Apr 2014 10:30:36 +1100 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WUleW-0003Tp-Jt; Mon, 31 Mar 2014 23:30:04 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WUleN-0002MQ-GQ; Mon, 31 Mar 2014 23:29:55 +0000 Received: from c-67-176-60-102.hsd1.co.comcast.net ([67.176.60.102] helo=pearl.egauge.net) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WUle8-0002J6-Ek for linux-mtd@lists.infradead.org; Mon, 31 Mar 2014 23:29:42 +0000 Received: by pearl.egauge.net (Postfix, from userid 1000) id 8675E5418B4; Mon, 31 Mar 2014 17:29:15 -0600 (MDT) From: David Mosberger To: pekon@ti.com Subject: [PATCH v4 4/5] mtd: nand: Allocate extra buffers needed for on-die ECC controller. Date: Mon, 31 Mar 2014 17:28:56 -0600 Message-Id: <1396308537-16013-5-git-send-email-davidm@egauge.net> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1396308537-16013-1-git-send-email-davidm@egauge.net> References: <1396308537-16013-1-git-send-email-davidm@egauge.net> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140331_192940_683297_DE94C812 X-CRM114-Status: GOOD ( 11.39 ) X-Spam-Score: 2.4 (++) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (2.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- 3.3 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [67.176.60.102 listed in zen.spamhaus.org] 0.0 RCVD_IN_SORBS_DUL RBL: SORBS: sent directly from dynamic IP address [67.176.60.102 listed in dnsbl.sorbs.net] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 1.0 RDNS_DYNAMIC Delivered to internal network by host with dynamic-looking rDNS Cc: David Mosberger , gsi@denx.de, computersforpeace@gmail.com, linux-mtd@lists.infradead.org, dedekind1@gmail.com X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org To avoid unnecessary rewrites, it is necessary to count the number of actual bitflips that occurred when the NAND_STATUS_REWRITE bit is set. This patch introduces the extra buffers needed to implement that counting. The actual counting is in the next patch. Signed-off-by: David Mosberger --- drivers/mtd/nand/nand_base.c | 13 ++++++++++++- include/linux/mtd/nand.h | 2 ++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 435ef44..834352a 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -3935,13 +3935,24 @@ int nand_scan_tail(struct mtd_info *mtd) !(chip->bbt_options & NAND_BBT_USE_FLASH)); if (!(chip->options & NAND_OWN_BUFFERS)) { + size_t on_die_bufsz = 0; + + if (chip->ecc.mode == NAND_ECC_HW_ON_DIE) + on_die_bufsz = 2*(mtd->writesize + mtd->oobsize); + nbuf = kzalloc(sizeof(*nbuf) + mtd->writesize - + mtd->oobsize * 3, GFP_KERNEL); + + mtd->oobsize * 3 + on_die_bufsz, GFP_KERNEL); if (!nbuf) return -ENOMEM; nbuf->ecccalc = (uint8_t *)(nbuf + 1); nbuf->ecccode = nbuf->ecccalc + mtd->oobsize; nbuf->databuf = nbuf->ecccode + mtd->oobsize; + if (chip->ecc.mode == NAND_ECC_HW_ON_DIE) { + nbuf->chkbuf = (nbuf->databuf + mtd->writesize + + mtd->oobsize); + nbuf->rawbuf = (nbuf->chkbuf + mtd->writesize + + mtd->oobsize); + } chip->buffers = nbuf; } else { diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index dbb99b3..456809b 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h @@ -533,6 +533,8 @@ struct nand_buffers { uint8_t *ecccalc; uint8_t *ecccode; uint8_t *databuf; + uint8_t *chkbuf; + uint8_t *rawbuf; }; /**