From: Bean Huo <beanhuo@xxxxxxxxxx>
Add FFU mode 5 which enters FFU mode with CMD6, followed by repeated CMD24 commands to perform
single-block writes for the firmware download. After downloading all firmware data, CMD6 is issued
to exit FFU mode.
Signed-off-by: Bean Huo <beanhuo@xxxxxxxxxx>
---
mmc.c | 3 ++-
mmc_ffu.c | 16 ++++++++++++----
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/mmc.c b/mmc.c
index 2fdfdce..8f71a51 100644
--- a/mmc.c
+++ b/mmc.c
@@ -236,7 +236,8 @@ static struct Command commands[] = {
" -m 1: Default mode (CMD6+CMD23+CMD25+CMD6 repeated), may exit FFU mode if the firmware size exceeds chunk size.\n"
" -m 2: FFU mode 2 (enter FFU mode, CMD23+CMD25 repeated, exit FFU mode), stays in FFU mode until firmware download completes.\n"
" -m 3: FFU mode 3 (enter FFU mode, CMD25+CMD12 repeated, exit FFU mode), stays in FFU mode until firmware download completes.\n"
- " -m 4: FFU mode 4 (CMD6+CMD24+CMD6 repeated), exits FFU mode after each cycle.\n",
+ " -m 4: FFU mode 4 (CMD6+CMD24+CMD6 repeated), exits FFU mode after each cycle.\n"
+ " -m 5: FFU mode 5 (CMD6 enter FFU mode, CMD24 repeated, CMD6 exit FFU mode) stays in FFU mode until firmware download completes.\n",
NULL
},
{ do_erase, -4,
diff --git a/mmc_ffu.c b/mmc_ffu.c
index fff7b11..5e3c59f 100644
--- a/mmc_ffu.c
+++ b/mmc_ffu.c
@@ -60,6 +60,9 @@ static void set_ffu_download_cmd(struct mmc_ioc_multi_cmd *multi_cmd, __u8 *ext_
set_single_cmd(&multi_cmd->cmds[1], MMC_WRITE_BLOCK, 1, 1, arg);
mmc_ioc_cmd_set_data(multi_cmd->cmds[1], buf + offset);
fill_switch_cmd(&multi_cmd->cmds[2], EXT_CSD_MODE_CONFIG, EXT_CSD_NORMAL_MODE);
+ } else {
+ set_single_cmd(&multi_cmd->cmds[0], MMC_WRITE_BLOCK, 1, 1, arg);
+ mmc_ioc_cmd_set_data(multi_cmd->cmds[0], buf + offset);
}
}
@@ -148,6 +151,8 @@ static int do_ffu_download(int *dev_fd, __u8 *ext_csd, __u8 *fw_buf, off_t fw_si
num_of_cmds = 2;
else if (ffu_mode == 4)
num_of_cmds = 3;
+ else if (ffu_mode == 5)
+ num_of_cmds = 1;
/* allocate maximum required */
multi_cmd = calloc(1, sizeof(struct mmc_ioc_multi_cmd) + num_of_cmds * sizeof(struct mmc_ioc_cmd));
@@ -169,11 +174,14 @@ do_retry:
/* prepare multi_cmd for FFU based on cmd to be used */
set_ffu_download_cmd(multi_cmd, ext_csd, bytes_per_loop, fw_buf, off, ffu_mode);
- /* send ioctl with multi-cmd, download firmware bundle */
- ret = ioctl(*dev_fd, MMC_IOC_MULTI_CMD, multi_cmd);
+ if (num_of_cmds > 1)
+ /* send ioctl with multi-cmd, download firmware bundle */
+ ret = ioctl(*dev_fd, MMC_IOC_MULTI_CMD, multi_cmd);
+ else
+ ret = ioctl(*dev_fd, MMC_IOC_CMD, &multi_cmd->cmds[0]);
if (ret) {
- perror("Multi-cmd ioctl");
+ perror("ioctl failed!");
/*
* In case multi-cmd ioctl failed before exiting from
* ffu mode
@@ -245,7 +253,7 @@ int do_ffu(int nargs, char **argv)
break;
case 'm':
ffu_mode = atoi(optarg);
- if (ffu_mode > 4) {
+ if (ffu_mode > 5) {
fprintf(stderr, "Unsupported ffu mode `%d'.\n", ffu_mode);
abort();
}
--
2.34.1
