usb: dfu: introduce dfuMANIFEST state
v2 cover usb: dfu: introduce dfuMANIFEST state
on nand flash using ubi, after the download of the new image into the flash, the "rest" of the nand sectors get erased while flushing the medium. With current u-boot version dfu-util may show:
Starting download: [##################################################] finished! state(7) = dfuMANIFEST, status(0) = No error condition is present unable to read DFU status
as dfu_get_status is not answered while erasing sectors, if erasing needs some time.
So do the following changes to prevent this:
- introduce dfuManifest state
According to dfu specification [1] section 7:
"the device enters the dfuMANIFEST-SYNC state and awaits the solicitation
of the status report by the host. Upon receipt of the anticipated DFU_GETSTATUS, the device enters the dfuMANIFEST state, where it completes its reprogramming operations."
- when stepping into dfuManifest state, sending a PollTimeout DFU_MANIFEST_POLL_TIMEOUT in ms, to the host, so the host (dfu-util) waits the PollTimeout before sending a get_status again.
Patch 0002-usb-dfu-introduce-dfuMANIFEST-state.patch shows following checkpatch errors, but I think they are OK, as the hole file uses CamelCase for the statenames as this in sync with [1]
CHECK: Avoid CamelCase: <DFU_STATE_dfuMANIFEST>
#103: FILE: drivers/usb/gadget/f_dfu.c:190:
+ f_dfu->dfu_state = DFU_STATE_dfuMANIFEST;
CHECK: Avoid CamelCase: <DFU_STATE_dfuIDLE>
#156: FILE: drivers/usb/gadget/f_dfu.c:491:
+ f_dfu->dfu_state = DFU_STATE_dfuIDLE;
CHECK: Avoid CamelCase: <DFU_STATE_dfuERROR>
#166: FILE: drivers/usb/gadget/f_dfu.c:501:
+ f_dfu->dfu_state = DFU_STATE_dfuERROR;
total: 0 errors, 0 warnings, 3 checks, 133 lines checked
NOTE: Ignored message types: COMPLEX_MACRO CONSIDER_KSTRTO MINMAX MULTISTATEMENT_MACRO_USE_DO_WHILE NETWORKING_BLOCK_COMMENT_STYLE USLEEP_RANGE
[1]:
http://www.usb.org/developers/devclass_docs/usbdfu10.pdf
- changes for v2:
- add Pantelis Antoniou to Cc
- add comment from Marek Vasut
- move comment and "if" back to dfu_write()
- add comment from Lukasz Majewski:
- remove unneccessary comment "end?"
- add Readme entry for DFU_DEFAULT_POLL_TIMEOUT
- remove unneeded flag setpolltimeout
- ToDo:
- look if it is possible to get rid of the constant DFU_MANIFEST_POLL_TIMEOUT for all dfu entities. Maybe as Lukasz suggested:
Add a callback - called e.g. (*poll_timeout) to the struct [mmc|nand]_internal_data. Then some helper functions would be defined at dfu_[mmc|nand].c and used at f_dfu.c so we can decide on a per medium/partition base, how long a PollTimeout would be for a dfu entity ... This can be done in a seperate
step.
Heiko Schocher (3):
usb, dfu: extract flush code into seperate function
usb: dfu: introduce dfuMANIFEST state
am335x, dfu: add DFU_MANIFEST_POLL_TIMEOUT to the siemens boards
README | 10 +++++++ drivers/dfu/dfu.c | 42 +++++++++++++++-------------- drivers/usb/gadget/f_dfu.c | 48 +++++++++++++++++++++++++++++----- include/configs/siemens-am33x-common.h | 1 + include/dfu.h | 4 +++ 5 files changed, 79 insertions(+), 26 deletions(-)
Signature · 1 line
1.8.3.1
PATCH v2 1/3 usb, dfu: extract flush code into seperate function
move the flushing code into an extra function dfu_flush(), so it can be used from other code.
---
- changes for v2
- add comment from Marek Vasut
- move comment and "if" back to dfu_write()
- add comment from Lukasz Majewski:
- remove unneccessary comment
- add Pantelis to Cc
--- drivers/dfu/dfu.c | 40 +++++++++++++++++++++++----------------- include/dfu.h | 1 + 2 files changed, 24 insertions(+), 17 deletions(-)
drivers/dfu/dfu.c +23 -17
@@ -127,6 +127,28 @@ static int dfu_write_buffer_drain(struct dfu_entity *dfu)return ret; } +int dfu_flush (struct dfu_entity *dfu,void *buf,int size,int blk_seq_num) +{ +int ret =0 ; + +if (dfu->flush_medium) + ret = dfu->flush_medium (dfu); + +printf ("\nDFU complete CRC32: 0x%08x\n" , dfu->crc); + +/* clear everything */ +dfu_free_buf (); + dfu->crc =0 ; + dfu->offset =0 ; + dfu->i_blk_seq_num =0 ; + dfu->i_buf_start = dfu_buf; + dfu->i_buf_end = dfu_buf; + dfu->i_buf = dfu->i_buf_start; + dfu->inited =0 ; + +return ret; +} +int dfu_write (struct dfu_entity *dfu,void *buf,int size,int blk_seq_num) {int ret =0 ;
@@ -199,23 +221,7 @@ int dfu_write(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num)/* end? */ if (size ==0 ) { -/* Now try and flush to the medium if needed. */ -if (dfu->flush_medium) - ret = dfu->flush_medium (dfu); -printf ("\nDFU complete CRC32: 0x%08x\n" , dfu->crc); - -/* clear everything */ -dfu_free_buf (); - dfu->crc =0 ; - dfu->offset =0 ; - dfu->i_blk_seq_num =0 ; - dfu->i_buf_start = dfu_buf; - dfu->i_buf_end = dfu_buf; - dfu->i_buf = dfu->i_buf_start; - - dfu->inited =0 ; - - } + ret =dfu_flush (dfu, buf, size, blk_seq_num);return ret =0 ? size : ret; }
include/dfu.h +1 -0
@@ -138,6 +138,7 @@ unsigned long dfu_get_buf_size(void);int dfu_read (struct dfu_entity *de,void *buf,int size,int blk_seq_num);int dfu_write (struct dfu_entity *de,void *buf,int size,int blk_seq_num); +int dfu_flush (struct dfu_entity *de,void *buf,int size,int blk_seq_num);/* Device specific */ #ifdef CONFIG_DFU_MMC extern int dfu_fill_entity_mmc (struct dfu_entity *dfu,char *s);
Signature · 1 line
1.8.3.1
PATCH v2 1/3 usb, dfu: extract flush code into seperate function
Quoted 8 lines · Heiko Schocher
move the flushing code into an extra function
dfu_flush(), so it can be used from other code.Signed-off-by Heiko Schocher <[email protected]>Cc Lukasz Majewski <[email protected]>Cc Kyungmin Park <[email protected]>Cc Marek Vasut <[email protected]>Cc Pantelis Antoniou <[email protected]>
[...]
Quoted 13 lines
drivers/dfu/dfu.c +0
-8@@ -199,23 +221,7 @@ int dfu_write(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num)/* end? */ if (size ==0 ) { -/* Now try and flush to the medium if needed. */ -if (dfu->flush_medium) - ret = dfu->flush_medium (dfu); -printf ("\nDFU complete CRC32: 0x%08x\n" , dfu->crc); - -/* clear everything */ -dfu_free_buf (); - dfu->crc =0 ;
drivers/dfu/dfu.c int dfu_write(struct dfu_entity *dfu, void *buf, int · line 225
Quoted 10 lines
drivers/dfu/dfu.c +1
-9- dfu->offset =0 ; - dfu->i_blk_seq_num =0 ; - dfu->i_buf_start = dfu_buf; - dfu->i_buf_end = dfu_buf; - dfu->i_buf = dfu->i_buf_start; - - dfu->inited =0 ; - - } + ret =dfu_flush (dfu, buf, size, blk_seq_num);
This seems broken, at least because you didn't close the opened brace (see 'if (size == 0) {' .... I can fix this up when applying.
Do you want this in 2014.04 or in -next ?
[...]
Best regards,
Marek Vasut
PATCH v2 1/3 usb, dfu: extract flush code into seperate function
Hello Marek,
Am 18.03.2014 01:21, schrieb Marek Vasut:
Quoted 30 lines · Heiko Schocher
Quoted 8 lines
move the flushing code into an extra function
dfu_flush(), so it can be used from other code.Signed-off-by Heiko Schocher<[email protected]>Cc Lukasz Majewski<[email protected]>Cc Kyungmin Park<[email protected]>Cc Marek Vasut<[email protected]>Cc Pantelis Antoniou<[email protected]>[...]
Quoted 18 lines
drivers/dfu/dfu.c +0
-13@@ -199,23 +221,7 @@ int dfu_write(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num)/* end? */ if (size ==0 ) { -/* Now try and flush to the medium if needed. */ -if (dfu->flush_medium) - ret = dfu->flush_medium (dfu); -printf ("\nDFU complete CRC32: 0x%08x\n" , dfu->crc); - -/* clear everything */ -dfu_free_buf (); - dfu->crc =0 ; - dfu->offset =0 ; - dfu->i_blk_seq_num =0 ; - dfu->i_buf_start = dfu_buf; - dfu->i_buf_end = dfu_buf; - dfu->i_buf = dfu->i_buf_start;
Quoted 8 lines
drivers/dfu/dfu.c int dfu_write(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num) · line 224
Quoted 5 lines
drivers/dfu/dfu.c +1
-4- - dfu->inited =0 ; - - } + ret =dfu_flush (dfu, buf, size, blk_seq_num);This seems broken, at least because you didn't close the opened brace (see 'if (size == 0) {' .... I can fix this up when applying.
Argh... you are right .... patch 2/3 of this series deletes the complete if ... I can send a new version, but if you want to fix it that would be great!
Quoted 1 line
Do you want this in 2014.04 or in -next ?
Hmm.. 2014.04 would be nice, but I think this is Lukasz decision, because I changed the dfu state machine, and maybe he want to see more tests?
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 v2 1/3 usb, dfu: extract flush code into seperate function
Hi Heiko,
Quoted 42 lines
Hello Marek,
Am 18.03.2014 01:21, schrieb Marek Vasut:
Quoted 30 lines · Heiko Schocher
Quoted 8 lines
move the flushing code into an extra function
dfu_flush(), so it can be used from other code.Signed-off-by Heiko Schocher<[email protected]>Cc Lukasz Majewski<[email protected]>Cc Kyungmin Park<[email protected]>Cc Marek Vasut<[email protected]>Cc Pantelis Antoniou<[email protected]>[...]
Quoted 18 lines
drivers/dfu/dfu.c +0
-4@@ -199,23 +221,7 @@ int dfu_write(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num)/* end? */ if (size ==0 ) { -/* Now try and flush to the medium if needed. */ -if (dfu->flush_medium) - ret = dfu->flush_medium (dfu); - printf("\nDFU complete CRC32: 0x%08x\n",
dfu->crc); -drivers/dfu/dfu.c +0
-8-/* clear everything */ -dfu_free_buf (); - dfu->crc =0 ; - dfu->offset =0 ; - dfu->i_blk_seq_num =0 ; - dfu->i_buf_start = dfu_buf; - dfu->i_buf_end = dfu_buf; - dfu->i_buf = dfu->i_buf_start;Quoted 8 lines
drivers/dfu/dfu.c int dfu_write(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num) · line 224
Quoted 5 lines
drivers/dfu/dfu.c +1
-4- - dfu->inited =0 ; - - } + ret =dfu_flush (dfu, buf, size, blk_seq_num);This seems broken, at least because you didn't close the opened brace (see 'if (size == 0) {' .... I can fix this up when applying.
Quoted 3 lines
Argh... you are right .... patch 2/3 of this series deletes the complete if ... I can send a new version, but if you want to fix it that would be great!
In this case, please prepare v3.
Quoted 6 lines
Quoted 2 lines
Do you want this in 2014.04 or in -next ?
Hmm.. 2014.04 would be nice, but I think this is Lukasz decision, because I changed the dfu state machine, and maybe he want to see more tests?
When you send the v3, I will test it for regression and then I will prepare pull request to Tom for v2014.04.
Those patches will be added to u-boot-dfu repository.
Quoted 3 lines
bye,
Heiko
Signature · 5 lines
Best regards, Lukasz Majewski Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
PATCH v2 1/3 usb, dfu: extract flush code into seperate function
Quoted 53 lines · Lukasz Majewski
Hi Heiko,
Quoted 43 lines
Hello Marek,
Am 18.03.2014 01:21, schrieb Marek Vasut:
Quoted 31 lines · Heiko Schocher
Quoted 8 lines
move the flushing code into an extra function
dfu_flush(), so it can be used from other code.Signed-off-by Heiko Schocher<[email protected]>Cc Lukasz Majewski<[email protected]>Cc Kyungmin Park<[email protected]>Cc Marek Vasut<[email protected]>Cc Pantelis Antoniou<[email protected]>[...]
Quoted 19 lines
(quoted diff) +0
-4@@ -199,23 +221,7 @@ int dfu_write(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num) /* end? */ if (size == 0) { - /* Now try and flush to the medium if needed. */ - if (dfu->flush_medium) - ret = dfu->flush_medium(dfu); - printf("\nDFU complete CRC32: 0x%08x\n",
dfu->crc); -drivers/dfu/dfu.c +0
-8-/* clear everything */ -dfu_free_buf (); - dfu->crc =0 ; - dfu->offset =0 ; - dfu->i_blk_seq_num =0 ; - dfu->i_buf_start = dfu_buf; - dfu->i_buf_end = dfu_buf; - dfu->i_buf = dfu->i_buf_start;Quoted 8 lines
drivers/dfu/dfu.c int dfu_write(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num) · line 224
Quoted 5 lines
drivers/dfu/dfu.c +1
-4- - dfu->inited =0 ; - - } + ret =dfu_flush (dfu, buf, size, blk_seq_num);This seems broken, at least because you didn't close the opened brace (see 'if (size == 0) {' .... I can fix this up when applying.
Quoted 3 lines
Argh... you are right .... patch 2/3 of this series deletes the complete if ... I can send a new version, but if you want to fix it that would be great!
In this case, please prepare v3.
Quoted 2 lines
Quoted 1 line
Do you want this in 2014.04 or in -next ?
Quoted 8 lines
Quoted 3 lines
Hmm.. 2014.04 would be nice, but I think this is Lukasz decision, because I changed the dfu state machine, and maybe he want to see more tests?
When you send the v3, I will test it for regression and then I will prepare pull request to Tom for v2014.04.
Those patches will be added to u-boot-dfu repository.
Feel free to test u-boot-usb/master please.
Best regards,
Marek Vasut
PATCH v2 1/3 usb, dfu: extract flush code into seperate function
In reply to Heiko SchocherQuoted 43 lines · Heiko Schocher
Hello Marek,
Am 18.03.2014 01:21, schrieb Marek Vasut:
Quoted 31 lines · Heiko Schocher
Quoted 8 lines
move the flushing code into an extra function
dfu_flush(), so it can be used from other code.Signed-off-by Heiko Schocher<[email protected]>Cc Lukasz Majewski<[email protected]>Cc Kyungmin Park<[email protected]>Cc Marek Vasut<[email protected]>Cc Pantelis Antoniou<[email protected]>[...]
Quoted 19 lines
drivers/dfu/dfu.c +0
-13@@ -199,23 +221,7 @@ int dfu_write(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num)/* end? */ if (size ==0 ) { -/* Now try and flush to the medium if needed. */ -if (dfu->flush_medium) - ret = dfu->flush_medium (dfu); -printf ("\nDFU complete CRC32: 0x%08x\n" , dfu->crc); - -/* clear everything */ -dfu_free_buf (); - dfu->crc =0 ; - dfu->offset =0 ; - dfu->i_blk_seq_num =0 ; - dfu->i_buf_start = dfu_buf; - dfu->i_buf_end = dfu_buf; - dfu->i_buf = dfu->i_buf_start;Quoted 8 lines
drivers/dfu/dfu.c int dfu_write(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num) · line 224
Quoted 5 lines
drivers/dfu/dfu.c +1
-4- - dfu->inited =0 ; - - } + ret =dfu_flush (dfu, buf, size, blk_seq_num);This seems broken, at least because you didn't close the opened brace (see 'if (size == 0) {' .... I can fix this up when applying.
Quoted 3 lines
Argh... you are right .... patch 2/3 of this series deletes the complete if ... I can send a new version, but if you want to fix it that would be great!
OK, fixed up.
Quoted 5 lines
Quoted 1 line
Do you want this in 2014.04 or in -next ?
Hmm.. 2014.04 would be nice, but I think this is Lukasz decision, because I changed the dfu state machine, and maybe he want to see more tests?
OK, let's see.
Best regards,
Marek Vasut
PATCH v2 1/3 usb, dfu: extract flush code into seperate function
In reply to Marek VasutHi Marek,
Quoted 30 lines · Heiko Schocher
Quoted 8 lines
move the flushing code into an extra function
dfu_flush(), so it can be used from other code.Signed-off-by Heiko Schocher <[email protected]>Cc Lukasz Majewski <[email protected]>Cc Kyungmin Park <[email protected]>Cc Marek Vasut <[email protected]>Cc Pantelis Antoniou <[email protected]>[...]
Quoted 18 lines
drivers/dfu/dfu.c +0
-13@@ -199,23 +221,7 @@ int dfu_write(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num)/* end? */ if (size ==0 ) { -/* Now try and flush to the medium if needed. */ -if (dfu->flush_medium) - ret = dfu->flush_medium (dfu); -printf ("\nDFU complete CRC32: 0x%08x\n" , dfu->crc); - -/* clear everything */ -dfu_free_buf (); - dfu->crc =0 ; - dfu->offset =0 ; - dfu->i_blk_seq_num =0 ; - dfu->i_buf_start = dfu_buf; - dfu->i_buf_end = dfu_buf; - dfu->i_buf = dfu->i_buf_start;
Quoted 9 lines
drivers/dfu/dfu.c int dfu_write(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num) · line 224
Quoted 5 lines
drivers/dfu/dfu.c +1
-4- - dfu->inited =0 ; - - } + ret =dfu_flush (dfu, buf, size, blk_seq_num);This seems broken, at least because you didn't close the opened brace (see 'if (size == 0) {' .... I can fix this up when applying.
I was prepared to pull those patches to u-boot-dfu repo today and test them :-).
Afterwards, I would send PR to Tom.
Are you OK with this?
Quoted 1 line
Do you want this in 2014.04 or in -next ?
After testing I would go for 2014.04, if Tom doesn't mind. All in all it "fixes" the DFU state machine - by adding missing states. Up till now we had short cut in the DFU state machine.
Quoted 5 lines
[...]
Best regards,
Marek Vasut
Signature · 5 lines
Best regards, Lukasz Majewski Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
PATCH v2 1/3 usb, dfu: extract flush code into seperate function
Quoted 42 lines · Lukasz Majewski
Hi Marek,
Quoted 31 lines · Heiko Schocher
Quoted 8 lines
move the flushing code into an extra function
dfu_flush(), so it can be used from other code.Signed-off-by Heiko Schocher <[email protected]>Cc Lukasz Majewski <[email protected]>Cc Kyungmin Park <[email protected]>Cc Marek Vasut <[email protected]>Cc Pantelis Antoniou <[email protected]>[...]
Quoted 19 lines
drivers/dfu/dfu.c +0
-13@@ -199,23 +221,7 @@ int dfu_write(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num)/* end? */ if (size ==0 ) { -/* Now try and flush to the medium if needed. */ -if (dfu->flush_medium) - ret = dfu->flush_medium (dfu); -printf ("\nDFU complete CRC32: 0x%08x\n" , dfu->crc); - -/* clear everything */ -dfu_free_buf (); - dfu->crc =0 ; - dfu->offset =0 ; - dfu->i_blk_seq_num =0 ; - dfu->i_buf_start = dfu_buf; - dfu->i_buf_end = dfu_buf; - dfu->i_buf = dfu->i_buf_start;Quoted 8 lines
drivers/dfu/dfu.c int dfu_write(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num) · line 224
Quoted 5 lines
drivers/dfu/dfu.c +1
-4- - dfu->inited =0 ; - - } + ret =dfu_flush (dfu, buf, size, blk_seq_num);This seems broken, at least because you didn't close the opened brace (see 'if (size == 0) {' .... I can fix this up when applying.
Quoted 6 lines
I was prepared to pull those patches to u-boot-dfu repo today and test them :-).
Afterwards, I would send PR to Tom.
Are you OK with this?
Doesn't -dfu go through -usb ? ;-) Or do you want to send to Tom directly ? Either way WFM. Nonetheless, I picked the patches via -usb, they're in master now.
Quoted 5 lines
Quoted 1 line
Do you want this in 2014.04 or in -next ?
After testing I would go for 2014.04, if Tom doesn't mind. All in all it "fixes" the DFU state machine - by adding missing states. Up till now we had short cut in the DFU state machine.
OK
Best regards,
Marek Vasut
PATCH v2 1/3 usb, dfu: extract flush code into seperate function
Hi Marek,
Quoted 45 lines · Lukasz Majewski
Quoted 44 lines
Hi Marek,
Quoted 41 lines · Heiko Schocher
Quoted 8 lines
move the flushing code into an extra function
dfu_flush(), so it can be used from other code.Signed-off-by Heiko Schocher <[email protected]>Cc Lukasz Majewski <[email protected]>Cc Kyungmin Park <[email protected]>Cc Marek Vasut <[email protected]>Cc Pantelis Antoniou <[email protected]>[...]
Quoted 15 lines
(quoted diff) +0
-4@@ -199,23 +221,7 @@ int dfu_write(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num) /* end? */ if (size == 0) { - /* Now try and flush to the medium if needed. */ - if (dfu->flush_medium) - ret = dfu->flush_medium(dfu); - printf("\nDFU complete CRC32: 0x%08x\n",
dfu->crc); -drivers/dfu/dfu.c +0
-3-/* clear everything */ -dfu_free_buf (); - dfu->crc =0 ;drivers/dfu/dfu.c int dfu_write(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num) · line 224
Quoted 10 lines
drivers/dfu/dfu.c +1
-9- dfu->offset =0 ; - dfu->i_blk_seq_num =0 ; - dfu->i_buf_start = dfu_buf; - dfu->i_buf_end = dfu_buf; - dfu->i_buf = dfu->i_buf_start; - - dfu->inited =0 ; - - } + ret =dfu_flush (dfu, buf, size, blk_seq_num);This seems broken, at least because you didn't close the opened brace (see 'if (size == 0) {' .... I can fix this up when applying.
Quoted 8 lines
Quoted 6 lines
I was prepared to pull those patches to u-boot-dfu repo today and test them :-).
Afterwards, I would send PR to Tom.
Are you OK with this?
Doesn't -dfu go through -usb ? ;-)
As fair as I remember the dfu code from ./drivers/dfu/* shall go via u-boot-dfu tree directly to Tom.
Quoted 2 lines
Or do you want to send to Tom
directly ? Either way WFM.
After writing the other message you waited for a response less than one minute :-).
Quoted 2 lines
Nonetheless, I picked the patches via
-usb, they're in master now.
I've just tested them and they doesn't cause any regression.
Would you be so kind and apply one more patch, which was supposed to go with u-boot-dfu PR (this patch waits for submission from 21.02.2014)?
http://patchwork.ozlabs.org/patch/322450/
It is solely drivers/dfu/dfu_mmc.c related.
And I don't want to send PR to Tom with only one patch included.
Quoted 11 lines
Quoted 6 lines
Quoted 2 lines
Do you want this in 2014.04 or in -next ?
After testing I would go for 2014.04, if Tom doesn't mind. All in all it "fixes" the DFU state machine - by adding missing states. Up till now we had short cut in the DFU state machine.
OK
Best regards,
Marek Vasut
Signature · 5 lines
Best regards, Lukasz Majewski Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
PATCH v2 1/3 usb, dfu: extract flush code into seperate function
Quoted 68 lines · Lukasz Majewski
Hi Marek,
Quoted 45 lines · Lukasz Majewski
Quoted 44 lines
Hi Marek,
Quoted 41 lines · Heiko Schocher
Quoted 8 lines
move the flushing code into an extra function
dfu_flush(), so it can be used from other code.Signed-off-by Heiko Schocher <[email protected]>Cc Lukasz Majewski <[email protected]>Cc Kyungmin Park <[email protected]>Cc Marek Vasut <[email protected]>Cc Pantelis Antoniou <[email protected]>[...]
Quoted 15 lines
(quoted diff) +0
-4@@ -199,23 +221,7 @@ int dfu_write(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num) /* end? */ if (size == 0) { - /* Now try and flush to the medium if needed. */ - if (dfu->flush_medium) - ret = dfu->flush_medium(dfu); - printf("\nDFU complete CRC32: 0x%08x\n",
dfu->crc); -drivers/dfu/dfu.c +0
-3-/* clear everything */ -dfu_free_buf (); - dfu->crc =0 ;drivers/dfu/dfu.c int dfu_write(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num) · line 224
Quoted 10 lines
drivers/dfu/dfu.c +1
-9- dfu->offset =0 ; - dfu->i_blk_seq_num =0 ; - dfu->i_buf_start = dfu_buf; - dfu->i_buf_end = dfu_buf; - dfu->i_buf = dfu->i_buf_start; - - dfu->inited =0 ; - - } + ret =dfu_flush (dfu, buf, size, blk_seq_num);This seems broken, at least because you didn't close the opened brace (see 'if (size == 0) {' .... I can fix this up when applying.
Quoted 8 lines
Quoted 6 lines
I was prepared to pull those patches to u-boot-dfu repo today and test them :-).
Afterwards, I would send PR to Tom.
Are you OK with this?
Doesn't -dfu go through -usb ? ;-)
As fair as I remember the dfu code from
./drivers/dfu/*shall go via u-boot-dfu tree directly to Tom.Quoted 2 lines
Or do you want to send to Tom
directly ? Either way WFM.After writing the other message you waited for a response less than one minute :-).
Quoted 2 lines
Nonetheless, I picked the patches via
-usb, they're in master now.
Quoted 6 lines
I've just tested them and they doesn't cause any regression.
Would you be so kind and apply one more patch, which was supposed to go with u-boot-dfu PR (this patch waits for submission from 21.02.2014)?
OK, picked and pushed. I think panto picked it up as well tho, but maybe I unleashed too much mental terror unto him with my OvisLink WL-1100SD that he is paralyzed by it ;-) Panto, I will pick this patch, OK ?
As for the DFU, what do we do about the PRs ? DFU is part of USB, so I shall logically pick the PRs from you and move them to trini, but if you're unhappy about this, we need to talk about that. Tom, Lukasz ... thoughts ?
PATCH v2 1/3 usb, dfu: extract flush code into seperate function
Hi Marek,
Quoted 77 lines · Lukasz Majewski
Quoted 76 lines
Hi Marek,
Quoted 47 lines · Lukasz Majewski
Quoted 46 lines
Hi Marek,
Quoted 43 lines
Quoted 8 lines · Heiko Schocher
move the flushing code into an extra function
dfu_flush(), so it can be used from other code.Signed-off-by Heiko Schocher <[email protected]>Cc Lukasz Majewski <[email protected]>Cc Kyungmin Park <[email protected]>Cc Marek Vasut <[email protected]>Cc Pantelis Antoniou <[email protected]>[...]
Quoted 25 lines
drivers/dfu/dfu.c +0
-1@@ -199,23 +221,7 @@ int dfu_write(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num) /* end? */ if (size == 0) { -/* Now try and flush to the medium if needed. */
drivers/dfu/dfu.c +0
-3-if (dfu->flush_medium) - ret = dfu->flush_medium (dfu); - printf("\nDFU complete CRC32: 0x%08x\n",
dfu->crc); -drivers/dfu/dfu.c +1
-12-/* clear everything */ -dfu_free_buf (); - dfu->crc =0 ; - dfu->offset =0 ; - dfu->i_blk_seq_num =0 ; - dfu->i_buf_start = dfu_buf; - dfu->i_buf_end = dfu_buf; - dfu->i_buf = dfu->i_buf_start; - - dfu->inited =0 ; - - } + ret = dfu_flush(dfu, buf, size,Quoted 1 line
blk_seq_num);This seems broken, at least because you didn't close the opened brace (see 'if (size == 0) {' .... I can fix this up when applying.
Quoted 8 lines
Quoted 6 lines
I was prepared to pull those patches to u-boot-dfu repo today and test them :-).
Afterwards, I would send PR to Tom.
Are you OK with this?
Doesn't -dfu go through -usb ? ;-)
As fair as I remember the dfu code from
./drivers/dfu/*shall go via u-boot-dfu tree directly to Tom.Quoted 2 lines
Or do you want to send to Tom
directly ? Either way WFM.After writing the other message you waited for a response less than one minute :-).
Quoted 2 lines
Nonetheless, I picked the patches via
-usb, they're in master now.I've just tested them and they doesn't cause any regression.
Would you be so kind and apply one more patch, which was supposed to go with u-boot-dfu PR (this patch waits for submission from 21.02.2014)?
Quoted 6 lines
Quoted 1 line
OK, picked and pushed. I think panto picked it up as well tho, but maybe I unleashed too much mental terror unto him with my OvisLink WL-1100SD that he is paralyzed by it ;-) Panto, I will pick this patch, OK ?
This patch looks like a little orphan :-). I'm glad that someone pull it finally.
Quoted 5 lines
As for the DFU, what do we do about the PRs ? DFU is part of USB, so I shall logically pick the PRs from you and move them to trini, but if you're unhappy about this, we need to talk about that. Tom, Lukasz ... thoughts ?
I'm fine with sending PRs to you.
Signature · 5 lines
Best regards, Lukasz Majewski Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
PATCH v2 1/3 usb, dfu: extract flush code into seperate function
Quoted 82 lines · Lukasz Majewski
Hi Marek,
Quoted 80 lines · Lukasz Majewski
Quoted 78 lines
Hi Marek,
Quoted 48 lines · Lukasz Majewski
Quoted 47 lines
Hi Marek,
Quoted 44 lines
On Monday, March 17, 2014 at 11:56:16 AM, Heiko Schocher
Quoted 8 lines · wrote:
move the flushing code into an extra function
dfu_flush(), so it can be used from other code.Signed-off-by Heiko Schocher <[email protected]>Cc Lukasz Majewski <[email protected]>Cc Kyungmin Park <[email protected]>Cc Marek Vasut <[email protected]>Cc Pantelis Antoniou <[email protected]>[...]
Quoted 25 lines
(quoted diff) +0
-1@@ -199,23 +221,7 @@ int dfu_write(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num) /* end? */ if (size == 0) { - /* Now try and flush to the medium ifneeded. */
(quoted diff) +0
-3- if (dfu->flush_medium) - ret = dfu->flush_medium(dfu); - printf("\nDFU complete CRC32: 0x%08x\n",
dfu->crc); -(quoted diff) +1
-12- /* clear everything */ - dfu_free_buf(); - dfu->crc = 0; - dfu->offset = 0; - dfu->i_blk_seq_num = 0; - dfu->i_buf_start = dfu_buf; - dfu->i_buf_end = dfu_buf; - dfu->i_buf = dfu->i_buf_start; - - dfu->inited = 0; - - } + ret = dfu_flush(dfu, buf, size,Quoted 1 line
blk_seq_num);This seems broken, at least because you didn't close the opened brace (see 'if (size == 0) {' .... I can fix this up when applying.
Quoted 8 lines
Quoted 6 lines
I was prepared to pull those patches to u-boot-dfu repo today and test them :-).
Afterwards, I would send PR to Tom.
Are you OK with this?
Doesn't -dfu go through -usb ? ;-)
As fair as I remember the dfu code from
./drivers/dfu/*shall go via u-boot-dfu tree directly to Tom.Quoted 2 lines
Or do you want to send to Tom
directly ? Either way WFM.After writing the other message you waited for a response less than one minute :-).
Quoted 2 lines
Nonetheless, I picked the patches via
-usb, they're in master now.I've just tested them and they doesn't cause any regression.
Would you be so kind and apply one more patch, which was supposed to go with u-boot-dfu PR (this patch waits for submission from 21.02.2014)?
Quoted 7 lines
Quoted 4 lines
OK, picked and pushed. I think panto picked it up as well tho, but maybe I unleashed too much mental terror unto him with my OvisLink WL-1100SD that he is paralyzed by it ;-) Panto, I will pick this patch, OK ?
This patch looks like a little orphan :-). I'm glad that someone pull it finally.
OK.
Quoted 6 lines
Quoted 4 lines
As for the DFU, what do we do about the PRs ? DFU is part of USB, so I shall logically pick the PRs from you and move them to trini, but if you're unhappy about this, we need to talk about that. Tom, Lukasz ... thoughts ?
I'm fine with sending PRs to you.
PR will go out once I do builds.
Marek Vasut
PATCH v2 2/3 usb: dfu: introduce dfuMANIFEST state
In reply to Heiko Schocheron nand flash using ubi, after the download of the new image into the flash, the "rest" of the nand sectors get erased while flushing the medium. With current u-boot version dfu-util may show:
Starting download: [##################################################] finished! state(7) = dfuMANIFEST, status(0) = No error condition is present unable to read DFU status
as get_status is not answered while erasing sectors, if erasing needs some time.
So do the following changes to prevent this:
- introduce dfuManifest state
According to dfu specification
( http://www.usb.org/developers/devclass_docs/usbdfu10.pdf ) section 7:
"the device enters the dfuMANIFEST-SYNC state and awaits the solicitation
of the status report by the host. Upon receipt of the anticipated DFU_GETSTATUS, the device enters the dfuMANIFEST state, where it completes its reprogramming operations."
- when stepping into dfuManifest state, sending a PollTimeout DFU_MANIFEST_POLL_TIMEOUT in ms, to the host, so the host (dfu-util) waits the PollTimeout before sending a get_status again.
---
- changes for v2:
- reworked as patch 01 of this series changed as Marek Vasut commented
-> setting req->length = 0 before calling dfu_flush() not necessary
- add comment from Lukasz Majewski:
- add Pantelis to Cc
- add Readme entry for DFU_DEFAULT_POLL_TIMEOUT
- remove unneeded flag setpolltimeout
---
README | 10 ++++++++++
drivers/dfu/dfu.c | 4 ----
drivers/usb/gadget/f_dfu.c | 48 ++++++++++++++++++++++++++++++++++++++++------
include/dfu.h | 3 +++
4 files changed, 55 insertions(+), 10 deletions(-)README +10 -0
@@ -1525,6 +1525,16 @@ The following options need to be configured: this to the maximum filesize (in bytes) for the buffer. Default is 4 MiB if undefined. + DFU_DEFAULT_POLL_TIMEOUT + Poll timeout [ms], is the timeout a device can send to the + host. The host must wait for this timeout before sending + a subsequent DFU_GET_STATUS request to the device. + + DFU_MANIFEST_POLL_TIMEOUT + Poll timeout [ms], which the device sends to the host when + entering dfuMANIFEST state. Host waits this timeout, before + sending again an USB request to the device. + - Journaling Flash filesystem support: CONFIG_JFFS2_NAND, CONFIG_JFFS2_NAND_OFF, CONFIG_JFFS2_NAND_SIZE, CONFIG_JFFS2_NAND_DEV
drivers/dfu/dfu.c +0 -4
@@ -219,10 +219,6 @@ int dfu_write(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num) ret = tret; } -/* end? */ -if (size ==0 ) { - ret =dfu_flush (dfu, buf, size, blk_seq_num); -return ret =0 ? size : ret; }
drivers/usb/gadget/f_dfu.c +42 -6
93 lines not on this page · raw message
include/dfu.h +3 -0
@@ -80,6 +80,9 @@ static inline unsigned int get_mmc_blk_size(int dev)#ifndef DFU_DEFAULT_POLL_TIMEOUT #define DFU_DEFAULT_POLL_TIMEOUT 0#endif +#ifndef DFU_MANIFEST_POLL_TIMEOUT +#define DFU_MANIFEST_POLL_TIMEOUT DFU_DEFAULT_POLL_TIMEOUT +#endif struct dfu_entity {char name[DFU_NAME_SIZE ];
Signature · 1 line
1.8.3.1
PATCH v2 3/3 am335x, dfu: add DFU_MANIFEST_POLL_TIMEOUT to the siemens boards
In reply to Heiko Schocheras the siemens boards use dfu for updating a nand ubi partition add DFU_MANIFEST_POLL_TIMEOUT to them, so dfu host waits after complete transfer of the new image for DFU_MANIFEST_POLL_TIMEOUT ms before sending again an usb request. So the board have enough time to erase rest of the nand sectors.
---
- changes for v2:
- add Reviewed-by from Lukasz Majewski
- add Pantelis Antoniou to Cc
--- include/configs/siemens-am33x-common.h | 1 + 1 file changed, 1 insertion(+)
include/configs/siemens-am33x-common.h +1 -0
@@ -265,6 +265,7 @@#define CONFIG_DFU_NAND #define CONFIG_CMD_DFU #define CONFIG_SYS_DFU_DATA_BUF_SIZE (1 << 20) +#define DFU_MANIFEST_POLL_TIMEOUT 25000#endif /* CONFIG_SPL_BUILD */
Signature · 1 line
1.8.3.1