summaryrefslogtreecommitdiff
path: root/include/dfu.h
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2014-06-11 12:47:27 -0600
committerTom Rini <trini@ti.com>2014-08-09 11:16:58 -0400
commit0e285b503c41bb53f6ef962e6f9c942c1ca47cc6 (patch)
tree13afc6c76327bf9d581e141e786ac802faf9c6c5 /include/dfu.h
parentcf6598193aed5de8855eaf70c1994f2bc437255a (diff)
downloadu-boot-imx-0e285b503c41bb53f6ef962e6f9c942c1ca47cc6.zip
u-boot-imx-0e285b503c41bb53f6ef962e6f9c942c1ca47cc6.tar.gz
u-boot-imx-0e285b503c41bb53f6ef962e6f9c942c1ca47cc6.tar.bz2
dfu: fix some issues with reads/uploads
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. Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'include/dfu.h')
-rw-r--r--include/dfu.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/dfu.h b/include/dfu.h
index 26ffbc8..df72031 100644
--- a/include/dfu.h
+++ b/include/dfu.h
@@ -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);