Skip to content
Snippets Groups Projects
Commit eea4e6fe authored by Łukasz Majewski's avatar Łukasz Majewski Committed by Pantelis Antoniou
Browse files

dfu: mmc: Replace calls to u-boot commands with native mmc API


For some time we have been using the run_command() with properly crafted
string. Such approach turned to be unreliable and error prone.

Switch to "native" mmc subsystem API would allow better type checking and
shall improve speed.

Also, it seems that this API is changing less often than u-boot commands.
The approach similar to env operations on the eMMC has been reused.

Signed-off-by: default avatarLukasz Majewski <l.majewski@samsung.com>
parent 93bfd616
No related branches found
No related tags found
No related merge requests found
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include <errno.h> #include <errno.h>
#include <div64.h> #include <div64.h>
#include <dfu.h> #include <dfu.h>
#include <mmc.h>
static unsigned char __aligned(CONFIG_SYS_CACHELINE_SIZE) static unsigned char __aligned(CONFIG_SYS_CACHELINE_SIZE)
dfu_file_buf[CONFIG_SYS_DFU_MAX_FILE_SIZE]; dfu_file_buf[CONFIG_SYS_DFU_MAX_FILE_SIZE];
...@@ -20,8 +21,8 @@ static long dfu_file_buf_len; ...@@ -20,8 +21,8 @@ static long dfu_file_buf_len;
static int mmc_block_op(enum dfu_op op, struct dfu_entity *dfu, static int mmc_block_op(enum dfu_op op, struct dfu_entity *dfu,
u64 offset, void *buf, long *len) u64 offset, void *buf, long *len)
{ {
char cmd_buf[DFU_CMD_BUF_SIZE]; struct mmc *mmc = find_mmc_device(dfu->dev_num);
u32 blk_start, blk_count; u32 blk_start, blk_count, n = 0;
/* /*
* We must ensure that we work in lba_blk_size chunks, so ALIGN * We must ensure that we work in lba_blk_size chunks, so ALIGN
...@@ -38,12 +39,28 @@ static int mmc_block_op(enum dfu_op op, struct dfu_entity *dfu, ...@@ -38,12 +39,28 @@ static int mmc_block_op(enum dfu_op op, struct dfu_entity *dfu,
return -EINVAL; return -EINVAL;
} }
sprintf(cmd_buf, "mmc %s %p %x %x", debug("%s: %s dev: %d start: %d cnt: %d buf: 0x%p\n", __func__,
op == DFU_OP_READ ? "read" : "write", op == DFU_OP_READ ? "MMC READ" : "MMC WRITE", dfu->dev_num,
buf, blk_start, blk_count); blk_start, blk_count, buf);
switch (op) {
case DFU_OP_READ:
n = mmc->block_dev.block_read(dfu->dev_num, blk_start,
blk_count, buf);
break;
case DFU_OP_WRITE:
n = mmc->block_dev.block_write(dfu->dev_num, blk_start,
blk_count, buf);
break;
default:
error("Operation not supported\n");
}
debug("%s: %s 0x%p\n", __func__, cmd_buf, cmd_buf); if (n != blk_count) {
return run_command(cmd_buf, 0); error("MMC operation failed");
return -EIO;
}
return 0;
} }
static int mmc_file_buffer(struct dfu_entity *dfu, void *buf, long *len) static int mmc_file_buffer(struct dfu_entity *dfu, void *buf, long *len)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment