Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 00:14:22 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

This commit solves a problem which causes data loss while sending data via USB. This problem is caused by an incorrect handling of the endpoint state in the USB driver sam_usbdevhs. This leads under some circumstances to situations in which an DMA transfer is setup while a previous DMA transfer is currently active. Amongst other things I introduced the new endpoint state USBHS_EPSTATE_SENDING_DMA for the fix.

Browse Source 
To reproduce the problem, I used a program which send as many data as possible via a CDC/ACM device and verified the received data on the PC.
This commit is contained in:
Stefan Kolb
2016-07-13 10:09:14 -06:00
committed by Gregory Nutt
parent a7d8279714
commit f673b2d02a
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/samv7/sam_usbdevhs.c
+19 -9
View File
@@ -301,6 +301,7 @@ enum sam_epstate_e
USBHS_EPSTATE_STALLED, /* Endpoint is stalled */ USBHS_EPSTATE_STALLED, /* Endpoint is stalled */
USBHS_EPSTATE_IDLE, /* Endpoint is idle (i.e. ready for transmission) */ USBHS_EPSTATE_IDLE, /* Endpoint is idle (i.e. ready for transmission) */
USBHS_EPSTATE_SENDING, /* Endpoint is sending data */ USBHS_EPSTATE_SENDING, /* Endpoint is sending data */
USBHS_EPSTATE_SENDING_DMA, /* Endpoint is sending data via DMA */
USBHS_EPSTATE_NBUSYBK, /* Endpoint DMA complete, waiting for NBUSYBK==0 */ USBHS_EPSTATE_NBUSYBK, /* Endpoint DMA complete, waiting for NBUSYBK==0 */
USBHS_EPSTATE_RECEIVING, /* Endpoint is receiving data */ USBHS_EPSTATE_RECEIVING, /* Endpoint is receiving data */
/* --- Endpoint 0 Only --- */ /* --- Endpoint 0 Only --- */
@@ -1006,7 +1007,7 @@ static void sam_dma_wrsetup(struct sam_usbdev_s *priv, struct sam_ep_s *privep,
/* Switch to the sending state */ /* Switch to the sending state */
privep->epstate = USBHS_EPSTATE_SENDING; privep->epstate = USBHS_EPSTATE_SENDING_DMA;
privreq->inflight = 0; privreq->inflight = 0;
/* Get the endpoint number */ /* Get the endpoint number */
@@ -1211,16 +1212,23 @@ static void sam_req_complete(struct sam_ep_s *privep, int16_t result)
privreq->req.result = result; privreq->req.result = result;
/* Callback to the request completion handler */ /* Reset the endpoint state and restore the stalled indication.
*
privreq->flink = NULL; * At least the USB class CDC/ACM calls the function sam_ep_submit within
privreq->req.callback(&privep->ep, &privreq->req); * the callback. This function uses sam_req_write or sam_req_read to process
* the request, both functions can change the state. Therefore it is verry
/* Reset the endpoint state and restore the stalled indication */ * important to set the state to USBHS_EPSTATE_IDLE before the callback is
* called.
*/
privep->epstate = USBHS_EPSTATE_IDLE; privep->epstate = USBHS_EPSTATE_IDLE;
privep->zlpneeded = false; privep->zlpneeded = false;
privep->zlpsent = false; privep->zlpsent = false;
/* Callback to the request completion handler */
privreq->flink = NULL;
privreq->req.callback(&privep->ep, &privreq->req);
} }
} }
@@ -2497,7 +2505,8 @@ static void sam_dma_interrupt(struct sam_usbdev_s *priv, int epno)
/* Were we sending? Or receiving? */ /* Were we sending? Or receiving? */
if (privep->epstate == USBHS_EPSTATE_SENDING) if (privep->epstate == USBHS_EPSTATE_SENDING ||
privep->epstate == USBHS_EPSTATE_SENDING_DMA)
{ {
uint32_t nbusybk; uint32_t nbusybk;
uint32_t byct; uint32_t byct;
@@ -2923,7 +2932,8 @@ static void sam_ep_interrupt(struct sam_usbdev_s *priv, int epno)
*/ */
if (privep->epstate == USBHS_EPSTATE_RECEIVING || if (privep->epstate == USBHS_EPSTATE_RECEIVING ||
privep->epstate == USBHS_EPSTATE_SENDING) privep->epstate == USBHS_EPSTATE_SENDING ||
privep->epstate == USBHS_EPSTATE_SENDING_DMA)
{ {
sam_req_complete(privep, -EPROTO); sam_req_complete(privep, -EPROTO);
} }