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

[karo-tx-uboot.git] / drivers / dfu / dfu_mmc.c

diff --git a/drivers/dfu/dfu_mmc.c b/drivers/dfu/dfu_mmc.c
index 63cc876612c9aa44df4539e5e6c1a3b1d0af0b14..72fa03eedaecd3700fea7d4ed4e277fad2112ce5 100644 (file)
--- a/drivers/dfu/dfu_mmc.c
+++ b/drivers/dfu/dfu_mmc.c
@@ -12,6 +12,8 @@
 #include <errno.h>
 #include <div64.h>
 #include <dfu.h>
+#include <ext4fs.h>
+#include <fat.h>
 #include <mmc.h>
 
 static unsigned char __aligned(CONFIG_SYS_CACHELINE_SIZE)
@@ -25,7 +27,7 @@ static int mmc_access_part(struct dfu_entity *dfu, struct mmc *mmc, int part)
        if (part == mmc->part_num)
                return 0;
 
-       ret = mmc_switch_part(dfu->dev_num, part);
+       ret = mmc_switch_part(dfu->data.mmc.dev_num, part);
        if (ret) {
                error("Cannot switch to partition %d\n", part);
                return ret;
@@ -38,7 +40,7 @@ static int mmc_access_part(struct dfu_entity *dfu, struct mmc *mmc, int part)
 static int mmc_block_op(enum dfu_op op, struct dfu_entity *dfu,
                        u64 offset, void *buf, long *len)
 {
-       struct mmc *mmc = find_mmc_device(dfu->dev_num);
+       struct mmc *mmc = find_mmc_device(dfu->data.mmc.dev_num);
        u32 blk_start, blk_count, n = 0;
        int ret, part_num_bkp = 0;
 
@@ -65,15 +67,15 @@ static int mmc_block_op(enum dfu_op op, struct dfu_entity *dfu,
        }
 
        debug("%s: %s dev: %d start: %d cnt: %d buf: 0x%p\n", __func__,
-             op == DFU_OP_READ ? "MMC READ" : "MMC WRITE", dfu->dev_num,
-             blk_start, blk_count, buf);
+             op == DFU_OP_READ ? "MMC READ" : "MMC WRITE",
+             dfu->data.mmc.dev_num, blk_start, blk_count, buf);
        switch (op) {
        case DFU_OP_READ:
-               n = mmc->block_dev.block_read(dfu->dev_num, blk_start,
+               n = mmc->block_dev.block_read(dfu->data.mmc.dev_num, blk_start,
                                              blk_count, buf);
                break;
        case DFU_OP_WRITE:
-               n = mmc->block_dev.block_write(dfu->dev_num, blk_start,
+               n = mmc->block_dev.block_write(dfu->data.mmc.dev_num, blk_start,
                                               blk_count, buf);
                break;
        default:
@@ -113,22 +115,17 @@ static int mmc_file_buffer(struct dfu_entity *dfu, void *buf, long *len)
 static int mmc_file_op(enum dfu_op op, struct dfu_entity *dfu,
                        void *buf, long *len)
 {
+       const char *fsname, *opname;
        char cmd_buf[DFU_CMD_BUF_SIZE];
        char *str_env;
        int ret;
 
        switch (dfu->layout) {
        case DFU_FS_FAT:
-               sprintf(cmd_buf, "fat%s mmc %d:%d 0x%x %s",
-                       op == DFU_OP_READ ? "load" : "write",
-                       dfu->data.mmc.dev, dfu->data.mmc.part,
-                       (unsigned int) buf, dfu->name);
+               fsname = "fat";
                break;
        case DFU_FS_EXT4:
-               sprintf(cmd_buf, "ext4%s mmc %d:%d 0x%x /%s",
-                       op == DFU_OP_READ ? "load" : "write",
-                       dfu->data.mmc.dev, dfu->data.mmc.part,
-                       (unsigned int) buf, dfu->name);
+               fsname = "ext4";
                break;
        default:
                printf("%s: Layout (%s) not (yet) supported!\n", __func__,
@@ -136,6 +133,28 @@ static int mmc_file_op(enum dfu_op op, struct dfu_entity *dfu,
                return -1;
        }
 
+       switch (op) {
+       case DFU_OP_READ:
+               opname = "load";
+               break;
+       case DFU_OP_WRITE:
+               opname = "write";
+               break;
+       case DFU_OP_SIZE:
+               opname = "size";
+               break;
+       default:
+               return -1;
+       }
+
+       sprintf(cmd_buf, "%s%s mmc %d:%d", fsname, opname,
+               dfu->data.mmc.dev, dfu->data.mmc.part);
+
+       if (op != DFU_OP_SIZE)
+               sprintf(cmd_buf + strlen(cmd_buf), " 0x%x", (unsigned int)buf);
+
+       sprintf(cmd_buf + strlen(cmd_buf), " %s", dfu->name);
+
        if (op == DFU_OP_WRITE)
                sprintf(cmd_buf + strlen(cmd_buf), " %lx", *len);
 
@@ -147,7 +166,7 @@ static int mmc_file_op(enum dfu_op op, struct dfu_entity *dfu,
                return ret;
        }
 
-       if (dfu->layout != DFU_RAW_ADDR && op == DFU_OP_READ) {
+       if (op != DFU_OP_WRITE) {
                str_env = getenv("filesize");
                if (str_env == NULL) {
                        puts("dfu: Wrong file size!\n");
@@ -196,6 +215,27 @@ int dfu_flush_medium_mmc(struct dfu_entity *dfu)
        return ret;
 }
 
+long dfu_get_medium_size_mmc(struct dfu_entity *dfu)
+{
+       int ret;
+       long len;
+
+       switch (dfu->layout) {
+       case DFU_RAW_ADDR:
+               return dfu->data.mmc.lba_size * dfu->data.mmc.lba_blk_size;
+       case DFU_FS_FAT:
+       case DFU_FS_EXT4:
+               ret = mmc_file_op(DFU_OP_SIZE, dfu, NULL, &len);
+               if (ret < 0)
+                       return ret;
+               return len;
+       default:
+               printf("%s: Layout (%s) not (yet) supported!\n", __func__,
+                      dfu_get_layout(dfu->layout));
+               return -1;
+       }
+}
+
 int dfu_read_medium_mmc(struct dfu_entity *dfu, u64 offset, void *buf,
                long *len)
 {
@@ -230,7 +270,7 @@ int dfu_read_medium_mmc(struct dfu_entity *dfu, u64 offset, void *buf,
  *     4th (optional):
  *             mmcpart <num> (access to HW eMMC partitions)
  */
-int dfu_fill_entity_mmc(struct dfu_entity *dfu, char *s)
+int dfu_fill_entity_mmc(struct dfu_entity *dfu, char *devstr, char *s)
 {
        const char *entity_type;
        size_t second_arg;
@@ -241,6 +281,8 @@ int dfu_fill_entity_mmc(struct dfu_entity *dfu, char *s)
        const char *argv[3];
        const char **parg = argv;
 
+       dfu->data.mmc.dev_num = simple_strtoul(devstr, NULL, 10);
+
        for (; parg < argv + sizeof(argv) / sizeof(*argv); ++parg) {
                *parg = strsep(&s, " ");
                if (*parg == NULL) {
@@ -257,9 +299,10 @@ int dfu_fill_entity_mmc(struct dfu_entity *dfu, char *s)
        second_arg = simple_strtoul(argv[1], NULL, 0);
        third_arg = simple_strtoul(argv[2], NULL, 0);
 
-       mmc = find_mmc_device(dfu->dev_num);
+       mmc = find_mmc_device(dfu->data.mmc.dev_num);
        if (mmc == NULL) {
-               error("Couldn't find MMC device no. %d.\n", dfu->dev_num);
+               error("Couldn't find MMC device no. %d.\n",
+                     dfu->data.mmc.dev_num);
                return -ENODEV;
        }
 
@@ -316,6 +359,7 @@ int dfu_fill_entity_mmc(struct dfu_entity *dfu, char *s)
        }
 
        dfu->dev_type = DFU_DEV_MMC;
+       dfu->get_medium_size = dfu_get_medium_size_mmc;
        dfu->read_medium = dfu_read_medium_mmc;
        dfu->write_medium = dfu_write_medium_mmc;
        dfu->flush_medium = dfu_flush_medium_mmc;