From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751811AbcERWKf (ORCPT ); Wed, 18 May 2016 18:10:35 -0400 Received: from skprod3.natinst.com ([130.164.80.24]:58290 "EHLO ni.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750736AbcERWKe (ORCPT ); Wed, 18 May 2016 18:10:34 -0400 From: Kyle Roeschley To: boris.brezillon@free-electrons.com, richard@nod.at Cc: dwmw2@infradead.org, computersforpeace@gmail.com, beanhuo@micron.com, linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org, nathan.sullivan@ni.com, xander.huff@ni.com, peterpansjtu@gmail.com Subject: [RESEND PATCH v4] mtd: nand_bbt: scan for next free bbt block if writing bbt fails Date: Wed, 18 May 2016 17:10:01 -0500 Message-Id: <1463609401-19861-1-git-send-email-kyle.roeschley@ni.com> X-Mailer: git-send-email 2.8.1 X-MIMETrack: Itemize by SMTP Server on US-AUS-MGWOut1/AUS/H/NIC(Release 8.5.3FP6 HF1218|December 12, 2014) at 05/18/2016 05:09:37 PM, Serialize by Router on US-AUS-MGWOut1/AUS/H/NIC(Release 8.5.3FP6 HF1218|December 12, 2014) at 05/18/2016 05:09:37 PM, Serialize complete at 05/18/2016 05:09:37 PM X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-05-18_11:,, signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If erasing or writing the BBT fails, we should mark the current BBT block as bad and use the BBT descriptor to scan for the next available unused block in the BBT. We should only return a failure if there isn't any space left. Based on original code implemented by Jeff Westfahl . Signed-off-by: Kyle Roeschley Suggested-by: Jeff Westfahl --- v4: Don't ignore write protection while marking bad BBT blocks Correctly call block_markbad Minor cleanups v3: Don't overload mtd->priv Keep nand_erase_nand from erroring on protected BBT blocks v2: Mark OOB area in each block as well as BBT Avoid marking read-only, bad address, or known bad blocks as bad drivers/mtd/nand/nand_bbt.c | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c index 2fbb523..dfc68e0 100644 --- a/drivers/mtd/nand/nand_bbt.c +++ b/drivers/mtd/nand/nand_bbt.c @@ -663,6 +663,7 @@ static int write_bbt(struct mtd_info *mtd, uint8_t *buf, goto write; } +next: /* * Automatic placement of the bad block table. Search direction * top -> down? @@ -787,14 +788,50 @@ static int write_bbt(struct mtd_info *mtd, uint8_t *buf, einfo.addr = to; einfo.len = 1 << this->bbt_erase_shift; res = nand_erase_nand(mtd, &einfo, 1); - if (res < 0) + if (res == -EIO) { + /* + * This block is bad. Mark it as such and see if + * there's another block available in the BBT area. + */ + int block = page >> + (this->bbt_erase_shift - this->page_shift); + pr_info("nand_bbt: failed to erase block %d when writing BBT\n", + block); + bbt_mark_entry(this, block, BBT_BLOCK_WORN); + + res = this->block_markbad(mtd, to); + if (res) + pr_warn("nand_bbt: error %d while marking block %d bad\n", + res, block); + td->pages[chip] = -1; + goto next; + } else if (res) { goto outerr; + } res = scan_write_bbt(mtd, to, len, buf, td->options & NAND_BBT_NO_OOB ? NULL : &buf[len]); - if (res < 0) + if (res == -EIO) { + /* + * This block is bad. Mark it as such and see if + * there's another block available in the BBT area. + */ + int block = page >> + (this->bbt_erase_shift - this->page_shift); + pr_info("nand_bbt: failed to write block %d when writing BBT\n", + block); + bbt_mark_entry(this, block, BBT_BLOCK_WORN); + + res = this->block_markbad(mtd, to); + if (res) + pr_warn("nand_bbt: error %d while marking block %d bad\n", + res, block); + td->pages[chip] = -1; + goto next; + } else if (res) { goto outerr; + } pr_info("Bad block table written to 0x%012llx, version 0x%02X\n", (unsigned long long)to, td->version[chip]); -- 2.8.1