MMC read/write commands updated for OMAP3

Example -
mmc <read/ write> <slot> <address> <offset> <size>

This patch also adds a print message for reads of
file sizes > 3MB.

Signed-off-by: Sukumar Ghorai <s-ghorai@ti.com>

2 files changed, 64 insertions, 17 deletions

diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c
index c37112f03d..d07c027a14 100644
--- a/common/cmd_mmc.c
+++ b/common/cmd_mmc.c
@@ -95,6 +95,12 @@ int do_mmc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                                 printf("'%s' is not a number\n", argv[5]);
                                 goto usage;
                         }
+
+                        if (offset%4 != 0) {
+                                printf("Offset is not WORD boundary\n");
+                                goto usage;
+                        }
+
                         /* validate the params */
                         if (((dev_num != 0) && (dev_num != 1)) || (size == 0))
                                 ret = -1;
@@ -107,31 +113,44 @@ int do_mmc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
                 if ((strncmp(argv[1], "write.i", 7) == 0)
                                                 && (argv[1][7] == '\0')) {
+
+                        printf("MMC%d Write: offset 0x%08x, size 0x%x\n",
+                                                        dev_num, offset, size);
                         ret = mmc_write_opts(dev_num,
                                 offset, size, (unsigned char *)addr, &total);
                         printf("%d bytes written: %s\n",
                                 total, ret ? "OK" : "ERROR");
                 } else if ((strncmp(argv[1], "read.i", 6) == 0) &&
                                                 (argv[1][6] == '\0')) {
+
+                        printf("MMC%d Read: offset 0x%08x, size 0x%x\n",
+                                                        dev_num, offset, size);
                         ret = mmc_read_opts(dev_num, offset, size,
                                 (unsigned char *)addr);
                         printf("%d bytes read: %s\n",
                                 size, ret ? "OK" : "ERROR");
                 } else if ((strncmp(argv[1], "write", 5) == 0) &&
                                 (argv[1][5] == '\0')) {
-                        ret = mmc_write_block(dev_num, offset, size,
+
+                        printf("MMC%d Write: offset 0x%08x, size 0x%x\n",
+                                                        dev_num, offset, size);
+                        ret = mmc_write_opts(dev_num, offset, size,
                                                 (unsigned char *)addr, &total);
-                        printf("%d sectors written: %s\n",
+                        printf("%d bytes written: %s\n",
                                 total, ret ? "OK" : "ERROR");
                 } else if ((strncmp(argv[1], "read", 4) == 0) &&
                                                         (argv[1][4] == '\0')) {
-                        ret = mmc_read_block(dev_num, offset, size,
+
+                        printf("MMC%d Read: offset 0x%08x, size 0x%x\n",
+                                                        dev_num, offset, size);
+                        ret = mmc_read_opts(dev_num, offset, size,
                                                 (unsigned char *)addr);
-                        printf("Sectors read: %s\n", ret ? "OK" : "ERROR");
-                        } else {
+                        printf("%d bytes read: %s\n",
+                                                size, ret ? "OK" : "ERROR");
+                } else {
 
                         goto usage;
-                        }
+                }
                 /* status of the operation */
                 return ret;
                 }
@@ -148,11 +167,10 @@ U_BOOT_CMD(
         mmc, 6, 1, do_mmc,
         "mmc - MMC sub-system\n"
         "mmc init <dev>\n"
-        "mmc read[.i]/write[.i] <dev> <addr> <block offset> [size]\n",
+        "mmc read[.i]/write[.i] <dev> <addr> <offset> [size]\n",
         "mmc init - device (0 for MMC1, 1 for MMC2)\n"
-        "mmc read[.i] device addr offset size - \n"
-        "mmc write[.i] device addr offset size - \n"
-        "--- write `size' starting at offset `offset' to/from eMMC device\n"
+        "mmc read[.i]/write[.i] device addr offset size - \n"
+        "--- write `size' starting at offset `offset' to/from device\n"
         "device - 0/1 for MMC1/MMC2\n" "`addr' is memory location\n"
 );
 U_BOOT_CMD(
diff --git a/cpu/omap3/mmc.c b/cpu/omap3/mmc.c
index 9bd78c8296..4dfb231008 100644
--- a/cpu/omap3/mmc.c
+++ b/cpu/omap3/mmc.c
@@ -50,7 +50,8 @@ block_dev_desc_t *mmc_get_dev(int dev)
 
         if ((dev == 0) || (dev == 1)) {
                 if (cur_card_data[dev].size == 0)
-                        printf("Card is not Initalized (e.g. mmc init 0)\n");
+                        printf("Card#%d is not Initalized"
+                                "(Usage: mmcinit 0/1)\n", dev);
                 else
                         return &mmc_blk_dev[dev];
         }
@@ -507,9 +508,15 @@ int mmc_read_block(int dev_num, unsigned int blknr,
         unsigned int num_sec_val =
             (num_bytes + (MMCSD_SECTOR_SIZE - 1)) / MMCSD_SECTOR_SIZE;
         unsigned int sec_inc_val;
+        unsigned int percent_complete = 0, percent = 0;
 
         MMC_DPRINT("mmc_read_block Pos=0x%x 0x%x-bytes Add=0x%x\n",
                                         start_sec, num_bytes, output_buf);
+        if (cur_card_data[dev_num].size == 0) {
+                printf("Card#%d is not Initalized(e.g mmcinit 0/1)\n", dev_num);
+                return 1;
+        }
+
         if (num_sec_val == 0)
                 return 1;
 
@@ -523,6 +530,7 @@ int mmc_read_block(int dev_num, unsigned int blknr,
                 MMC_DPRINT("BYTE_MODE\n");
         }
 
+        percent = num_sec_val;
         while (num_sec_val) {
                 err = mmc_send_cmd(mmc_c->base, MMC_CMD17, argument, resp);
                 if (err)
@@ -535,6 +543,13 @@ int mmc_read_block(int dev_num, unsigned int blknr,
                 output_buf += (MMCSD_SECTOR_SIZE / 4);
                 argument += sec_inc_val;
                 num_sec_val--;
+
+                if ((blkcnt > 0x1800) &&
+                (percent_complete < ((percent - num_sec_val)*100/percent))) {
+                        percent_complete = (percent - num_sec_val)*100/percent;
+                        printf("\rReading data at 0x%x --  %3d%% complete.",
+                                argument, percent_complete);
+                }
         }
         /* FAT file system expects 1 as success */
         if (err == 1)
@@ -543,7 +558,7 @@ int mmc_read_block(int dev_num, unsigned int blknr,
                 return 1;
 }
 
-unsigned char configure_mmc(mmc_card_data *mmc_card_cur)
+unsigned int configure_mmc(mmc_card_data *mmc_card_cur)
 {
         int ret_val;
         unsigned int argument;
@@ -650,8 +665,15 @@ int mmc_write_block(int dev_num, unsigned int blknr, unsigned int blkcnt,
         unsigned int sec_inc_val;
         unsigned int num_sec_val = (num_bytes + (MMCSD_SECTOR_SIZE - 1)) /
                                                         MMCSD_SECTOR_SIZE;
+        unsigned int percent_complete = 0, percent = 0;
 
         MMC_DPRINT("+mmc_write_block(0x%x sector)\n", num_sec_val);
+
+        if (cur_card_data[dev_num].size == 0) {
+                printf("Card#%d is not Initalized(e.g mmcinit 0/1)\n", dev_num);
+                return 1;
+        }
+
         if (blkcnt == 0)
                 return 1;
 
@@ -675,6 +697,13 @@ int mmc_write_block(int dev_num, unsigned int blknr, unsigned int blkcnt,
                 output_buf += (MMCSD_SECTOR_SIZE / 4);
                 argument += sec_inc_val;
                 num_sec_val--;
+
+                if ((blkcnt > 0x1800) &&
+                (percent_complete < ((percent - num_sec_val)*100/percent))) {
+                        percent_complete = (percent - num_sec_val)*100/percent;
+                        printf("\rWriting data at 0x%x --  %3d%% complete.",
+                                argument, percent_complete);
+                }
         }
         *total = blkcnt - num_sec_val;
 
@@ -714,7 +743,7 @@ int mmc_init(int slot)
                                 (slot == 0) ? IF_TYPE_MMC : IF_TYPE_MMC2;
 
                 mmc_blk_dev[slot].part_type = PART_TYPE_DOS;
-                mmc_blk_dev[slot].dev = 0;
+                mmc_blk_dev[slot].dev = slot;
                 mmc_blk_dev[slot].lun = 0;
                 mmc_blk_dev[slot].type = 0;
 
@@ -802,10 +831,10 @@ int mmc_write_opts(int dev_num, unsigned int bytepos, unsigned int bytecnt,
         unsigned int i, startsec, pos, cursize = 0, blkcnt, tmptotal;
         unsigned char buf[MMCSD_SECTOR_SIZE];
 
-        MMC_DPRINT("+mmc_read_opts dev=%d\n", dev_num);
+        MMC_DPRINT("+mmc_write_opts dev=%d\n", dev_num);
 
         /* check, if length is not larger than device */
-        MMC_DPRINT("mmc_read_opts Pos=0x%x 0x%x-bytes Add=0x%x\n",
+        MMC_DPRINT("mmc_write_opts Pos=0x%x 0x%x-bytes Add=0x%x\n",
                                         bytepos, bytecnt, src);
         if (bytecnt == 0)
                 return 1;
@@ -849,9 +878,9 @@ int mmc_write_opts(int dev_num, unsigned int bytepos, unsigned int bytecnt,
                 }
         }
 
-        /* check if any fraction to read */
+        /* check if any fraction to write */
         if ((err == 0x01) && (bytecnt > 0)) {
-                err = mmc_read_block(dev_num, startsec, 1, src);
+                err = mmc_read_block(dev_num, startsec, 1, buf);
                 if (err == 0x01) {
                         /* make the buffer */
                         for (i = 0; i < bytecnt; i++)