dfu: mmc: raw data write fix

When user attempted to perform a raw write using DFU (vide
dfu_fill_entity_mmc) with MMC interface not initialized before,
get_mmc_blk_size() reported invalid (zero) block size - it wasn't
possible to write ie. a new u-boot image.

This commit fixes that by initializing MMC device before use in
dfu_fill_entity_mmc().

While fixing initialization sequence, I had to change about half of
dfu_fill_entity_mmc's body, so I refactored it on the way to make it,
IMHO, considerably more comprehensible.

Being left as dead code, get_mmc_blk_size() was removed.

Tested on Samsung Goni.

Signed-off-by: Mateusz Zalega <m.zalega@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Lukasz Majewski <l.majewski@samsung.com>
Acked-by: Tom Rini <trini@ti.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>

diff --git a/drivers/dfu/dfu_mmc.c b/drivers/dfu/dfu_mmc.c
index 651cfff5b3be4f742eb18cbeef1c9f3a6eacd1c2..b41785dfc7132742903864adf39824a54b871ce1 100644 (file)
--- a/drivers/dfu/dfu_mmc.c
+++ b/drivers/dfu/dfu_mmc.c
@@ -184,66 +184,91 @@ int dfu_read_medium_mmc(struct dfu_entity *dfu, u64 offset, void *buf,
        return ret;
 }
 
+/*
+ * @param s Parameter string containing space-separated arguments:
+ *     1st:
+ *             raw     (raw read/write)
+ *             fat     (files)
+ *             ext4    (^)
+ *             part    (partition image)
+ *     2nd and 3rd:
+ *             lba_start and lba_size, for raw write
+ *             mmc_dev and mmc_part, for filesystems and part
+ */
 int dfu_fill_entity_mmc(struct dfu_entity *dfu, char *s)
 {
-       int dev, part;
-       struct mmc *mmc;
-       block_dev_desc_t *blk_dev;
-       disk_partition_t partinfo;
-       char *st;
+       const char *entity_type;
+       size_t second_arg;
+       size_t third_arg;
 
-       dfu->dev_type = DFU_DEV_MMC;
-       st = strsep(&s, " ");
-       if (!strcmp(st, "mmc")) {
-               dfu->layout = DFU_RAW_ADDR;
-               dfu->data.mmc.lba_start = simple_strtoul(s, &s, 16);
-               dfu->data.mmc.lba_size = simple_strtoul(++s, &s, 16);
-               dfu->data.mmc.lba_blk_size = get_mmc_blk_size(dfu->dev_num);
-       } else if (!strcmp(st, "fat")) {
-               dfu->layout = DFU_FS_FAT;
-       } else if (!strcmp(st, "ext4")) {
-               dfu->layout = DFU_FS_EXT4;
-       } else if (!strcmp(st, "part")) {
-
-               dfu->layout = DFU_RAW_ADDR;
+       struct mmc *mmc;
 
-               dev = simple_strtoul(s, &s, 10);
-               s++;
-               part = simple_strtoul(s, &s, 10);
+       const char *argv[3];
+       const char **parg = argv;
 
-               mmc = find_mmc_device(dev);
-               if (mmc == NULL || mmc_init(mmc)) {
-                       printf("%s: could not find mmc device #%d!\n",
-                              __func__, dev);
+       for (; parg < argv + sizeof(argv) / sizeof(*argv); ++parg) {
+               *parg = strsep(&s, " ");
+               if (*parg == NULL) {
+                       error("Invalid number of arguments.\n");
                        return -ENODEV;
                }
+       }
 
-               blk_dev = &mmc->block_dev;
-               if (get_partition_info(blk_dev, part, &partinfo) != 0) {
-                       printf("%s: could not find partition #%d on mmc device #%d!\n",
-                              __func__, part, dev);
+       entity_type = argv[0];
+       second_arg = simple_strtoul(argv[1], NULL, 16);
+       third_arg = simple_strtoul(argv[2], NULL, 16);
+
+       mmc = find_mmc_device(dfu->dev_num);
+       if (mmc == NULL) {
+               error("Couldn't find MMC device no. %d.\n", dfu->dev_num);
+               return -ENODEV;
+       }
+
+       if (mmc_init(mmc)) {
+               error("Couldn't init MMC device.\n");
+               return -ENODEV;
+       }
+
+       if (!strcmp(entity_type, "raw")) {
+               dfu->layout                     = DFU_RAW_ADDR;
+               dfu->data.mmc.lba_start         = second_arg;
+               dfu->data.mmc.lba_size          = third_arg;
+               dfu->data.mmc.lba_blk_size      = mmc->read_bl_len;
+       } else if (!strcmp(entity_type, "part")) {
+               disk_partition_t partinfo;
+               block_dev_desc_t *blk_dev = &mmc->block_dev;
+               int mmcdev = second_arg;
+               int mmcpart = third_arg;
+
+               if (get_partition_info(blk_dev, mmcpart, &partinfo) != 0) {
+                       error("Couldn't find part #%d on mmc device #%d\n",
+                             mmcpart, mmcdev);
                        return -ENODEV;
                }
 
-               dfu->data.mmc.lba_start = partinfo.start;
-               dfu->data.mmc.lba_size = partinfo.size;
-               dfu->data.mmc.lba_blk_size = partinfo.blksz;
-
+               dfu->layout                     = DFU_RAW_ADDR;
+               dfu->data.mmc.lba_start         = partinfo.start;
+               dfu->data.mmc.lba_size          = partinfo.size;
+               dfu->data.mmc.lba_blk_size      = partinfo.blksz;
+       } else if (!strcmp(entity_type, "fat")) {
+               dfu->layout = DFU_FS_FAT;
+       } else if (!strcmp(entity_type, "ext4")) {
+               dfu->layout = DFU_FS_EXT4;
        } else {
-               printf("%s: Memory layout (%s) not supported!\n", __func__, st);
+               error("Memory layout (%s) not supported!\n", entity_type);
                return -ENODEV;
        }
 
-       if (dfu->layout == DFU_FS_EXT4 || dfu->layout == DFU_FS_FAT) {
-               dfu->data.mmc.dev = simple_strtoul(s, &s, 10);
-               dfu->data.mmc.part = simple_strtoul(++s, &s, 10);
+       /* if it's NOT a raw write */
+       if (strcmp(entity_type, "raw")) {
+               dfu->data.mmc.dev = second_arg;
+               dfu->data.mmc.part = third_arg;
        }
 
+       dfu->dev_type = DFU_DEV_MMC;
        dfu->read_medium = dfu_read_medium_mmc;
        dfu->write_medium = dfu_write_medium_mmc;
        dfu->flush_medium = dfu_flush_medium_mmc;
-
-       /* initial state */
        dfu->inited = 0;
 
        return 0;

diff --git a/include/dfu.h b/include/dfu.h
index 6c71ecbe3555377fd83eefc2f0fdd3a7a173646b..dcd3215d06be866746c3af8e6c9d595362bcf2c8 100644 (file)
--- a/include/dfu.h
+++ b/include/dfu.h
@@ -64,11 +64,6 @@ struct ram_internal_data {
        unsigned int    size;
 };
 
-static inline unsigned int get_mmc_blk_size(int dev)
-{
-       return find_mmc_device(dev)->read_bl_len;
-}
-
 #define DFU_NAME_SIZE                  32
 #define DFU_CMD_BUF_SIZE               128
 #ifndef CONFIG_SYS_DFU_DATA_BUF_SIZE