mmc: Use map_sysmem() with buffers in the mmc command

The current implementation casts an address to a pointer. Make it more
sandbox-friendly by using map_sysmem().

Rename the variable to 'ptr' since it is a pointer, not an address.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/cmd/mmc.c b/cmd/mmc.c
index ff7b8e555bad01b39b2019fb4f815ab4084df01a..8aa7b7d906b56d74af6291572223543b440a06f4 100644 (file)
--- a/cmd/mmc.c
+++ b/cmd/mmc.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <console.h>
 #include <display_options.h>
+#include <mapmem.h>
 #include <memalign.h>
 #include <mmc.h>
 #include <part.h>
@@ -349,12 +350,12 @@ static int do_mmc_read(struct cmd_tbl *cmdtp, int flag,
 {
        struct mmc *mmc;
        u32 blk, cnt, n;
-       void *addr;
+       void *ptr;
 
        if (argc != 4)
                return CMD_RET_USAGE;
 
-       addr = (void *)hextoul(argv[1], NULL);
+       ptr = map_sysmem(hextoul(argv[1], NULL), 0);
        blk = hextoul(argv[2], NULL);
        cnt = hextoul(argv[3], NULL);
 
@@ -365,8 +366,9 @@ static int do_mmc_read(struct cmd_tbl *cmdtp, int flag,
        printf("MMC read: dev # %d, block # %d, count %d ... ",
               curr_device, blk, cnt);
 
-       n = blk_dread(mmc_get_blk_desc(mmc), blk, cnt, addr);
+       n = blk_dread(mmc_get_blk_desc(mmc), blk, cnt, ptr);
        printf("%d blocks read: %s\n", n, (n == cnt) ? "OK" : "ERROR");
+       unmap_sysmem(ptr);
 
        return (n == cnt) ? CMD_RET_SUCCESS : CMD_RET_FAILURE;
 }
@@ -442,12 +444,12 @@ static int do_mmc_write(struct cmd_tbl *cmdtp, int flag,
 {
        struct mmc *mmc;
        u32 blk, cnt, n;
-       void *addr;
+       void *ptr;
 
        if (argc != 4)
                return CMD_RET_USAGE;
 
-       addr = (void *)hextoul(argv[1], NULL);
+       ptr = map_sysmem(hextoul(argv[1], NULL), 0);
        blk = hextoul(argv[2], NULL);
        cnt = hextoul(argv[3], NULL);
 
@@ -462,8 +464,9 @@ static int do_mmc_write(struct cmd_tbl *cmdtp, int flag,
                printf("Error: card is write protected!\n");
                return CMD_RET_FAILURE;
        }
-       n = blk_dwrite(mmc_get_blk_desc(mmc), blk, cnt, addr);
+       n = blk_dwrite(mmc_get_blk_desc(mmc), blk, cnt, ptr);
        printf("%d blocks written: %s\n", n, (n == cnt) ? "OK" : "ERROR");
+       unmap_sysmem(ptr);
 
        return (n == cnt) ? CMD_RET_SUCCESS : CMD_RET_FAILURE;
 }