dfu: fix some issues with reads/uploads
PATCH 1/1 dfu: fix some issues with reads/uploads
From: Stephen Warren <[email protected]>
FIXME: reword after updates to use "*size" command for fs...
DFU read support appears to rely upon dfu->read_medium() updating the passed-by-reference len parameter to indicate the remaining size available for reading.
dfu_read_medium_mmc() never does this, and the implementation of dfu_read_medium_nand() will only work if called just once; it hard-codes the value to the total size of the NAND device irrespective of read offset.
I believe that overloading dfu->read_medium() is confusing. As such, this patch introduces a new function dfu->get_medium_size() which can be used to explicitly find out the medium size, and nothing else. dfu_read() is modified to use this function to set the initial value for dfu->r_left, rather than attempting to use the side-effects of dfu->read_medium() for this purpose.
Due to this change, dfu_read() must initially set dfu->b_left to 0, since no data has been read.
dfu_read_buffer_fill() must also be modified not to adjust dfu->r_left when simply copying data from dfu->i_buf_start to the upload request buffer. r_left represents the amount of data left to be read from HW. That value is not affected by the memcpy(), but only by calls to dfu->read_medium().
After this change, I can read from either a 4MB or 1.5MB chunk of a 4MB eMMC boot partion with CONFIG_SYS_DFU_DATA_BUF_SIZE==1MB. Without this change, attempting to do that would result in DFU read returning no data at all due to r_left never being set.
---
v2:
* Fix dfu_get_medium_size_mmc() to handle DFU_FS_FAT/EXT5 layouts too.
* Use "size" command to retrieve file size.
--- drivers/dfu/dfu.c | 19 +++++++++++----- drivers/dfu/dfu_mmc.c | 59 ++++++++++++++++++++++++++++++++++++++++++-------- drivers/dfu/dfu_nand.c | 7 +++++- drivers/dfu/dfu_ram.c | 11 +++++----- include/dfu.h | 3 +++ 5 files changed, 78 insertions(+), 21 deletions(-)
drivers/dfu/dfu.c +13 -6
@@ -241,7 +241,6 @@ static int dfu_read_buffer_fill(struct dfu_entity *dfu, void *buf, int size) dfu->crc =crc32 (dfu->crc, buf, chunk); dfu->i_buf += chunk; dfu->b_left -= chunk; - dfu->r_left -= chunk; size -= chunk; buf += chunk; readn += chunk;
@@ -287,10 +286,18 @@ int dfu_read(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num)if (dfu->i_buf_start ==NULL )return -ENOMEM ; - ret = dfu->read_medium (dfu,0 , dfu->i_buf_start, &dfu->r_left); -if (ret !=0 ) { -debug ("%s: failed to get r_left\n" , __func__); -return ret; + dfu->r_left = dfu->get_medium_size (dfu); +if (dfu->r_left <0 ) +return dfu->r_left; +switch (dfu->layout) { +case DFU_RAW_ADDR : +case DFU_RAM_ADDR : +break ; +default : +if (dfu->r_left >= dfu_buf_size) { +printf ("%s: File too big for buf\b" , __func__); +return -EOVERFLOW ; + } }debug ("%s: %s %ld [B]\n" , __func__, dfu->name, dfu->r_left);
@@ -300,7 +307,7 @@ int dfu_read(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num) dfu->offset =0 ; dfu->i_buf_end =dfu_get_buf () + dfu_buf_size; dfu->i_buf = dfu->i_buf_start; - dfu->b_left =min (dfu_buf_size, dfu->r_left); + dfu->b_left =0 ; dfu->bad_skip =0 ;
drivers/dfu/dfu_mmc.c +50 -9
103 lines not on this page · raw message
drivers/dfu/dfu_nand.c +6 -1
@@ -114,6 +114,11 @@ static int dfu_write_medium_nand(struct dfu_entity *dfu,return ret; } +long dfu_get_medium_size_nand (struct dfu_entity *dfu) +{ +return dfu->data.nand.size; +} +static int dfu_read_medium_nand (struct dfu_entity *dfu,u64 offset,void *buf,long *len) {
@@ -121,7 +126,6 @@ static int dfu_read_medium_nand(struct dfu_entity *dfu, u64 offset, void *buf,switch (dfu->layout) {case DFU_RAW_ADDR : - *len = dfu->data.nand.size; ret =nand_block_read (dfu, offset, buf, len);break ;default :
@@ -220,6 +224,7 @@ int dfu_fill_entity_nand(struct dfu_entity *dfu, char *s)return -1 ; } + dfu->get_medium_size = dfu_get_medium_size_nand; dfu->read_medium = dfu_read_medium_nand; dfu->write_medium = dfu_write_medium_nand; dfu->flush_medium = dfu_flush_medium_nand;
drivers/dfu/dfu_ram.c +6 -5
@@ -41,14 +41,14 @@ static int dfu_write_medium_ram(struct dfu_entity *dfu, u64 offset,return dfu_transfer_medium_ram (DFU_OP_WRITE , dfu, offset, buf, len); } +long dfu_get_medium_size_ram (struct dfu_entity *dfu) +{ +return dfu->data.ram.size; +} +static int dfu_read_medium_ram (struct dfu_entity *dfu,u64 offset,void *buf,long *len) { -if (!*len) { - *len = dfu->data.ram.size; -return 0 ; - } -return dfu_transfer_medium_ram (DFU_OP_READ , dfu, offset, buf, len); }
@@ -69,6 +69,7 @@ int dfu_fill_entity_ram(struct dfu_entity *dfu, char *s) dfu->data.ram.size =simple_strtoul (s, &s,16 ); dfu->write_medium = dfu_write_medium_ram; + dfu->get_medium_size = dfu_get_medium_size_ram; dfu->read_medium = dfu_read_medium_ram; dfu->inited =0 ;
include/dfu.h +3 -0
@@ -35,6 +35,7 @@ enum dfu_layout {enum dfu_op {DFU_OP_READ =1 ,DFU_OP_WRITE , +DFU_OP_SIZE , };struct mmc_internal_data {
@@ -96,6 +97,8 @@ struct dfu_entity {struct ram_internal_data ram; } data; +long (*get_medium_size)(struct dfu_entity *dfu); +int (*read_medium)(struct dfu_entity *dfu,u64 offset,void *buf,long *len);
Signature · 1 line
1.8.1.5
PATCH 1/1 dfu: fix some issues with reads/uploads
Quoted 7 lines · Stephen Warren
From: Stephen Warren <[email protected]>
FIXME: reword after updates to use "*size" command for fs...
DFU read support appears to rely upon
dfu->read_medium()updating the passed-by-reference len parameter to indicate the remaining size available for reading.
Crap, ignore this. I passed the wrong commit ID to git format-patch and didn't notice:-(