usb: gadget: f_dfu: write req->actual bytes
PATCH 1/1 usb: gadget: f_dfu: write req->actual bytes
From: Felipe Balbi <[email protected]>
If last packet is short, we shouldn't write req->length bytes to non-volatile media, we should write only what's available to us, which is held in req->actual.
--- drivers/usb/gadget/f_dfu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/gadget/f_dfu.c +1 -1
@@ -159,7 +159,7 @@ static void dnload_request_complete(struct usb_ep *ep, struct usb_request *req)int ret; ret =dfu_write (dfu_get_entity (f_dfu->altsetting), req->buf, - req->length, f_dfu->blk_seq_num); + req->actual, f_dfu->blk_seq_num);if (ret) { f_dfu->dfu_status = DFU_STATUS_errUNKNOWN; f_dfu->dfu_state = DFU_STATE_dfuERROR;
Signature · 1 line
2.11.0
PATCH 1/1 usb: gadget: f_dfu: write req->actual bytes
Quoted 8 lines · Andy Shevchenko
From: Felipe Balbi <[email protected]>
If last packet is short, we shouldn't write
req->lengthbytes to non-volatile media, we should write only what's available to us, which is held inreq->actual.Signed-off-by Felipe Balbi <[email protected]>Signed-off-by Andy Shevchenko <[email protected]>
Since I have no clue about DFU internals, I will wait for Lukasz's Ack.
Quoted 18 lines
--- drivers/usb/gadget/f_dfu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/usb/gadget/f_dfu.c +1
-1@@ -159,7 +159,7 @@ static void dnload_request_complete(struct usb_ep *ep, struct usb_request *req)int ret; ret =dfu_write (dfu_get_entity (f_dfu->altsetting), req->buf, - req->length, f_dfu->blk_seq_num); + req->actual, f_dfu->blk_seq_num);if (ret) { f_dfu->dfu_status = DFU_STATUS_errUNKNOWN; f_dfu->dfu_state = DFU_STATE_dfuERROR;
Signature · 2 lines
Best regards, Marek Vasut
PATCH 1/1 usb: gadget: f_dfu: write req->actual bytes
Hi,
Quoted 11 lines · Marek Vasut
Quoted 8 lines · Andy Shevchenko
From: Felipe Balbi <[email protected]>
If last packet is short, we shouldn't write
req->lengthbytes to non-volatile media, we should write only what's available to us, which is held inreq->actual.Signed-off-by Felipe Balbi <[email protected]>Signed-off-by Andy Shevchenko <[email protected]>Since I have no clue about DFU internals, I will wait for Lukasz's Ack.
you don't need to have any clues about DFU internals to realise that this fixes an actual bug, see below:
Quoted 10 lines
Quoted 10 lines
drivers/usb/gadget/f_dfu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/usb/gadget/f_dfu.c +0
-0@@ -159,7 +159,7 @@ static void dnload_request_complete(struct usb_ep *ep, struct usb_request *req)int ret;
Quoted 3 lines
drivers/usb/gadget/f_dfu.c static void dnload_request_complete(struct usb_ep *ep, struct usb_request *req) · line 162
Quoted 3 lines
drivers/usb/gadget/f_dfu.c +1
-1ret =dfu_write (dfu_get_entity (f_dfu->altsetting), req->buf, - req->length, f_dfu->blk_seq_num); + req->actual, f_dfu->blk_seq_num);
DFU driver queues a request to USB controller. Per the gadget API req->length contains maximum amount of data to be transmitted. req->actual is written by USB controller with the actual amount of data that we transmitted.
In the case of IN (TX), upon completion req->length and req->actual should always be equal (unless errors show up, etc)
In the case of OUT (RX), upon completion req->actual MAY BE less than req->length and that's not an error. Say host sent us a short packet which causes early termination of transfer.
With that in mind, let's consider the situation where we're receiving data from host using DFU. Let's assume that we have a 4096 byte buffer for transfers and we're receiving a binary that's 7679 bytes in size.
Here's what we will do (pseudo-code):
int remaining = 7679;
char buf[4096];
while (remaining) {
req->length = 4096;
req->buf = buf;
usb_ep_queue(req);
/* wait for completion */
remaining -= req->actual;
dfu_write(buf, req->length); /* this is the error */
}Can you see here that in the last packet we will write 4096 bytes when we should write only 3583?
Signature · 8 lines
balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 832 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170213/9bebe731/attachment.sig>