Hi everyone,
Here is the rebased patch.
Add the check if the whole firmware was loaded.
Cleaned up the leftovers of handling the file in chunks.
Signed-off-by: Bruno Matic <bruno.matic@xxxxxxxxx>
---
mmc_cmds.c | 67 +++++++++++++++++++++++++++---------------------------
1 file changed, 33 insertions(+), 34 deletions(-)
diff --git a/mmc_cmds.c b/mmc_cmds.c
index 8d7910e..d017b64 100644
--- a/mmc_cmds.c
+++ b/mmc_cmds.c
@@ -2812,7 +2812,6 @@ int do_ffu(int nargs, char **argv)
__u8 *buf = NULL;
__u32 arg;
off_t fw_size;
- ssize_t chunk_size;
char *device;
struct mmc_ioc_multi_cmd *multi_cmd = NULL;
@@ -2926,45 +2925,45 @@ int do_ffu(int nargs, char **argv)
multi_cmd->cmds[3].flags = MMC_RSP_SPI_R1B | MMC_RSP_R1B | MMC_CMD_AC;
multi_cmd->cmds[3].write_flag = 1;
-do_retry:
- /* read firmware chunk */
+ /* read firmware */
lseek(img_fd, 0, SEEK_SET);
- chunk_size = read(img_fd, buf, fw_size);
+ if (read(img_fd, buf, fw_size) != fw_size) {
+ fprintf(stderr, "Could not read the whole firmware file\n");
+ ret = -ENOSPC;
+ goto out;
+ }
- if (chunk_size > 0) {
- /* send ioctl with multi-cmd */
- ret = ioctl(dev_fd, MMC_IOC_MULTI_CMD, multi_cmd);
+do_retry:
+ /* send ioctl with multi-cmd */
+ ret = ioctl(dev_fd, MMC_IOC_MULTI_CMD, multi_cmd);
- if (ret) {
- perror("Multi-cmd ioctl");
- /* In case multi-cmd ioctl failed before exiting from ffu mode */
- ioctl(dev_fd, MMC_IOC_CMD, &multi_cmd->cmds[3]);
- goto out;
- }
+ if (ret) {
+ perror("Multi-cmd ioctl");
+ /* In case multi-cmd ioctl failed before exiting from ffu mode */
+ ioctl(dev_fd, MMC_IOC_CMD, &multi_cmd->cmds[3]);
+ goto out;
+ }
- ret = read_extcsd(dev_fd, ext_csd);
- if (ret) {
- fprintf(stderr, "Could not read EXT_CSD from %s\n", device);
- goto out;
- }
+ ret = read_extcsd(dev_fd, ext_csd);
+ if (ret) {
+ fprintf(stderr, "Could not read EXT_CSD from %s\n", device);
+ goto out;
+ }
- /* Test if we need to restart the download */
- sect_done = ext_csd[EXT_CSD_NUM_OF_FW_SEC_PROG_0] |
- ext_csd[EXT_CSD_NUM_OF_FW_SEC_PROG_1] << 8 |
- ext_csd[EXT_CSD_NUM_OF_FW_SEC_PROG_2] << 16 |
- ext_csd[EXT_CSD_NUM_OF_FW_SEC_PROG_3] << 24;
- /* By spec, host should re-start download from the first sector if sect_done is 0 */
- if (sect_done == 0) {
- if (retry > 0) {
- retry--;
- fprintf(stderr, "Programming failed. Retrying... (%d)\n", retry);
- goto do_retry;
- }
- fprintf(stderr, "Programming failed! Aborting...\n");
- goto out;
- } else {
- fprintf(stderr, "Programmed %d/%jd bytes\r", sect_done * sect_size, (intmax_t)fw_size);
+ /* Test if we need to restart the download */
+ sect_done = ext_csd[EXT_CSD_NUM_OF_FW_SEC_PROG_0] |
+ ext_csd[EXT_CSD_NUM_OF_FW_SEC_PROG_1] << 8 |
+ ext_csd[EXT_CSD_NUM_OF_FW_SEC_PROG_2] << 16 |
+ ext_csd[EXT_CSD_NUM_OF_FW_SEC_PROG_3] << 24;
+ /* By spec, host should re-start download from the first sector if sect_done is 0 */
+ if (sect_done == 0) {
+ if (retry > 0) {
+ retry--;
+ fprintf(stderr, "Programming failed. Retrying... (%d)\n", retry);
+ goto do_retry;
}
+ fprintf(stderr, "Programming failed! Aborting...\n");
+ goto out;
}
if ((sect_done * sect_size) == fw_size) {
Best regards,
Bruno Matić
-----Original Message-----
From: Avri Altman <Avri.Altman@xxxxxxx>
Sent: Thursday, July 7, 2022 2:00 PM
To: Matic, Bruno (Nokia - DE/Ulm) <bruno.matic@xxxxxxxxx>; linux-mmc@xxxxxxxxxxxxxxx
Cc: Ulf Hansson <ulf.hansson@xxxxxxxxxx>; Christian Löhle <CLoehle@xxxxxxxxxxxxxx>
Subject: RE: [PATCH] mmc-utils: correct and clean up the file handling
> Hi everyone,
>
> If I may ask if there is any update on the state of the merge since I
> can't see anything in the git log.
I am following this - Ulf didn't pick it up yet.
Will ping you once he will.
Thanks,
Avri
>
> Best regards,
> Bruno Matić
>
> -----Original Message-----
> From: Matic, Bruno (Nokia - DE/Ulm)
> Sent: Wednesday, June 29, 2022 9:33 AM
> To: Avri Altman <Avri.Altman@xxxxxxx>; linux-mmc@xxxxxxxxxxxxxxx
> Cc: Ulf Hansson <ulf.hansson@xxxxxxxxxx>; Christian Löhle
> <CLoehle@xxxxxxxxxxxxxx>
> Subject: RE: [PATCH] mmc-utils: correct and clean up the file handling
>
> Hi Avri,
>
> That is ok, I will wait.
>
> Best regards,
> Bruno Matić
>
> -----Original Message-----
> From: Avri Altman <Avri.Altman@xxxxxxx>
> Sent: Tuesday, June 28, 2022 11:56 PM
> To: Matic, Bruno (Nokia - DE/Ulm) <bruno.matic@xxxxxxxxx>; linux-
> mmc@xxxxxxxxxxxxxxx
> Cc: Ulf Hansson <ulf.hansson@xxxxxxxxxx>; Christian Löhle
> <CLoehle@xxxxxxxxxxxxxx>
> Subject: RE: [PATCH] mmc-utils: correct and clean up the file handling
>
> Hi Bruno,
> Thank you for your patch.
>
> > Add the check if the whole firmware was loaded.
> > Cleaned up the leftovers of handling the file in chunks.
> >
> > Signed-off-by: Bruno Matic <bruno.matic@xxxxxxxxx>
> Christian proposed a fix to do_ffu about a week ago, see e.g.
> https://www.spinics.net/lists/linux-mmc/msg70961.html.
>
> Would you mind waiting for few more days to allow it to finalize, And
> then rebase your change and resend?
>
> Thanks,
> Avri
>
> > ---
> > mmc_cmds.c | 69
> > +++++++++++++++++++++++++++---------------------------
> > 1 file changed, 34 insertions(+), 35 deletions(-)
> >
> > diff --git a/mmc_cmds.c b/mmc_cmds.c index 70480df..e64c747 100644
> > --- a/mmc_cmds.c
> > +++ b/mmc_cmds.c
> > @@ -2812,7 +2812,6 @@ int do_ffu(int nargs, char **argv)
> > __u8 *buf = NULL;
> > __u32 arg;
> > off_t fw_size;
> > - ssize_t chunk_size;
> > char *device;
> > struct mmc_ioc_multi_cmd *multi_cmd = NULL;
> > __u32 blocks = 1;
> > @@ -2925,45 +2924,45 @@ int do_ffu(int nargs, char **argv)
> > multi_cmd->cmds[3].flags = MMC_RSP_SPI_R1B | MMC_RSP_R1B |
> > MMC_CMD_AC;
> > multi_cmd->cmds[3].write_flag = 1;
> >
> > -do_retry:
> > - /* read firmware chunk */
> > + /* read firmware */
> > lseek(img_fd, 0, SEEK_SET);
> > - chunk_size = read(img_fd, buf, fw_size);
> > + if (read(img_fd, buf, fw_size) != fw_size) {
> > + fprintf(stderr, "Could not read the whole firmware file\n");
> > + ret = -ENOSPC;
> > + goto out;
> > + }
> >
> > - if (chunk_size > 0) {
> > - /* send ioctl with multi-cmd */
> > - ret = ioctl(dev_fd, MMC_IOC_MULTI_CMD, multi_cmd);
> > +do_retry:
> > + /* send ioctl with multi-cmd */
> > + ret = ioctl(dev_fd, MMC_IOC_MULTI_CMD, multi_cmd);
> >
> > - if (ret) {
> > - perror("Multi-cmd ioctl");
> > - /* In case multi-cmd ioctl failed before exiting from ffu mode
> */
> > - ioctl(dev_fd, MMC_IOC_CMD, &multi_cmd->cmds[3]);
> > - goto out;
> > - }
> > + if (ret) {
> > + perror("Multi-cmd ioctl");
> > + /* In case multi-cmd ioctl failed before exiting from ffu mode */
> > + ioctl(dev_fd, MMC_IOC_CMD, &multi_cmd->cmds[3]);
> > + goto out;
> > + }
> >
> > - ret = read_extcsd(dev_fd, ext_csd);
> > - if (ret) {
> > - fprintf(stderr, "Could not read EXT_CSD from %s\n", device);
> > - goto out;
> > - }
> > + ret = read_extcsd(dev_fd, ext_csd);
> > + if (ret) {
> > + fprintf(stderr, "Could not read EXT_CSD from %s\n", device);
> > + goto out;
> > + }
> >
> > - /* Test if we need to restart the download */
> > - sect_done = ext_csd[EXT_CSD_NUM_OF_FW_SEC_PROG_0] |
> > - ext_csd[EXT_CSD_NUM_OF_FW_SEC_PROG_1] << 8 |
> > - ext_csd[EXT_CSD_NUM_OF_FW_SEC_PROG_2] << 16 |
> > - ext_csd[EXT_CSD_NUM_OF_FW_SEC_PROG_3] << 24;
> > - /* By spec, host should re-start download from the first sector if
> > sect_done is 0 */
> > - if (sect_done == 0) {
> > - if (retry > 0) {
> > - retry--;
> > - fprintf(stderr, "Programming failed. Retrying... (%d)\n",
> > retry);
> > - goto do_retry;
> > - }
> > - fprintf(stderr, "Programming failed! Aborting...\n");
> > - goto out;
> > - } else {
> > - fprintf(stderr, "Programmed %d/%jd bytes\r", sect_done *
> > sect_size, (intmax_t)fw_size);
> > + /* Test if we need to restart the download */
> > + sect_done = ext_csd[EXT_CSD_NUM_OF_FW_SEC_PROG_0] |
> > + ext_csd[EXT_CSD_NUM_OF_FW_SEC_PROG_1] << 8 |
> > + ext_csd[EXT_CSD_NUM_OF_FW_SEC_PROG_2] << 16 |
> > + ext_csd[EXT_CSD_NUM_OF_FW_SEC_PROG_3] << 24;
> > + /* By spec, host should re-start download from the first
> > + sector if
> > sect_done is 0 */
> > + if (sect_done == 0) {
> > + if (retry > 0) {
> > + retry--;
> > + fprintf(stderr, "Programming failed. Retrying... (%d)\n", retry);
> > + goto do_retry;
> > }
> > + fprintf(stderr, "Programming failed! Aborting...\n");
> > + goto out;
> > }
> >
> > if ((sect_done * sect_size) == fw_size) {
