In thor's download_tail() function, dfu_get_entity() is called before each dfu_write() call and the returned entity pointers are the same. So dfu_get_entity() can be called just once and this patch changes this.

Signed-off-by: Przemyslaw Marczak p.marczak@samsung.com Cc: Lukasz Majewski l.majewski@samsung.com Cc: Marek Vasut marex@denx.de Cc: Heiko Schocher hs@denx.de Cc: Tom Rini trini@ti.com

--- Changes v2: - separate fix and cleanup into two commits

Changes v3: - download_tail(): add exit label --- drivers/usb/gadget/f_thor.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c index f5c0224..1190c74 100644 --- a/drivers/usb/gadget/f_thor.c +++ b/drivers/usb/gadget/f_thor.c @@ -204,17 +204,17 @@ static long long int download_head(unsigned long long total,

static int download_tail(long long int left, int cnt) { + struct dfu_entity *dfu_entity = dfu_get_entity(alt_setting_num); void *transfer_buffer = dfu_get_buf(); int ret;

debug("%s: left: %llu cnt: %d\n", __func__, left, cnt);

if (left) { - ret = dfu_write(dfu_get_entity(alt_setting_num), - transfer_buffer, left, cnt++); + ret = dfu_write(dfu_entity, transfer_buffer, left, cnt++); if (ret) { error("DFU write failed [%d]: left: %llu", ret, left); - return ret; + goto exit; } }

@@ -225,11 +225,11 @@ static int download_tail(long long int left, int cnt) * This also frees memory malloc'ed by dfu_get_buf(), so no explicit * need fo call dfu_free_buf() is needed. */ - ret = dfu_write(dfu_get_entity(alt_setting_num), - transfer_buffer, 0, cnt); + ret = dfu_write(dfu_entity, transfer_buffer, 0, cnt); if (ret) error("DFU write failed [%d] cnt: %d", ret, cnt);

+exit: return ret; }

Hi Przemyslaw,

Since dfu read/write operations needs to be flushed manually, writing to filesystem on MMC by thor was broken. MMC raw write actually is working fine because current dfu_flush() function writes filesystem only. This commit adds dfu_flush() to f_thor and now filesystem write is working.

This change was tested on Trats2 board.

Signed-off-by: Przemyslaw Marczak p.marczak@samsung.com Cc: Lukasz Majewski l.majewski@samsung.com Cc: Marek Vasut marex@denx.de Cc: Heiko Schocher hs@denx.de Cc: Tom Rini trini@ti.com

---

Changes v2:

• separate fix and cleanup into two commits

Changes v3:

• none

---

drivers/usb/gadget/f_thor.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c index 1190c74..1420606 100644 --- a/drivers/usb/gadget/f_thor.c +++ b/drivers/usb/gadget/f_thor.c @@ -226,8 +226,14 @@ static int download_tail(long long int left, int cnt) * need fo call dfu_free_buf() is needed. */ ret = dfu_write(dfu_entity, transfer_buffer, 0, cnt);

I think this dfu_write() call can be now removed, since what we expect now is to call the dfu_flush() here.

After this change please accordingly update the above comment.

• if (ret)

• if (ret) { error("DFU write failed [%d] cnt: %d", ret, cnt);

• goto exit;
  

• }
• ret = dfu_flush(dfu_entity, transfer_buffer, 0, cnt);
• if (ret)

• error("DFU flush failed!");
  
  

exit: return ret;

In thor's download_tail() function, dfu_get_entity() is called before each dfu_write() call and the returned entity pointers are the same. So dfu_get_entity() can be called just once and this patch changes this.

Signed-off-by: Przemyslaw Marczak p.marczak@samsung.com Cc: Lukasz Majewski l.majewski@samsung.com Cc: Marek Vasut marex@denx.de Cc: Heiko Schocher hs@denx.de Cc: Tom Rini trini@ti.com

--- Changes v2: - separate fix and cleanup into two commits

Changes v3: - download_tail(): add exit label

Changes v4: - none --- drivers/usb/gadget/f_thor.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c index f5c0224..1190c74 100644 --- a/drivers/usb/gadget/f_thor.c +++ b/drivers/usb/gadget/f_thor.c @@ -204,17 +204,17 @@ static long long int download_head(unsigned long long total,

static int download_tail(long long int left, int cnt) { + struct dfu_entity *dfu_entity = dfu_get_entity(alt_setting_num); void *transfer_buffer = dfu_get_buf(); int ret;

debug("%s: left: %llu cnt: %d\n", __func__, left, cnt);

if (left) { - ret = dfu_write(dfu_get_entity(alt_setting_num), - transfer_buffer, left, cnt++); + ret = dfu_write(dfu_entity, transfer_buffer, left, cnt++); if (ret) { error("DFU write failed [%d]: left: %llu", ret, left); - return ret; + goto exit; } }

@@ -225,11 +225,11 @@ static int download_tail(long long int left, int cnt) * This also frees memory malloc'ed by dfu_get_buf(), so no explicit * need fo call dfu_free_buf() is needed. */ - ret = dfu_write(dfu_get_entity(alt_setting_num), - transfer_buffer, 0, cnt); + ret = dfu_write(dfu_entity, transfer_buffer, 0, cnt); if (ret) error("DFU write failed [%d] cnt: %d", ret, cnt);

+exit: return ret; }

Before dfu write and flush operations separation, dfu write data was flushed by host download request with len of zero size.

Since above change manually calling dfu write with zero size has non sense (e.g. in THOR). This should be done by flush operation. So now dfu_write_buffer_drain() is called in dfu_flush(). If there is any raw data to flush (like it can be in thor) then it will be physically written to medium.

Signed-off-by: Przemyslaw Marczak p.marczak@samsung.com

--- Changes v4: - new commit --- drivers/dfu/dfu.c | 4 ++++ 1 file changed, 4 insertions(+)

diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c index 8a09aaf..94e9116 100644 --- a/drivers/dfu/dfu.c +++ b/drivers/dfu/dfu.c @@ -131,6 +131,10 @@ int dfu_flush(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num) { int ret = 0;

+ ret = dfu_write_buffer_drain(dfu); + if (ret) + return ret; + if (dfu->flush_medium) ret = dfu->flush_medium(dfu);