dfu ram support
v4 cover dfu ram support
Hi,
DFU spec mentions it as a method to upgrade firmware (software stored in writable non-volatile memory). It also says other potential uses of DFU is beyond scope of the spec.
Here such a beyond the scope use is being attempted - directly pumping binary images from host via USB to RAM. This facility is a developer centric one in that it gives advantage over upgrading non-volatile memory for testing new images every time during development and/or testing.
Directly putting image onto RAM would speed up upgrade process. This and convenience was the initial thoughts that led to doing this, speed improvement over MMC was only 1 second though - 6 sec on RAM as opposed to 7 sec on MMC in beagle bone, perhaps enabling cache and/or optimizing DFU framework to avoid multiple copy for ram (if worth) may help, and on other platforms and other boot media like NAND maybe improvement would be higher.
And for a platform that doesn't yet have proper DFU suppport for non-volatile media's, DFU to RAM can be used.
Another minor advantage would be to increase life of mmc/nand as it would be less used during development/testing.
usage: <image name> ram <start address> <size>
eg. kernel ram 0x81000000 0x1000000
Downloading images to RAM using DFU is not something new, this is acheived in openmoko also.
DFU on RAM can be used for extracting RAM contents to host using dfu upload. Perhaps this can be extended to io for squeezing out register dump through usb, if it is worth.
In addition to ram support, a minor unification of dfu read/write enum's currently duplicated in mmc/nand is done, helping ram support too.
Also dfu ram support is added for am335x SoC based boards.
Based on: usb master branch
Regards
Afzal
v4:
avoid doing prefix increment in argument of simple_strtoul() collect more tags
v3: collected tags, error used instead of printf
v2: unified read/write dfu ops enum, added am335x support
Afzal Mohammed (3):
dfu: unify mmc/nand read/write ops enum
dfu: ram support
am335x_evm: enable DFU RAM
drivers/dfu/Makefile | 1 + drivers/dfu/dfu.c | 7 ++-- drivers/dfu/dfu_mmc.c | 9 ++---- drivers/dfu/dfu_nand.c | 7 +--- drivers/dfu/dfu_ram.c | 77 ++++++++++++++++++++++++++++++++++++++++++++ include/configs/am335x_evm.h | 6 ++++ include/dfu.h | 23 +++++++++++++ 7 files changed, 115 insertions(+), 15 deletions(-) create mode 100644 drivers/dfu/dfu_ram.c
Signature · 1 line
1.8.2.135.g7b592fa
PATCH v4 1/3 dfu: unify mmc/nand read/write ops enum
MMC and NAND independently defines same enumerators for read/write. Unify them by defining enum in dfu header. RAM support that is being added newly also can make use of it.
---
v4: collect more tag
v3: collected tag
v2: new
drivers/dfu/dfu_mmc.c | 9 ++------- drivers/dfu/dfu_nand.c | 7 +------ include/dfu.h | 5 +++++ 3 files changed, 8 insertions(+), 13 deletions(-)
drivers/dfu/dfu_mmc.c +2 -7
@@ -13,16 +13,11 @@#include <div64.h> #include <dfu.h> -enum dfu_mmc_op { -DFU_OP_READ =1 , -DFU_OP_WRITE , -}; -static unsigned char __aligned(CONFIG_SYS_CACHELINE_SIZE) dfu_file_buf[CONFIG_SYS_DFU_MAX_FILE_SIZE ];static long dfu_file_buf_len; -static int mmc_block_op (enum dfu_mmc_op op,struct dfu_entity *dfu, +static int mmc_block_op (enum dfu_op op,struct dfu_entity *dfu,u64 offset,void *buf,long *len) {char cmd_buf[DFU_CMD_BUF_SIZE ];
@@ -65,7 +60,7 @@ static int mmc_file_buffer(struct dfu_entity *dfu, void *buf, long *len)return 0 ; } -static int mmc_file_op (enum dfu_mmc_op op,struct dfu_entity *dfu, +static int mmc_file_op (enum dfu_op op,struct dfu_entity *dfu,void *buf,long *len) {char cmd_buf[DFU_CMD_BUF_SIZE ];
drivers/dfu/dfu_nand.c +1 -6
@@ -19,12 +19,7 @@#include <jffs2/load_kernel.h> #include <nand.h> -enum dfu_nand_op { -DFU_OP_READ =1 , -DFU_OP_WRITE , -}; - -static int nand_block_op (enum dfu_nand_op op,struct dfu_entity *dfu, +static int nand_block_op (enum dfu_op op,struct dfu_entity *dfu,u64 offset,void *buf,long *len) {loff_t start, lim;
include/dfu.h +5 -0
@@ -29,6 +29,11 @@ enum dfu_layout { DFU_FS_EXT4, }; +enum dfu_op { +DFU_OP_READ =1 , +DFU_OP_WRITE , +}; +struct mmc_internal_data {/* RAW programming */ unsigned int lba_start;
Signature · 1 line
1.8.2.135.g7b592fa
PATCH v4 1/3 dfu: unify mmc/nand read/write ops enum
Hello Afzal,
Sorry for the late replay ...
Am 13.09.2013 18:59, schrieb Afzal Mohammed:
Quoted 13 lines
MMC and NAND independently defines same enumerators for read/write. Unify them by defining enum in dfu header. RAM support that is being added newly also can make use of it.
Signed-off-by Afzal Mohammed<[email protected]>Cc Heiko Schocher<[email protected]>Cc Marek Vasut<[email protected]>Cc Lukasz Majewski<[email protected]>Cc Pantelis Antoniou<[email protected]>Acked-by Lukasz Majewski<[email protected]>Acked-by Marek Vasut<[email protected]>---
Quoted 8 lines
v4: collect more tag
v3: collected tag
v2: newdrivers/dfu/dfu_mmc.c | 9 ++------- drivers/dfu/dfu_nand.c | 7 +------ include/dfu.h | 5 +++++ 3 files changed, 8 insertions(+), 13 deletions(-)
Thanks!
bye,
Heiko
Signature · 2 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
PATCH v4 2/3 dfu: ram support
In reply to Afzal MohammedDFU spec mentions it as a method to upgrade firmware (software stored in writable non-volatile memory). It also says other potential uses of DFU is beyond scope of the spec.
Here such a beyond the scope use is being attempted - directly pumping binary images from host via USB to RAM. This facility is a developer centric one in that it gives advantage over upgrading non-volatile memory for testing new images every time during development and/or testing.
Directly putting image onto RAM would speed up upgrade process. This and convenience was the initial thoughts that led to doing this, speed improvement over MMC was only 1 second though - 6 sec on RAM as opposed to 7 sec on MMC in beagle bone, perhaps enabling cache and/or optimizing DFU framework to avoid multiple copy for ram (if worth) may help, and on other platforms and other boot media like NAND maybe improvement would be higher.
And for a platform that doesn't yet have proper DFU suppport for non-volatile media's, DFU to RAM can be used.
Another minor advantage would be to increase life of mmc/nand as it would be less used during development/testing.
usage: <image name> ram <start address> <size>
eg. kernel ram 0x81000000 0x1000000
Downloading images to RAM using DFU is not something new, this is acheived in openmoko also.
DFU on RAM can be used for extracting RAM contents to host using dfu upload. Perhaps this can be extended to io for squeezing out register dump through usb, if it is worth.
---
v4:
avoid doing prefix increment in argument of simple_strtoul() collect more tags
v3: error used instead of printf
v2: remove read/write enumerator define's, instead use new common ones
drivers/dfu/Makefile | 1 + drivers/dfu/dfu.c | 7 +++-- drivers/dfu/dfu_ram.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/dfu.h | 18 ++++++++++++ 4 files changed, 101 insertions(+), 2 deletions(-) create mode 100644 drivers/dfu/dfu_ram.c
drivers/dfu/Makefile +1 -0
@@ -12,6 +12,7 @@ LIB = $(obj)libdfu.o COBJS-$(CONFIG_DFU_FUNCTION) += dfu.o COBJS-$(CONFIG_DFU_MMC) += dfu_mmc.o COBJS-$(CONFIG_DFU_NAND) += dfu_nand.o +COBJS-$(CONFIG_DFU_RAM) += dfu_ram.o SRCS := $(COBJS-y:.o=.c) OBJS := $(addprefix $(obj),$(COBJS-y))
drivers/dfu/dfu.c +5 -2
@@ -348,6 +348,9 @@ static int dfu_fill_entity(struct dfu_entity *dfu, char *s, int alt, }else if (strcmp (interface,"nand" ) ==0 ) {if (dfu_fill_entity_nand (dfu, s))return -1 ; + }else if (strcmp (interface,"ram" ) ==0 ) { +if (dfu_fill_entity_ram (dfu, s)) +return -1 ; }else {printf ("%s: Device %s not (yet) supported!\n" , __func__, interface);
@@ -397,14 +400,14 @@ int dfu_config_entities(char *env, char *interface, int num)const char *dfu_get_dev_type (enum dfu_device_type t) { -const char *dev_t[] = {NULL ,"eMMC" ,"OneNAND" ,"NAND" }; +const char *dev_t[] = {NULL ,"eMMC" ,"OneNAND" ,"NAND" ,"RAM" };return dev_t[t]; }const char *dfu_get_layout (enum dfu_layout l) {const char *dfu_layout[] = {NULL ,"RAW_ADDR" ,"FAT" ,"EXT2" , -"EXT3" ,"EXT4" }; +"EXT3" ,"EXT4" ,"RAM_ADDR" };return dfu_layout[l]; }
drivers/dfu/dfu_ram.c new file +77 -0
77 lines not on this page · raw message
include/dfu.h +18 -0
@@ -19,6 +19,7 @@ enum dfu_device_type {DFU_DEV_MMC =1 ,DFU_DEV_ONENAND ,DFU_DEV_NAND , + DFU_DEV_RAM, }; enum dfu_layout {
@@ -27,6 +28,7 @@ enum dfu_layout {DFU_FS_EXT2 ,DFU_FS_EXT3 ,DFU_FS_EXT4 , + DFU_RAM_ADDR, }; enum dfu_op {
@@ -56,6 +58,11 @@ struct nand_internal_data {unsigned int ubi; }; +struct ram_internal_data { +void *start; +unsigned int size; +}; +static inline unsigned int get_mmc_blk_size (int dev) {return find_mmc_device (dev)->read_bl_len;
@@ -81,6 +88,7 @@ struct dfu_entity {union {struct mmc_internal_data mmc;struct nand_internal_data nand; +struct ram_internal_data ram; } data; int (*read_medium)(struct dfu_entity *dfu,
@@ -143,4 +151,14 @@ static inline int dfu_fill_entity_nand(struct dfu_entity *dfu, char *s) }#endif +#ifdef CONFIG_DFU_RAM +extern int dfu_fill_entity_ram (struct dfu_entity *dfu,char *s); +#else +static inline int dfu_fill_entity_ram (struct dfu_entity *dfu,char *s) +{ +puts ("RAM support not available!\n" ); +return -1 ; +} +#endif +#endif /* __DFU_ENTITY_H_ */
Signature · 1 line
1.8.2.135.g7b592fa
PATCH v4 2/3 dfu: ram support
Hello Afzal,
Am 13.09.2013 19:00, schrieb Afzal Mohammed:
Quoted 50 lines
DFU spec mentions it as a method to upgrade firmware (software stored in writable non-volatile memory). It also says other potential uses of DFU is beyond scope of the spec.
Here such a beyond the scope use is being attempted - directly pumping binary images from host via USB to RAM. This facility is a developer centric one in that it gives advantage over upgrading non-volatile memory for testing new images every time during development and/or testing.
Directly putting image onto RAM would speed up upgrade process. This and convenience was the initial thoughts that led to doing this, speed improvement over MMC was only 1 second though - 6 sec on RAM as opposed to 7 sec on MMC in beagle bone, perhaps enabling cache and/or optimizing DFU framework to avoid multiple copy for ram (if worth) may help, and on other platforms and other boot media like NAND maybe improvement would be higher.
And for a platform that doesn't yet have proper DFU suppport for non-volatile media's, DFU to RAM can be used.
Another minor advantage would be to increase life of mmc/nand as it would be less used during development/testing.
usage:<image name> ram<start address> <size>
eg. kernel ram0x810000000x1000000Downloading images to RAM using DFU is not something new, this is acheived in openmoko also.
DFU on RAM can be used for extracting RAM contents to host using dfu upload. Perhaps this can be extended to io for squeezing out register dump through usb, if it is worth.
Signed-off-by Afzal Mohammed<[email protected]>Cc Heiko Schocher<[email protected]>Cc Marek Vasut<[email protected]>Cc Lukasz Majewski<[email protected]>Cc Pantelis Antoniou<[email protected]>Cc Gerhard Sittig<[email protected]>Acked-by Marek Vasut<[email protected]>Acked-by Lukasz Majewski<[email protected]>---
v4:
avoid doing prefix increment in argument ofsimple_strtoul()collect more tags
v3: error used instead of printf
v2: remove read/write enumerator define's, instead use new common ones
Quoted 6 lines
drivers/dfu/Makefile | 1 + drivers/dfu/dfu.c | 7 +++-- drivers/dfu/dfu_ram.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/dfu.h | 18 ++++++++++++ 4 files changed, 101 insertions(+), 2 deletions(-)create mode 100644
drivers/dfu/dfu_ram.c
Thanks for this work! Hmm... minor comment. Could you add a entry in README?
Beside of that:
bye,
Heiko
Signature · 2 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
PATCH v4 2/3 dfu: ram support
Hi Heiko,
Quoted 6 lines · Heiko Schocher
Thanks for this work! Hmm... minor comment. Could you add a entry in README?
Beside of that:
Acked-by Heiko Schocher <[email protected]>
Thanks, v5 has been posted with README entry.
Regards
Afzal
PATCH v4 3/3 am335x_evm: enable DFU RAM
In reply to Afzal MohammedEnable DFU for RAM, provide example dfu_alt_info
---
v3: collected tag
v2: new
include/configs/am335x_evm.h | 6 ++++++ 1 file changed, 6 insertions(+)
include/configs/am335x_evm.h +6 -0
@@ -100,6 +100,7 @@"loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \"importbootenv=echo Importing environment from mmc ...; " \"env import -t $loadaddr $filesize\0" \ +"dfu_alt_info_ram=" DFU_ALT_INFO_RAM "\0" \"ramargs=setenv bootargs console=${console} " \"${optargs} " \"root=${ramroot} " \
@@ -321,6 +322,11 @@"kernel part 0 8;" \ "rootfs part 0 9"#endif +#define CONFIG_DFU_RAM +#define DFU_ALT_INFO_RAM \ + "kernel ram 0x80200000 0xD80000;" \ + "fdt ram 0x80F80000 0x80000;" \ + "ramdisk ram 0x81000000 0x4000000"/* * Default to using SPI for environment, etc.
Signature · 1 line
1.8.2.135.g7b592fa
v4 cover dfu ram support
In reply to Afzal MohammedDear Afzal Mohammed,
Quoted 39 lines
Hi,
DFU spec mentions it as a method to upgrade firmware (software stored in writable non-volatile memory). It also says other potential uses of DFU is beyond scope of the spec.
Here such a beyond the scope use is being attempted - directly pumping binary images from host via USB to RAM. This facility is a developer centric one in that it gives advantage over upgrading non-volatile memory for testing new images every time during development and/or testing.
Directly putting image onto RAM would speed up upgrade process. This and convenience was the initial thoughts that led to doing this, speed improvement over MMC was only 1 second though - 6 sec on RAM as opposed to 7 sec on MMC in beagle bone, perhaps enabling cache and/or optimizing DFU framework to avoid multiple copy for ram (if worth) may help, and on other platforms and other boot media like NAND maybe improvement would be higher.
And for a platform that doesn't yet have proper DFU suppport for non-volatile media's, DFU to RAM can be used.
Another minor advantage would be to increase life of mmc/nand as it would be less used during development/testing.
usage: <image name> ram <start address> <size>
eg. kernel ram0x810000000x1000000Downloading images to RAM using DFU is not something new, this is acheived in openmoko also.
DFU on RAM can be used for extracting RAM contents to host using dfu upload. Perhaps this can be extended to io for squeezing out register dump through usb, if it is worth.
In addition to ram support, a minor unification of dfu read/write enum's currently duplicated in mmc/nand is done, helping ram support too.
Quoted 6 lines
Also dfu ram support is added for am335x SoC based boards.
Based on: usb master branch
Regards
Afzal
Will wait for Heiko's ACK and then apply for -next.
Best regards,
Marek Vasut