Merge branch 'master' of http://git.denx.de/u-boot-sunxi

[platform/kernel/u-boot.git] / cmd / nand.c

diff --git a/cmd/nand.c b/cmd/nand.c
index f1d5a11..97f1619 100644 (file)
--- a/cmd/nand.c
+++ b/cmd/nand.c
@@ -115,8 +115,7 @@ free_dat:
 
 static int set_dev(int dev)
 {
-       if (dev < 0 || dev >= CONFIG_SYS_MAX_NAND_DEVICE ||
-           !nand_info[dev]->name) {
+       if (dev < 0 || dev >= CONFIG_SYS_MAX_NAND_DEVICE || !nand_info[dev]) {
                puts("No such device\n");
                return -1;
        }
@@ -159,7 +158,7 @@ static void do_nand_status(struct mtd_info *mtd)
        ulong off;
        int last_status = -1;
 
-       struct nand_chip *nand_chip = mtd->priv;
+       struct nand_chip *nand_chip = mtd_to_nand(mtd);
        /* check the WP bit */
        nand_chip->cmdfunc(mtd, NAND_CMD_STATUS, -1, -1);
        printf("device is %swrite protected\n",
@@ -285,7 +284,7 @@ usage:
 static void nand_print_and_set_info(int idx)
 {
        struct mtd_info *mtd = nand_info[idx];
-       struct nand_chip *chip = mtd->priv;
+       struct nand_chip *chip = mtd_to_nand(mtd);
 
        printf("Device %d: ", idx);
        if (chip->numchips > 1)
@@ -306,7 +305,7 @@ static void nand_print_and_set_info(int idx)
 }
 
 static int raw_access(struct mtd_info *mtd, ulong addr, loff_t off,
-                     ulong count, int read)
+                     ulong count, int read, int no_verify)
 {
        int ret = 0;
 
@@ -324,7 +323,7 @@ static int raw_access(struct mtd_info *mtd, ulong addr, loff_t off,
                        ret = mtd_read_oob(mtd, off, &ops);
                } else {
                        ret = mtd_write_oob(mtd, off, &ops);
-                       if (!ret)
+                       if (!ret && !no_verify)
                                ret = nand_verify_page_oob(mtd, &ops, off);
                }
 
@@ -546,6 +545,7 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                ulong pagecount = 1;
                int read;
                int raw = 0;
+               int no_verify = 0;
 
                if (argc < 4)
                        goto usage;
@@ -557,9 +557,12 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
                s = strchr(cmd, '.');
 
-               if (s && !strcmp(s, ".raw")) {
+               if (s && !strncmp(s, ".raw", 4)) {
                        raw = 1;
 
+                       if (!strcmp(s, ".raw.noverify"))
+                               no_verify = 1;
+
                        if (mtd_arg_off(argv[3], &dev, &off, &size, &maxsize,
                                        MTD_DEV_TYPE_NAND,
                                        nand_info[dev]->size))
@@ -633,7 +636,8 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                        else
                                ret = mtd_write_oob(mtd, off, &ops);
                } else if (raw) {
-                       ret = raw_access(mtd, addr, off, pagecount, read);
+                       ret = raw_access(mtd, addr, off, pagecount, read,
+                                        no_verify);
                } else {
                        printf("Unknown nand command suffix '%s'.\n", s);
                        return 1;
@@ -647,6 +651,9 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
 #ifdef CONFIG_CMD_NAND_TORTURE
        if (strcmp(cmd, "torture") == 0) {
+               loff_t endoff;
+               unsigned int failed = 0, passed = 0;
+
                if (argc < 3)
                        goto usage;
 
@@ -655,12 +662,37 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                        return 1;
                }
 
-               printf("\nNAND torture: device %d offset 0x%llx size 0x%x\n",
-                       dev, off, mtd->erasesize);
-               ret = nand_torture(mtd, off);
-               printf(" %s\n", ret ? "Failed" : "Passed");
+               size = mtd->erasesize;
+               if (argc > 3) {
+                       if (!str2off(argv[3], &size)) {
+                               puts("Size is not a valid number\n");
+                               return 1;
+                       }
+               }
+
+               endoff = off + size;
+               if (endoff > mtd->size) {
+                       puts("Arguments beyond end of NAND\n");
+                       return 1;
+               }
 
-               return ret == 0 ? 0 : 1;
+               off = round_down(off, mtd->erasesize);
+               endoff = round_up(endoff, mtd->erasesize);
+               size = endoff - off;
+               printf("\nNAND torture: device %d offset 0x%llx size 0x%llx (block size 0x%x)\n",
+                      dev, off, size, mtd->erasesize);
+               while (off < endoff) {
+                       ret = nand_torture(mtd, off);
+                       if (ret) {
+                               failed++;
+                               printf("  block at 0x%llx failed\n", off);
+                       } else {
+                               passed++;
+                       }
+                       off += mtd->erasesize;
+               }
+               printf(" Passed: %u, failed: %u\n", passed, failed);
+               return failed != 0;
        }
 #endif
 
@@ -758,7 +790,7 @@ static char nand_help_text[] =
        "    read/write 'size' bytes starting at offset 'off'\n"
        "    to/from memory address 'addr', skipping bad blocks.\n"
        "nand read.raw - addr off|partition [count]\n"
-       "nand write.raw - addr off|partition [count]\n"
+       "nand write.raw[.noverify] - addr off|partition [count]\n"
        "    Use read.raw/write.raw to avoid ECC and access the flash as-is.\n"
 #ifdef CONFIG_CMD_NAND_TRIMFFS
        "nand write.trimffs - addr off|partition size\n"
@@ -775,7 +807,8 @@ static char nand_help_text[] =
        "nand bad - show bad blocks\n"
        "nand dump[.oob] off - dump page\n"
 #ifdef CONFIG_CMD_NAND_TORTURE
-       "nand torture off - torture block at offset\n"
+       "nand torture off - torture one block at offset\n"
+       "nand torture off [size] - torture blocks from off to off+size\n"
 #endif
        "nand scrub [-y] off size | scrub.part partition | scrub.chip\n"
        "    really clean NAND erasing bad blocks (UNSAFE)\n"