Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754703AbcCYWcQ (ORCPT ); Fri, 25 Mar 2016 18:32:16 -0400 Received: from skprod3.natinst.com ([130.164.80.24]:37035 "EHLO ni.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754328AbcCYWcO (ORCPT ); Fri, 25 Mar 2016 18:32:14 -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 Subject: [PATCH v3] mtd: nand_bbt: scan for next free bbt block if writing bbt fails Date: Fri, 25 Mar 2016 17:31:16 -0500 Message-Id: <1458945076-18305-1-git-send-email-kyle.roeschley@ni.com> X-Mailer: git-send-email 2.8.0.rc3 X-MIMETrack: Itemize by SMTP Server on US-AUS-MGWOut2/AUS/H/NIC(Release 8.5.3FP6 HF1218|December 12, 2014) at 03/25/2016 05:31:17 PM, Serialize by Router on US-AUS-MGWOut2/AUS/H/NIC(Release 8.5.3FP6 HF1218|December 12, 2014) at 03/25/2016 05:31:17 PM, Serialize complete at 03/25/2016 05:31:17 PM X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-03-25_06:,, signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3513 Lines: 102 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 --- This v3 is in response to comments from Brian Norris and Bean Ho on 8/26/15: http://lists.infradead.org/pipermail/linux-mtd/2015-August/061411.html 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_base.c | 4 ++-- drivers/mtd/nand/nand_bbt.c | 37 +++++++++++++++++++++++++++++++++++-- 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index b6facac..9ad8a86 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -2916,8 +2916,8 @@ int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr, /* Select the NAND device */ chip->select_chip(mtd, chipnr); - /* Check, if it is write protected */ - if (nand_check_wp(mtd)) { + /* Check if it is write protected, unless we're erasing BBT */ + if (nand_check_wp(mtd) && !allowbbt) { pr_debug("%s: device is write protected!\n", __func__); instr->state = MTD_ERASE_FAILED; diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c index 2fbb523..01526e5 100644 --- a/drivers/mtd/nand/nand_bbt.c +++ b/drivers/mtd/nand/nand_bbt.c @@ -662,6 +662,7 @@ static int write_bbt(struct mtd_info *mtd, uint8_t *buf, page = td->pages[chip]; goto write; } + next: /* * Automatic placement of the bad block table. Search direction @@ -787,14 +788,46 @@ 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, block); + 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 < 0) { 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, block); + 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 < 0) { goto outerr; + } pr_info("Bad block table written to 0x%012llx, version 0x%02X\n", (unsigned long long)to, td->version[chip]); -- 2.8.0.rc3