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

[people/ms/u-boot.git] / drivers / dfu / dfu_nand.c

diff --git a/drivers/dfu/dfu_nand.c b/drivers/dfu/dfu_nand.c
index 0ec12cff264fe8ad88117f8fe8748851cf0d4e85..9fb874c0bcd4f07c9ab1f6732117f4d7ed5a3c46 100644 (file)
--- a/drivers/dfu/dfu_nand.c
+++ b/drivers/dfu/dfu_nand.c
@@ -19,18 +19,13 @@
 #include <jffs2/load_kernel.h>
 #include <nand.h>
 
-enum dfu_nand_op {
-       DFU_OP_READ = 1,
-       DFU_OP_WRITE,
-};
-
-static int nand_block_op(enum dfu_nand_op op, struct dfu_entity *dfu,
+static int nand_block_op(enum dfu_op op, struct dfu_entity *dfu,
                        u64 offset, void *buf, long *len)
 {
        loff_t start, lim;
        size_t count, actual;
        int ret;
-       nand_info_t *nand;
+       struct mtd_info *mtd;
 
        /* if buf == NULL return total size of the area */
        if (buf == NULL) {
@@ -44,16 +39,16 @@ static int nand_block_op(enum dfu_nand_op op, struct dfu_entity *dfu,
 
        if (nand_curr_device < 0 ||
            nand_curr_device >= CONFIG_SYS_MAX_NAND_DEVICE ||
-           !nand_info[nand_curr_device].name) {
+           !nand_info[nand_curr_device]->name) {
                printf("%s: invalid nand device\n", __func__);
                return -1;
        }
 
-       nand = &nand_info[nand_curr_device];
+       mtd = nand_info[nand_curr_device];
 
        if (op == DFU_OP_READ) {
-               ret = nand_read_skip_bad(nand, start, &count, &actual,
-                               lim, buf);
+               ret = nand_read_skip_bad(mtd, start, &count, &actual,
+                                        lim, buf);
        } else {
                nand_erase_options_t opts;
 
@@ -64,12 +59,12 @@ static int nand_block_op(enum dfu_nand_op op, struct dfu_entity *dfu,
                opts.quiet = 1;
                opts.lim = lim;
                /* first erase */
-               ret = nand_erase_opts(nand, &opts);
+               ret = nand_erase_opts(mtd, &opts);
                if (ret)
                        return ret;
                /* then write */
-               ret = nand_write_skip_bad(nand, start, &count, &actual,
-                               lim, buf, 0);
+               ret = nand_write_skip_bad(mtd, start, &count, &actual,
+                                         lim, buf, WITH_WR_VERIFY);
        }
 
        if (ret != 0) {
@@ -119,6 +114,11 @@ static int dfu_write_medium_nand(struct dfu_entity *dfu,
        return ret;
 }
 
+long dfu_get_medium_size_nand(struct dfu_entity *dfu)
+{
+       return dfu->data.nand.size;
+}
+
 static int dfu_read_medium_nand(struct dfu_entity *dfu, u64 offset, void *buf,
                long *len)
 {
@@ -139,27 +139,37 @@ static int dfu_read_medium_nand(struct dfu_entity *dfu, u64 offset, void *buf,
 static int dfu_flush_medium_nand(struct dfu_entity *dfu)
 {
        int ret = 0;
+       u64 off;
 
        /* in case of ubi partition, erase rest of the partition */
        if (dfu->data.nand.ubi) {
-               nand_info_t *nand;
+               struct mtd_info *mtd;
                nand_erase_options_t opts;
 
                if (nand_curr_device < 0 ||
                    nand_curr_device >= CONFIG_SYS_MAX_NAND_DEVICE ||
-                   !nand_info[nand_curr_device].name) {
+                   !nand_info[nand_curr_device]->name) {
                        printf("%s: invalid nand device\n", __func__);
                        return -1;
                }
 
-               nand = &nand_info[nand_curr_device];
+               mtd = nand_info[nand_curr_device];
 
                memset(&opts, 0, sizeof(opts));
-               opts.offset = dfu->data.nand.start + dfu->offset +
+               off = dfu->offset;
+               if ((off & (mtd->erasesize - 1)) != 0) {
+                       /*
+                        * last write ended with unaligned length
+                        * sector is erased, jump to next
+                        */
+                       off = off & ~((mtd->erasesize - 1));
+                       off += mtd->erasesize;
+               }
+               opts.offset = dfu->data.nand.start + off +
                                dfu->bad_skip;
                opts.length = dfu->data.nand.start +
                                dfu->data.nand.size - opts.offset;
-               ret = nand_erase_opts(nand, &opts);
+               ret = nand_erase_opts(mtd, &opts);
                if (ret != 0)
                        printf("Failure erase: %d\n", ret);
        }
@@ -167,7 +177,19 @@ static int dfu_flush_medium_nand(struct dfu_entity *dfu)
        return ret;
 }
 
-int dfu_fill_entity_nand(struct dfu_entity *dfu, char *s)
+unsigned int dfu_polltimeout_nand(struct dfu_entity *dfu)
+{
+       /*
+        * Currently, Poll Timeout != 0 is only needed on nand
+        * ubi partition, as the not used sectors need an erase
+        */
+       if (dfu->data.nand.ubi)
+               return DFU_MANIFEST_POLL_TIMEOUT;
+
+       return DFU_DEFAULT_POLL_TIMEOUT;
+}
+
+int dfu_fill_entity_nand(struct dfu_entity *dfu, char *devstr, char *s)
 {
        char *st;
        int ret, dev, part;
@@ -212,9 +234,11 @@ int dfu_fill_entity_nand(struct dfu_entity *dfu, char *s)
                return -1;
        }
 
+       dfu->get_medium_size = dfu_get_medium_size_nand;
        dfu->read_medium = dfu_read_medium_nand;
        dfu->write_medium = dfu_write_medium_nand;
        dfu->flush_medium = dfu_flush_medium_nand;
+       dfu->poll_timeout = dfu_polltimeout_nand;
 
        /* initial state */
        dfu->inited = 0;