usb: dfu: decrease dfu->r_left along with the transfer
RFC PATCH 1/2 usb: dfu: decrease dfu->r_left along with the transfer
The value of dfu->r_left need decrease along with the transfer
--- drivers/dfu/dfu.c | 1 + 1 file changed, 1 insertion(+)
drivers/dfu/dfu.c +1 -0
@@ -229,6 +229,7 @@ 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;
Signature · 1 line
1.7.9.5
RFC PATCH 2/2 usb: dfu: correct dfu buffer inited value
After dfu buffer is initialized, the buffer should be all available, while not 0. Initialize its value to min(dfu_buf_size, dfu->r_left).
--- drivers/dfu/dfu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dfu/dfu.c +1 -1
@@ -288,7 +288,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 =0 ; + dfu->b_left =min (dfu_buf_size, dfu->r_left); dfu->bad_skip =0 ;
Signature · 1 line
1.7.9.5
RFC PATCH 2/2 usb: dfu: correct dfu buffer inited value
Hi Bo,
Quoted 14 lines
After dfu buffer is initialized, the buffer should be all available, while not 0. Initialize its value to
min(dfu_buf_size, dfu->r_left).Signed-off-by Bo Shen <[email protected]>--- drivers/dfu/dfu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/dfu/dfu.c +0
-0
drivers/dfu/dfu.c int dfu_read(struct dfu_entity *dfu, void *buf, · line 292
Quoted 6 lines
drivers/dfu/dfu.c +1
-1@@ -288,7 +288,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 =0 ; + dfu->b_left =min (dfu_buf_size, dfu->r_left);
I've testd in on Trats. It causes dfu read to be performed two times.
Could you write a more verbose message to explain the problem that you are trying to solve? I can _only_ suppose that you want to read/write data from/to NAND memory.
So, I'm curious why dfu-util breaks with your setup but works at am335x. Both chips are supposed to use dfu_nand.c for performing NAND read/write.
Quoted 2 lines
drivers/dfu/dfu.c +0
-0dfu->bad_skip =0 ;
Signature · 5 lines
Best regards, Lukasz Majewski Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
RFC PATCH 2/2 usb: dfu: correct dfu buffer inited value
Hi Lukasz,
Quoted 11 lines · Lukasz Majewski
Hi Bo,
Quoted 9 lines
After dfu buffer is initialized, the buffer should be all available, while not 0. Initialize its value to
min(dfu_buf_size, dfu->r_left).Signed-off-by Bo Shen <[email protected]>--- drivers/dfu/dfu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 13 lines
drivers/dfu/dfu.c int dfu_read(struct dfu_entity *dfu, void *buf, · line 292
Quoted 11 lines
drivers/dfu/dfu.c +1
-1@@ -288,7 +288,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 =0 ; + dfu->b_left =min (dfu_buf_size, dfu->r_left);I've testd in on Trats. It causes dfu read to be performed two times.
Have you apply these two patches together:
[RFC PATCH 1/2] usb: dfu: decrease dfu->r_left along with the transfer [RFC PATCH 2/2] usb: dfu: correct dfu buffer inited value
I test this with dfu mmc.
Without these two patches, it will read file two times. --->8---
U-Boot> dfu mmc 0
GADGET DRIVER: usb_dnl_dfu
reading image.bin
3049120 bytes read in 628 ms (4.6 MiB/s) reading image.bin
3049120 bytes read in 628 ms (4.6 MiB/s) ---8<---
with these two patches, it only read file one time. --->8---
U-Boot> dfu mmc 0
GADGET DRIVER: usb_dnl_dfu
reading image.bin
3049120 bytes read in 628 ms (4.6 MiB/s) ---8<---
The result is opposite.
Quoted 7 lines
Could you write a more verbose message to explain the problem that you are trying to solve? I can _only_ suppose that you want to read/write data from/to NAND memory.
So, I'm curious why dfu-util breaks with your setup but works at am335x. Both chips are supposed to use
dfu_nand.cfor performing NAND read/write.
For the NAND upload, if without patch: [U-Boot,RFC] usb: dfu: make nand upload working (http://patchwork.ozlabs.org/patch/283886/)
It doesn't work at my side. more information as following:
--->8---
$ ./dfu-util -l dfu-util 0.7
Copyright 2005-2008 Weston Schmidt, Harald Welte and OpenMoko Inc. Copyright 2010-2012 Tormod Volden and Stefan Schmidt This program is Free Software and has ABSOLUTELY NO WARRANTY Please report bugs to dfu-util at lists.gnumonks.org
Found Runtime: [413c:8187] devnum=0, cfg=1, intf=3, alt=0, name="UNDEFINED" Found DFU: [03eb:6156] devnum=0, cfg=1, intf=0, alt=0, name="sama5d34ek.dtb" Found DFU: [03eb:6156] devnum=0, cfg=1, intf=0, alt=1, name="uImage" Found DFU: [03eb:6156] devnum=0, cfg=1, intf=0, alt=2, name="rootfs.ubi"
$ ./dfu-util -d 03eb:6156 -U kernel.image -a 1 dfu-util 0.7
Copyright 2005-2008 Weston Schmidt, Harald Welte and OpenMoko Inc. Copyright 2010-2012 Tormod Volden and Stefan Schmidt This program is Free Software and has ABSOLUTELY NO WARRANTY Please report bugs to dfu-util at lists.gnumonks.org
Filter on vendor = 0x03eb product = 0x6156
Opening DFU capable USB device... ID 03eb:6156
WARNING: Can not find cached DFU functional descriptor
Warning: Assuming DFU version 1.0
Run-time device DFU version 0100
Found DFU: [03eb:6156] devnum=0, cfg=1, intf=0, alt=1, name="uImage" Claiming USB DFU Interface...
Setting Alternate Setting #1 ...
Determining device status: state = dfuUPLOAD-IDLE, status = 0 aborting previous incomplete transfer
Determining device status: state = dfuIDLE, status = 0 dfuIDLE, continuing
Error obtaining cached DFU functional descriptor
DFU mode device DFU version 0110
Device returned transfer size 4096
bytes_per_hash=4096
Copying data from DFU device to PC
Starting upload: [] finished!
---8<---
It doesn't transfer anything.
After apply the patch for NAND upload, it works OK. And only perform one time reading.
Quoted 3 lines
drivers/dfu/dfu.c int dfu_read(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num) · line 294
Quoted 3 lines
drivers/dfu/dfu.c +0
-0dfu->bad_skip =0 ;
Best Regards,
Bo Shen
RFC PATCH 2/2 usb: dfu: correct dfu buffer inited value
Hi Bo,
First of all, sorry for a little delay.
Quoted 30 lines
Hi Lukasz,
Quoted 12 lines · Lukasz Majewski
Hi Bo,
Quoted 10 lines
After dfu buffer is initialized, the buffer should be all available, while not 0. Initialize its value to
min(dfu_buf_size, dfu->r_left).Signed-off-by Bo Shen <[email protected]>--- drivers/dfu/dfu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Quoted 14 lines
drivers/dfu/dfu.c int dfu_read(struct dfu_entity *dfu, void *buf, · line 292
Quoted 11 lines
drivers/dfu/dfu.c +1
-1@@ -288,7 +288,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 =0 ; + dfu->b_left =min (dfu_buf_size, dfu->r_left);I've testd in on Trats. It causes dfu read to be performed two times.
Quoted 4 lines
Have you apply these two patches together:
[RFC PATCH 1/2] usb: dfu: decreasedfu->r_leftalong with the transfer [RFC PATCH 2/2] usb: dfu: correct dfu buffer inited value
I did a "little" mistake when applying those patches. When both patches are applied dfu works fine.
I've tested it on Trats (Exynos4210).
For:
[RFC PATCH 1/2] usb: dfu: decrease dfu->r_left along with the transfer [RFC PATCH 2/2] usb: dfu: correct dfu buffer inited value
@ Marek,
Since I'm still struggling with internal firewall - Marek could you apply those two patches to u-boot-usb tree?
Also please apply Heiko's patch:
[PATCH v3 3/5] usb, g_dnl: make iSerialNumber board configurable
Thanks in advance.
Quoted 88 lines
I test this with dfu mmc.
Without these two patches, it will read file two times. --->8---
U-Boot> dfu mmc 0
GADGET DRIVER:usb_dnl_dfu
reading image.bin
3049120 bytes read in 628 ms (4.6 MiB/s) reading image.bin
3049120 bytes read in 628 ms (4.6 MiB/s) ---8<---with these two patches, it only read file one time. --->8---
U-Boot> dfu mmc 0
GADGET DRIVER:usb_dnl_dfu
reading image.bin
3049120 bytes read in 628 ms (4.6 MiB/s) ---8<---The result is opposite.
Quoted 7 lines
Could you write a more verbose message to explain the problem that you are trying to solve? I can _only_ suppose that you want to read/write data from/to NAND memory.
So, I'm curious why dfu-util breaks with your setup but works at am335x. Both chips are supposed to use
dfu_nand.cfor performing NAND read/write.For the NAND upload, if without patch: [U-Boot,RFC] usb: dfu: make nand upload working (http://patchwork.ozlabs.org/patch/283886/)
It doesn't work at my side. more information as following:
--->8---$ ./dfu-util -l dfu-util 0.7Copyright 2005-2008 Weston Schmidt, Harald Welte and OpenMoko Inc. Copyright 2010-2012 Tormod Volden and Stefan Schmidt This program is Free Software and has ABSOLUTELY NO WARRANTY Please report bugs to dfu-util at lists.gnumonks.org
Found Runtime: [413c:8187] devnum=0, cfg=1, intf=3, alt=0, name="UNDEFINED" Found DFU: [03eb:6156] devnum=0, cfg=1, intf=0, alt=0, name="sama5d34ek.dtb" Found DFU: [03eb:6156] devnum=0, cfg=1, intf=0, alt=1, name="uImage" Found DFU: [03eb:6156] devnum=0, cfg=1, intf=0, alt=2, name="rootfs.ubi"
$ ./dfu-util -d 03eb:6156 -U kernel.image -a 1 dfu-util 0.7Copyright 2005-2008 Weston Schmidt, Harald Welte and OpenMoko Inc. Copyright 2010-2012 Tormod Volden and Stefan Schmidt This program is Free Software and has ABSOLUTELY NO WARRANTY Please report bugs to dfu-util at lists.gnumonks.org
Filter on vendor =
0x03ebproduct =0x6156
Opening DFU capable USB device... ID 03eb:6156
WARNING: Can not find cached DFU functional descriptor
Warning: Assuming DFU version 1.0
Run-time device DFU version 0100
Found DFU: [03eb:6156] devnum=0, cfg=1, intf=0, alt=1, name="uImage" Claiming USB DFU Interface...
Setting Alternate Setting #1 ...
Determining device status: state = dfuUPLOAD-IDLE, status = 0 aborting previous incomplete transfer
Determining device status: state = dfuIDLE, status = 0 dfuIDLE, continuing
Error obtaining cached DFU functional descriptor
DFU mode device DFU version 0110
Device returned transfer size 4096
bytes_per_hash=4096
Copying data from DFU device to PC
Starting upload: [] finished!
---8<---It doesn't transfer anything.
After apply the patch for NAND upload, it works OK. And only perform one time reading.
Quoted 3 lines
drivers/dfu/dfu.c int dfu_read(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num) · line 294
Quoted 3 lines
drivers/dfu/dfu.c +0
-0dfu->bad_skip =0 ;Best Regards,
Bo Shen
Signature · 5 lines
Best regards, Lukasz Majewski Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
RFC PATCH 2/2 usb: dfu: correct dfu buffer inited value
Dear Lukasz Majewski,
Quoted 54 lines
Hi Bo,
First of all, sorry for a little delay.
Quoted 32 lines
Hi Lukasz,
Quoted 20 lines · Lukasz Majewski
Hi Bo,
Quoted 18 lines
After dfu buffer is initialized, the buffer should be all available, while not 0. Initialize its value to
min(dfu_buf_size, dfu->r_left).Signed-off-by Bo Shen <[email protected]>---
drivers/dfu/dfu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/dfu/dfu.c +0
-0@@ -288,7 +288,7 @@ int dfu_read(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num) dfu->offset = 0;Quoted 8 lines
drivers/dfu/dfu.c int dfu_read(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num) · line 291
Quoted 5 lines
drivers/dfu/dfu.c +1
-1dfu->i_buf_end =dfu_get_buf () + dfu_buf_size; dfu->i_buf = dfu->i_buf_start; - dfu->b_left =0 ; + dfu->b_left =min (dfu_buf_size, dfu->r_left);I've testd in on Trats. It causes dfu read to be performed two times.
Quoted 3 lines
Have you apply these two patches together:
[RFC PATCH 1/2] usb: dfu: decreasedfu->r_leftalong with the transfer [RFC PATCH 2/2] usb: dfu: correct dfu buffer inited valueI did a "little" mistake when applying those patches. When both patches are applied dfu works fine.
I've tested it on Trats (Exynos4210).
For:
[RFC PATCH 1/2] usb: dfu: decreasedfu->r_leftalong with the transfer [RFC PATCH 2/2] usb: dfu: correct dfu buffer inited valueTested-by Lukasz Majewski <[email protected]>Acked-by Lukasz Majewski <[email protected]>@ Marek,
Quoted 8 lines
Since I'm still struggling with internal firewall - Marek could you apply those two patches to u-boot-usb tree?
Also please apply Heiko's patch:
[PATCH v3 3/5] usb,
g_dnl: make iSerialNumber board configurableThanks in advance.
Roger that, all done, thanks!
Best regards,
Marek Vasut
RFC PATCH 1/2 usb: dfu: decrease dfu->r_left along with the transfer
In reply to Bo ShenHi,
Quoted 3 lines
The value of
dfu->r_leftneed decrease along with the transferSigned-off-by Bo Shen <[email protected]>
Lucasz/Heiko , can you ACK/NAK this and 2/2 ? Thanks!
Quoted 9 lines
--- drivers/dfu/dfu.c | 1 + 1 file changed, 1 insertion(+)drivers/dfu/dfu.c +0
-0
drivers/dfu/dfu.c static int dfu_read_buffer_fill(struct dfu_entity *dfu, · line 235
Quoted 7 lines
drivers/dfu/dfu.c +1
-0@@ -229,6 +229,7 @@ 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;
Best regards,
Marek Vasut
RFC PATCH 1/2 usb: dfu: decrease dfu->r_left along with the transfer
Hi Marek,
Quoted 7 lines
Hi,
Quoted 3 lines
The value of
dfu->r_leftneed decrease along with the transferSigned-off-by Bo Shen <[email protected]>Lucasz/Heiko , can you ACK/NAK this and 2/2 ? Thanks!
For me it looks like a more difficult problem.
I've got an impression that patches proposed by Bo would break eMMC.
Unfortunately I'm now a bit short of time to go deeper to it. Before ELCE I shall have got a bit more time.
Quoted 5 lines
Quoted 5 lines
--- drivers/dfu/dfu.c | 1 + 1 file changed, 1 insertion(+)
Quoted 15 lines
drivers/dfu/dfu.c static int dfu_read_buffer_fill(struct · line 235
Quoted 12 lines
drivers/dfu/dfu.c +1
-0@@ -229,6 +229,7 @@ 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;Best regards,
Marek Vasut
Regards,
Lukasz
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20131022/7623890f/attachment.pgp>
RFC PATCH 1/2 usb: dfu: decrease dfu->r_left along with the transfer
Hi Lukasz,
Quoted 8 lines
Hi Marek,
Quoted 6 lines
Hi,
Quoted 3 lines
The value of
dfu->r_leftneed decrease along with the transferSigned-off-by Bo Shen <[email protected]>
Quoted 7 lines
Quoted 1 line
Lucasz/Heiko , can you ACK/NAK this and 2/2 ? Thanks!
For me it looks like a more difficult problem.
I've got an impression that patches proposed by Bo would break eMMC.Unfortunately I'm now a bit short of time to go deeper to it. Before ELCE I shall have got a bit more time.
OK, thanks!
Best regards,
Marek Vasut
RFC PATCH 1/2 usb: dfu: decrease dfu->r_left along with the transfer
Hi Lukasz,
Quoted 17 lines · Marek Vasut
Hi Lukasz,
Quoted 15 lines
Hi Marek,
Quoted 7 lines
Hi,
Quoted 3 lines
The value of
dfu->r_leftneed decrease along with the transferSigned-off-by Bo Shen <[email protected]>Lucasz/Heiko , can you ACK/NAK this and 2/2 ? Thanks!
For me it looks like a more difficult problem.
I've got an impression that patches proposed by Bo would break eMMC.Unfortunately I'm now a bit short of time to go deeper to it. Before ELCE I shall have got a bit more time.
Would it be possible for you to check these two RFC patch?
Quoted 5 lines
OK, thanks!
Best regards,
Marek Vasut
Best Regards,
Bo Shen