Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-17 02:15:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

dfu: allow dfu read on partition greater than 2GB

Browse source 
solve issue on get_medium_size() function
the detection of error is a simple test < 0
but for ARM platform, long is 32bits and 2GB = 0x80000000
is seen as error.

I solve the issue by changing the prototype fo the function
to separate size and result.
This patch prepare the next patch with size change to u64.

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
This commit is contained in:
Patrick Delaunay 2017-07-19 16:39:22 +02:00 • committed by Marek Vasut
parent bab0146ea9
commit 4de512018b
6 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/dfu/dfu.c
View file

@ -339,9 +339,9 @@ int dfu_read(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num)
if (dfu->i_buf_start == NULL) if (dfu->i_buf_start == NULL)
return -ENOMEM; return -ENOMEM;
dfu->r_left = dfu->get_medium_size(dfu); ret = dfu->get_medium_size(dfu, &dfu->r_left);
if (dfu->r_left < 0) if (ret < 0)
return dfu->r_left; return ret;
debug("%s: %s %ld [B]\n", __func__, dfu->name, dfu->r_left); debug("%s: %s %ld [B]\n", __func__, dfu->name, dfu->r_left);

12
drivers/dfu/dfu_mmc.c
View file

@ -209,23 +209,23 @@ int dfu_flush_medium_mmc(struct dfu_entity *dfu)
return ret; return ret;
} }
long dfu_get_medium_size_mmc(struct dfu_entity *dfu) int dfu_get_medium_size_mmc(struct dfu_entity *dfu, long *size)
{ {
int ret; int ret;
long len;
switch (dfu->layout) { switch (dfu->layout) {
case DFU_RAW_ADDR: case DFU_RAW_ADDR:
return dfu->data.mmc.lba_size * dfu->data.mmc.lba_blk_size; *size = dfu->data.mmc.lba_size * dfu->data.mmc.lba_blk_size;
return 0;
case DFU_FS_FAT: case DFU_FS_FAT:
case DFU_FS_EXT4: case DFU_FS_EXT4:
dfu_file_buf_filled = -1; dfu_file_buf_filled = -1;
ret = mmc_file_op(DFU_OP_SIZE, dfu, NULL, &len); ret = mmc_file_op(DFU_OP_SIZE, dfu, NULL, size);
if (ret < 0) if (ret < 0)
return ret; return ret;
if (len > CONFIG_SYS_DFU_MAX_FILE_SIZE) if (*size > CONFIG_SYS_DFU_MAX_FILE_SIZE)
return -1; return -1;
return len; return 0;
default: default:
printf("%s: Layout (%s) not (yet) supported!\n", __func__, printf("%s: Layout (%s) not (yet) supported!\n", __func__,
dfu_get_layout(dfu->layout)); dfu_get_layout(dfu->layout));

6
drivers/dfu/dfu_nand.c
View file

@ -114,9 +114,11 @@ static int dfu_write_medium_nand(struct dfu_entity *dfu,
return ret; return ret;
} }
long dfu_get_medium_size_nand(struct dfu_entity *dfu) int dfu_get_medium_size_nand(struct dfu_entity *dfu, long *size)
{ {
return dfu->data.nand.size; *size = dfu->data.nand.size;
return 0;
} }
static int dfu_read_medium_nand(struct dfu_entity *dfu, u64 offset, void *buf, static int dfu_read_medium_nand(struct dfu_entity *dfu, u64 offset, void *buf,

6
drivers/dfu/dfu_ram.c
View file

@ -41,9 +41,11 @@ static int dfu_write_medium_ram(struct dfu_entity *dfu, u64 offset,
return dfu_transfer_medium_ram(DFU_OP_WRITE, dfu, offset, buf, len); return dfu_transfer_medium_ram(DFU_OP_WRITE, dfu, offset, buf, len);
} }
long dfu_get_medium_size_ram(struct dfu_entity *dfu) int dfu_get_medium_size_ram(struct dfu_entity *dfu, long *size)
{ {
return dfu->data.ram.size; *size = dfu->data.ram.size;
return 0;
} }
static int dfu_read_medium_ram(struct dfu_entity *dfu, u64 offset, static int dfu_read_medium_ram(struct dfu_entity *dfu, u64 offset,

6
drivers/dfu/dfu_sf.c
View file

@ -12,9 +12,11 @@
#include <spi.h> #include <spi.h>
#include <spi_flash.h> #include <spi_flash.h>
static long dfu_get_medium_size_sf(struct dfu_entity *dfu) static int dfu_get_medium_size_sf(struct dfu_entity *dfu, long *size)
{ {
return dfu->data.sf.size; *size = dfu->data.sf.size;
return 0;
} }
static int dfu_read_medium_sf(struct dfu_entity *dfu, u64 offset, void *buf, static int dfu_read_medium_sf(struct dfu_entity *dfu, u64 offset, void *buf,

2
include/dfu.h
View file

@ -110,7 +110,7 @@ struct dfu_entity {
struct sf_internal_data sf; struct sf_internal_data sf;
} data; } data;
long (*get_medium_size)(struct dfu_entity *dfu); int (*get_medium_size)(struct dfu_entity *dfu, long *size);
int (*read_medium)(struct dfu_entity *dfu, int (*read_medium)(struct dfu_entity *dfu,
u64 offset, void *buf, long *len); u64 offset, void *buf, long *len);