From patchwork Tue Feb 26 05:39:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harvey Chapman X-Patchwork-Id: 223114 X-Patchwork-Delegate: scottwood@freescale.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 85B512C02AE for ; Tue, 26 Feb 2013 16:40:29 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AEDC24A0A5; Tue, 26 Feb 2013 06:40:27 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 12gfPxlqfp6z; Tue, 26 Feb 2013 06:40:27 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 394C04A0A9; Tue, 26 Feb 2013 06:40:25 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 425EE4A0A9 for ; Tue, 26 Feb 2013 06:40:22 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id W3YAAoKS6mrA for ; Tue, 26 Feb 2013 06:40:21 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from hrndva-omtalb.mail.rr.com (hrndva-omtalb.mail.rr.com [71.74.56.122]) by theia.denx.de (Postfix) with ESMTP id 184FE4A0A5 for ; Tue, 26 Feb 2013 06:40:19 +0100 (CET) X-Authority-Analysis: v=2.0 cv=H5hZMpki c=1 sm=0 a=0BEmelG+NCIkmYz4MtfDKA==:17 a=KAMKcUAUZugA:10 a=okGhO3Ar3REA:10 a=h1JwTc6auzgA:10 a=wPDyFdB5xvgA:10 a=cL4bF6sHAAAA:8 a=kMM4VxVla2IA:10 a=vshidgCgVJGNjKZHYS0A:9 a=HU3bICl8N38A:10 a=0BEmelG+NCIkmYz4MtfDKA==:117 X-Cloudmark-Score: 0 X-Authenticated-User: X-Originating-IP: 65.34.9.19 Received: from [65.34.9.19] ([65.34.9.19:45174] helo=blue.3gfp.com) by hrndva-oedge03.mail.rr.com (envelope-from ) (ecelerity 2.2.3.46 r()) with ESMTP id A8/28-02677-2CA4C215; Tue, 26 Feb 2013 05:40:18 +0000 Received: from localhost (localhost [127.0.0.1]) by blue.3gfp.com (Postfix) with ESMTP id D038610805F6; Tue, 26 Feb 2013 00:40:17 -0500 (EST) X-Virus-Scanned: by amavisd-new-2.6.4 (20090625) (Debian) at 3gfp.com Received: from blue.3gfp.com ([127.0.0.1]) by localhost (blue.3gfp.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8mGDJny042RO; Tue, 26 Feb 2013 00:40:13 -0500 (EST) Received: from gitemail.3gfp.com (65349hfc19.tampabay.res.rr.com [65.34.9.19]) by blue.3gfp.com (Postfix) with ESMTPSA id CEC9D108015A; Tue, 26 Feb 2013 00:40:12 -0500 (EST) From: Harvey Chapman To: u-boot@lists.denx.de Date: Tue, 26 Feb 2013 00:39:51 -0500 Message-Id: <1361857191-30200-1-git-send-email-hchapman-uboot@3gfp.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <8EF0C1F4-52D1-47AE-822F-D373220712DF@3gfp.com> References: <8EF0C1F4-52D1-47AE-822F-D373220712DF@3gfp.com> Cc: Scott Wood , Harvey Chapman Subject: [U-Boot] [PATCH] nand: adjust erase/read/write partition/chip size for bad blocks X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de From: Harvey Chapman Adjust the sizes calculated for whole partition/chip operations by removing the size of bad blocks so we don't try to erase/read/write past a partition/chip boundary. Signed-off-by: Harvey Chapman --- common/cmd_nand.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/common/cmd_nand.c b/common/cmd_nand.c index 495610c..657ea23 100644 --- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -428,6 +428,32 @@ static int raw_access(nand_info_t *nand, ulong addr, loff_t off, ulong count, return ret; } +static int adjust_size_for_badblocks(loff_t *size, loff_t offset, int dev) { + /* We grab the nand info object here fresh because this is usually + * called after arg_off_size() which can change the value of dev. + */ + nand_info_t *nand = &nand_info[dev]; + loff_t original_size = *size; + loff_t maxoffset = offset + *size; + int badblocks = 0; + + /* count badblocks in NAND from offset to offset + size */ + for (; offset < maxoffset; offset += nand->erasesize) + if (nand_block_isbad(nand, offset)) { + badblocks++; + } + /* adjust size if any bad blocks found */ + if (badblocks) { + *size -= badblocks * nand->erasesize; + printf("size adjusted to 0x%llx (%d bad blocks)\n", + (unsigned long long)*size, badblocks); + } + /* return size adjusted as a positive value so callers + * can use the return code to determine if anything happened + */ + return (original_size - *size); +} + static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { int i, ret = 0; @@ -524,6 +550,7 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int scrub = !strncmp(cmd, "scrub", 5); int spread = 0; int args = 2; + int adjust_size = 0; const char *scrub_warn = "Warning: " "scrub option will erase all factory set bad blocks!\n" @@ -540,8 +567,10 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) spread = 1; } else if (!strcmp(&cmd[5], ".part")) { args = 1; + adjust_size = 1; } else if (!strcmp(&cmd[5], ".chip")) { args = 0; + adjust_size = 1; } else { goto usage; } @@ -560,6 +589,15 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) if (arg_off_size(argc - o, argv + o, &dev, &off, &size) != 0) return 1; + /* The size for erase.part and erase.chip has been calculated + * for us as the remainder of the chip/partition from offset. + * Adjust down for bad blocks, if necessary, so we don't + * erase past the end of the chip/partition by accident. + */ + if (adjust_size && !scrub) { + adjust_size_for_badblocks(&size, off, dev); + } + nand = &nand_info[dev]; memset(&opts, 0, sizeof(opts)); @@ -644,6 +682,19 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) &off, &size) != 0) return 1; + /* If no size was given, it has been calculated for us as + * the remainder of the chip/partition from offset. Adjust + * down for bad blocks, if necessary, so we don't + * read/write past the end of the partition by accident. + * + * nand read addr part size "size" is arg 5 + */ + if (argc < 5) { + /* Don't try to use rwsize here, it's not the + * right type + */ + adjust_size_for_badblocks(&size, off, dev); + } rwsize = size; }