Patchwork [U-Boot,v4] dfu, nand: before write a buffer to nand, erase the nand sectors

login
register
mail settings
Submitter Heiko Schocher
Date June 24, 2013, 4:50 p.m.
Message ID <1372092640-1656-1-git-send-email-hs@denx.de>
Download mbox | patch
Permalink /patch/253912/
State Superseded
Headers show

Comments

Heiko Schocher - June 24, 2013, 4:50 p.m.
before writing the received buffer to nand, erase the nand
sectors. If not doing this, nand write fails. See for
more info here:

http://lists.denx.de/pipermail/u-boot/2013-June/156361.html

Using the nand erase option "spread", maybe overwrite
blocks on, for example another mtd partition, if the
erasing range contains bad blocks.
So a limit option is added to nand_erase_opts()

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Scott Wood <scottwood@freescale.com>
Cc: Pantelis Antoniou <panto@antoniou-consulting.com>
Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Tom Rini <trini@ti.com>

---
- changes for v2:
  - use opts.spread as Scott Wood suggested
- changes for v3:
  - add opts.lim as Scott Wood suggested
- changes for v4:
  - fix boundary check as Scott Wood mentioned

 drivers/dfu/dfu_nand.c       | 18 ++++++++++++++++--
 drivers/mtd/nand/nand_util.c |  4 ++++
 include/nand.h               |  2 ++
 3 Dateien geändert, 22 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-)
Scott Wood - June 24, 2013, 11:26 p.m.
On 06/24/2013 11:50:40 AM, Heiko Schocher wrote:
> before writing the received buffer to nand, erase the nand
> sectors. If not doing this, nand write fails. See for
> more info here:
> 
> http://lists.denx.de/pipermail/u-boot/2013-June/156361.html
> 
> Using the nand erase option "spread", maybe overwrite
> blocks on, for example another mtd partition, if the
> erasing range contains bad blocks.
> So a limit option is added to nand_erase_opts()
> 
> Signed-off-by: Heiko Schocher <hs@denx.de>
> Cc: Scott Wood <scottwood@freescale.com>
> Cc: Pantelis Antoniou <panto@antoniou-consulting.com>
> Cc: Lukasz Majewski <l.majewski@samsung.com>
> Cc: Kyungmin Park <kyungmin.park@samsung.com>
> Cc: Marek Vasut <marex@denx.de>
> Cc: Tom Rini <trini@ti.com>
> 
> ---
> - changes for v2:
>   - use opts.spread as Scott Wood suggested
> - changes for v3:
>   - add opts.lim as Scott Wood suggested
> - changes for v4:
>   - fix boundary check as Scott Wood mentioned

Applied to u-boot-nand-flash

-Scott

Patch

diff --git a/drivers/dfu/dfu_nand.c b/drivers/dfu/dfu_nand.c
index 7dc89b2..07dee89 100644
--- a/drivers/dfu/dfu_nand.c
+++ b/drivers/dfu/dfu_nand.c
@@ -63,12 +63,26 @@  static int nand_block_op(enum dfu_nand_op op, struct dfu_entity *dfu,
 
 	nand = &nand_info[nand_curr_device];
 
-	if (op == DFU_OP_READ)
+	if (op == DFU_OP_READ) {
 		ret = nand_read_skip_bad(nand, start, &count, &actual,
 				lim, buf);
-	else
+	} else {
+		nand_erase_options_t opts;
+
+		memset(&opts, 0, sizeof(opts));
+		opts.offset = start;
+		opts.length = count;
+		opts.spread = 1;
+		opts.quiet = 1;
+		opts.lim = lim;
+		/* first erase */
+		ret = nand_erase_opts(nand, &opts);
+		if (ret)
+			return ret;
+		/* then write */
 		ret = nand_write_skip_bad(nand, start, &count, &actual,
 				lim, buf, 0);
+	}
 
 	if (ret != 0) {
 		printf("%s: nand_%s_skip_bad call failed at %llx!\n",
diff --git a/drivers/mtd/nand/nand_util.c b/drivers/mtd/nand/nand_util.c
index d81972c..1d22b52 100644
--- a/drivers/mtd/nand/nand_util.c
+++ b/drivers/mtd/nand/nand_util.c
@@ -120,6 +120,10 @@  int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts)
 
 		WATCHDOG_RESET();
 
+		if (opts->lim && (erase.addr >= (opts->offset + opts->lim))) {
+			puts("Size of erase exceeds limit\n");
+			return -EFBIG;
+		}
 		if (!opts->scrub && bbtest) {
 			int ret = mtd_block_isbad(meminfo, erase.addr);
 			if (ret > 0) {
diff --git a/include/nand.h b/include/nand.h
index 26190e4..228d871 100644
--- a/include/nand.h
+++ b/include/nand.h
@@ -125,6 +125,8 @@  struct nand_erase_options {
 
 	/* Don't include skipped bad blocks in size to be erased */
 	int spread;
+	/* maximum size that actual may be in order to not exceed the buf */
+	loff_t lim;
 };
 
 typedef struct nand_erase_options nand_erase_options_t;