| Message ID | 20200214071414.7256-3-peter.chen@nxp.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | usb: cdns3: two fixes for gadget | expand |
> >If there are TRBs pending during clear stall and reset endpoint, the >DMA will advance after reset operation, but it doesn't be expected, >since the data has still not be ready (For OUT, the data has still >not received). After the data is ready, there isn't any interrupt >since the EP_TRADDR has already points to next TRB entry. > >To fix it, it toggles cyclt bit before reset operation, and restore >it after reset, it could keep DMA stopping. > >Fixes: 7733f6c32e36 ("usb: cdns3: Add Cadence USB3 DRD Driver") >Signed-off-by: Peter Chen <peter.chen@nxp.com> >--- > drivers/usb/cdns3/gadget.c | 17 ++++++++++++++--- > 1 file changed, 14 insertions(+), 3 deletions(-) > >diff --git a/drivers/usb/cdns3/gadget.c b/drivers/usb/cdns3/gadget.c >index 1d8a2af35bb0..7b6bb96b91d1 100644 >--- a/drivers/usb/cdns3/gadget.c >+++ b/drivers/usb/cdns3/gadget.c >@@ -2595,11 +2595,21 @@ int __cdns3_gadget_ep_clear_halt(struct cdns3_endpoint *priv_ep) > { > struct cdns3_device *priv_dev = priv_ep->cdns3_dev; > struct usb_request *request; >+ struct cdns3_request *priv_req; >+ struct cdns3_trb *trb = NULL; > int ret; > int val; > > trace_cdns3_halt(priv_ep, 0, 0); > >+ request = cdns3_next_request(&priv_ep->pending_req_list); >+ if (request) { >+ priv_req = to_cdns3_request(request); >+ trb = priv_req->trb; >+ if (trb) >+ trb->control = trb->control ^ 1; >+ } >+ What about doing simple read/write on ep_traddr register: u32 ep_traddr; ep_traddr = readl(&priv_dev->regs->ep_traddr); > writel(EP_CMD_CSTALL | EP_CMD_EPRST, &priv_dev->regs->ep_cmd); writel(&priv_dev->regs->ep_traddr, ep_traddr); It should work in the same way but is simpler. And maybe we could add some comment because this code look little strange. Something like: When endpoint is armed during endpoint reset the controller can advance TRADDR to next TD, so driver need to restore the previous value. > > /* wait for EPRST cleared */ >@@ -2610,10 +2620,11 @@ int __cdns3_gadget_ep_clear_halt(struct cdns3_endpoint *priv_ep) > > priv_ep->flags &= ~(EP_STALLED | EP_STALL_PENDING); > >- request = cdns3_next_request(&priv_ep->pending_req_list); >- >- if (request) >+ if (request) { >+ if (trb) >+ trb->control = trb->control ^ 1; > cdns3_rearm_transfer(priv_ep, 1); >+ } > > cdns3_start_all_request(priv_dev, priv_ep); > return ret; >-- >2.17.1
On 14/02/2020 09:14, Peter Chen wrote: > If there are TRBs pending during clear stall and reset endpoint, the s/and/or? > DMA will advance after reset operation, but it doesn't be expected, s/doesn't/isn't? > since the data has still not be ready (For OUT, the data has still s/"has still not be"/"is not yet" (e.g. for OUT, the data is not yet available). > not received). After the data is ready, there isn't any interrupt s/"there isn't any"/"there won't be any" > since the EP_TRADDR has already points to next TRB entry. remove "has" > > To fix it, it toggles cyclt bit before reset operation, and restore s/cyclt/cycle s/restore/restores > it after reset, it could keep DMA stopping. It prevents DMA from getting stuck up? > > Fixes: 7733f6c32e36 ("usb: cdns3: Add Cadence USB3 DRD Driver") > Signed-off-by: Peter Chen <peter.chen@nxp.com> > --- > drivers/usb/cdns3/gadget.c | 17 ++++++++++++++--- > 1 file changed, 14 insertions(+), 3 deletions(-) > > diff --git a/drivers/usb/cdns3/gadget.c b/drivers/usb/cdns3/gadget.c > index 1d8a2af35bb0..7b6bb96b91d1 100644 > --- a/drivers/usb/cdns3/gadget.c > +++ b/drivers/usb/cdns3/gadget.c > @@ -2595,11 +2595,21 @@ int __cdns3_gadget_ep_clear_halt(struct cdns3_endpoint *priv_ep) > { > struct cdns3_device *priv_dev = priv_ep->cdns3_dev; > struct usb_request *request; > + struct cdns3_request *priv_req; > + struct cdns3_trb *trb = NULL; > int ret; > int val; > > trace_cdns3_halt(priv_ep, 0, 0); > > + request = cdns3_next_request(&priv_ep->pending_req_list); > + if (request) { > + priv_req = to_cdns3_request(request); > + trb = priv_req->trb; > + if (trb) > + trb->control = trb->control ^ 1; use TRB_CYCLE macro instead of 1. Is it better to toggle this bit or explicitly set/clear it? > + } > + > writel(EP_CMD_CSTALL | EP_CMD_EPRST, &priv_dev->regs->ep_cmd); > > /* wait for EPRST cleared */ > @@ -2610,10 +2620,11 @@ int __cdns3_gadget_ep_clear_halt(struct cdns3_endpoint *priv_ep) > > priv_ep->flags &= ~(EP_STALLED | EP_STALL_PENDING); > > - request = cdns3_next_request(&priv_ep->pending_req_list); > - > - if (request) > + if (request) { > + if (trb) > + trb->control = trb->control ^ 1; same here. > cdns3_rearm_transfer(priv_ep, 1); > + } > > cdns3_start_all_request(priv_dev, priv_ep); > return ret; >
On 20-02-14 07:41:58, Pawel Laszczak wrote: > > > >If there are TRBs pending during clear stall and reset endpoint, the > >DMA will advance after reset operation, but it doesn't be expected, > >since the data has still not be ready (For OUT, the data has still > >not received). After the data is ready, there isn't any interrupt > >since the EP_TRADDR has already points to next TRB entry. > > > >To fix it, it toggles cyclt bit before reset operation, and restore > >it after reset, it could keep DMA stopping. > > > >Fixes: 7733f6c32e36 ("usb: cdns3: Add Cadence USB3 DRD Driver") > >Signed-off-by: Peter Chen <peter.chen@nxp.com> > >--- > > drivers/usb/cdns3/gadget.c | 17 ++++++++++++++--- > > 1 file changed, 14 insertions(+), 3 deletions(-) > > > >diff --git a/drivers/usb/cdns3/gadget.c b/drivers/usb/cdns3/gadget.c > >index 1d8a2af35bb0..7b6bb96b91d1 100644 > >--- a/drivers/usb/cdns3/gadget.c > >+++ b/drivers/usb/cdns3/gadget.c > >@@ -2595,11 +2595,21 @@ int __cdns3_gadget_ep_clear_halt(struct cdns3_endpoint *priv_ep) > > { > > struct cdns3_device *priv_dev = priv_ep->cdns3_dev; > > struct usb_request *request; > >+ struct cdns3_request *priv_req; > >+ struct cdns3_trb *trb = NULL; > > int ret; > > int val; > > > > trace_cdns3_halt(priv_ep, 0, 0); > > > >+ request = cdns3_next_request(&priv_ep->pending_req_list); > >+ if (request) { > >+ priv_req = to_cdns3_request(request); > >+ trb = priv_req->trb; > >+ if (trb) > >+ trb->control = trb->control ^ 1; > >+ } > >+ > > What about doing simple read/write on ep_traddr register: > u32 ep_traddr; > ep_traddr = readl(&priv_dev->regs->ep_traddr); > > > writel(EP_CMD_CSTALL | EP_CMD_EPRST, &priv_dev->regs->ep_cmd); > > writel(&priv_dev->regs->ep_traddr, ep_traddr); > > It should work in the same way but is simpler. No, we can't do thing like this since the controller may change TRB content during the reset. The trb address 0x96003024 is the pending one. At this context, I still not add changes for link trb. file-storage-4050 [003] d..1 128.390623: cdns3_ep_queue: ep1out: req: ffff8008366ac100, req buff ffff8008378b0000, length: 0/1024 , status: -115, trb: [start:2, end:2: virt addr 0x0000000000000000], flags:0 file-storage-4050 [003] d..1 128.390628: cdns3_log: 5b110000.usb3: WA1 set guard file-storage-4050 [003] d..1 128.390633: cdns3_log: 5b110000.usb3: dorbel 1, dma_index 2, prev_enqueu 3 file-storage-4050 [003] d..1 128.390637: cdns3_log: 5b110000.usb3: WA1: update cycle bit file-storage-4050 [003] d..1 128.390639: cdns3_prepare_trb: ep1out: trb ffff00000a418024, dma buf: 0xfc7a1000, size: 1024, burst: 16 ctrl: 0x00000425 (C=1, T=0, ISP, IOC, Normal) file-storage-4050 [003] d..1 128.390642: cdns3_log: 5b110000.usb3: Update ep_trbaddr for ep1out to 96003024 file-storage-4050 [003] d..1 128.390647: cdns3_ring: Ring contents for ep1out: Ring deq index: 3, trb: ffff00000a418024 (virt), 0x96003024 (dma) Ring enq index: 4, trb: ffff00000a418030 (virt), 0x96003030 (dma) free trbs: 28, CCS=1, PCS=1 @0x0000000096003000 fc79f000 0000001f 00000427 @0x000000009600300c fc7a0000 0000001f 00000427 @0x0000000096003018 fc7a0800 10020400 00000425 @0x0000000096003024 fc7a1000 10020400 00000425 @0x0000000096003030 00000000 00000000 00000000 @0x000000009600303c 00000000 00000000 00000000 @0x0000000096003048 00000000 00000000 00000000 @0x0000000096003054 00000000 00000000 00000000 @0x0000000096003060 00000000 00000000 00000000 @0x000000009600306c 00000000 00000000 00000000 @0x0000000096003078 00000000 00000000 00000000 @0x0000000096003084 00000000 00000000 00000000 file-storage-4050 [003] d..1 128.390654: cdns3_doorbell_epx: //Ding Dong ep1out, ep_trbaddr 96003024 irq/42-5b110000-2246 [001] d..1 128.390692: cdns3_ep0_irq: IRQ for ep0OUT: 00010c85 SETUP IOC TRBERR irq/42-5b110000-2246 [001] d..1 128.390696: cdns3_ctrl_req: Clear Endpoint Feature(Halt ep1out) irq/42-5b110000-2246 [001] d..1 128.390700: cdns3_log: 5b110000.usb3: Clear Stalled endpoint ep1out irq/42-5b110000-2246 [001] d..1 128.390719: cdns3_log: 5b110000.usb3: Resume transfer for ep1out, ep_sta:0xc00 irq/42-5b110000-2246 [001] d..1 128.390724: cdns3_ring: Ring contents for ep1out: Ring deq index: 3, trb: ffff00000a418024 (virt), 0x96003024 (dma) Ring enq index: 4, trb: ffff00000a418030 (virt), 0x96003030 (dma) free trbs: 28, CCS=1, PCS=1 @0x0000000096003000 fc79f000 0000001f 00000427 @0x000000009600300c fc7a0000 0000001f 00000427 @0x0000000096003018 fc7a0800 10020400 00000425 @0x0000000096003024 fc7a1000 00000000 00000467 @0x0000000096003030 00000000 00000000 00000000 @0x000000009600303c 00000000 00000000 00000000 @0x0000000096003048 00000000 00000000 00000000 @0x0000000096003054 00000000 00000000 00000000 Peter > > And maybe we could add some comment because this code look little strange. Something like: > When endpoint is armed during endpoint reset the controller can advance TRADDR to next TD, > so driver need to restore the previous value. > > > > > /* wait for EPRST cleared */ > >@@ -2610,10 +2620,11 @@ int __cdns3_gadget_ep_clear_halt(struct cdns3_endpoint *priv_ep) > > > > priv_ep->flags &= ~(EP_STALLED | EP_STALL_PENDING); > > > >- request = cdns3_next_request(&priv_ep->pending_req_list); > >- > >- if (request) > >+ if (request) { > >+ if (trb) > >+ trb->control = trb->control ^ 1; > > cdns3_rearm_transfer(priv_ep, 1); > >+ } > > > > cdns3_start_all_request(priv_dev, priv_ep); > > return ret; > >-- > >2.17.1 >
On 20-02-14 10:48:47, Roger Quadros wrote: > > > On 14/02/2020 09:14, Peter Chen wrote: > > If there are TRBs pending during clear stall and reset endpoint, the > > s/and/or? I think it is reset operation, just I observe it at these two operations together. > > > DMA will advance after reset operation, but it doesn't be expected, > > s/doesn't/isn't? > > > since the data has still not be ready (For OUT, the data has still > > s/"has still not be"/"is not yet" > > (e.g. for OUT, the data is not yet available). > > > not received). After the data is ready, there isn't any interrupt > > s/"there isn't any"/"there won't be any" > > > since the EP_TRADDR has already points to next TRB entry. > > remove "has" > > > > > To fix it, it toggles cyclt bit before reset operation, and restore > > s/cyclt/cycle > > s/restore/restores > Will change above typo. > > it after reset, it could keep DMA stopping. > > It prevents DMA from getting stuck up? It could avoid unexpected DMA advance later due to TRB content has changed during the reset. > > > > > Fixes: 7733f6c32e36 ("usb: cdns3: Add Cadence USB3 DRD Driver") > > Signed-off-by: Peter Chen <peter.chen@nxp.com> > > --- > > drivers/usb/cdns3/gadget.c | 17 ++++++++++++++--- > > 1 file changed, 14 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/usb/cdns3/gadget.c b/drivers/usb/cdns3/gadget.c > > index 1d8a2af35bb0..7b6bb96b91d1 100644 > > --- a/drivers/usb/cdns3/gadget.c > > +++ b/drivers/usb/cdns3/gadget.c > > @@ -2595,11 +2595,21 @@ int __cdns3_gadget_ep_clear_halt(struct cdns3_endpoint *priv_ep) > > { > > struct cdns3_device *priv_dev = priv_ep->cdns3_dev; > > struct usb_request *request; > > + struct cdns3_request *priv_req; > > + struct cdns3_trb *trb = NULL; > > int ret; > > int val; > > trace_cdns3_halt(priv_ep, 0, 0); > > + request = cdns3_next_request(&priv_ep->pending_req_list); > > + if (request) { > > + priv_req = to_cdns3_request(request); > > + trb = priv_req->trb; > > + if (trb) > > + trb->control = trb->control ^ 1; > > use TRB_CYCLE macro instead of 1. > > Is it better to toggle this bit or explicitly set/clear it? Since we don't know the value for cycle bit, it is better just toggle it. > > > + } > > + > > writel(EP_CMD_CSTALL | EP_CMD_EPRST, &priv_dev->regs->ep_cmd); > > /* wait for EPRST cleared */ > > @@ -2610,10 +2620,11 @@ int __cdns3_gadget_ep_clear_halt(struct cdns3_endpoint *priv_ep) > > priv_ep->flags &= ~(EP_STALLED | EP_STALL_PENDING); > > - request = cdns3_next_request(&priv_ep->pending_req_list); > > - > > - if (request) > > + if (request) { > > + if (trb) > > + trb->control = trb->control ^ 1; > > same here. Ok.
diff --git a/drivers/usb/cdns3/gadget.c b/drivers/usb/cdns3/gadget.c index 1d8a2af35bb0..7b6bb96b91d1 100644 --- a/drivers/usb/cdns3/gadget.c +++ b/drivers/usb/cdns3/gadget.c @@ -2595,11 +2595,21 @@ int __cdns3_gadget_ep_clear_halt(struct cdns3_endpoint *priv_ep) { struct cdns3_device *priv_dev = priv_ep->cdns3_dev; struct usb_request *request; + struct cdns3_request *priv_req; + struct cdns3_trb *trb = NULL; int ret; int val; trace_cdns3_halt(priv_ep, 0, 0); + request = cdns3_next_request(&priv_ep->pending_req_list); + if (request) { + priv_req = to_cdns3_request(request); + trb = priv_req->trb; + if (trb) + trb->control = trb->control ^ 1; + } + writel(EP_CMD_CSTALL | EP_CMD_EPRST, &priv_dev->regs->ep_cmd); /* wait for EPRST cleared */ @@ -2610,10 +2620,11 @@ int __cdns3_gadget_ep_clear_halt(struct cdns3_endpoint *priv_ep) priv_ep->flags &= ~(EP_STALLED | EP_STALL_PENDING); - request = cdns3_next_request(&priv_ep->pending_req_list); - - if (request) + if (request) { + if (trb) + trb->control = trb->control ^ 1; cdns3_rearm_transfer(priv_ep, 1); + } cdns3_start_all_request(priv_dev, priv_ep); return ret;
If there are TRBs pending during clear stall and reset endpoint, the DMA will advance after reset operation, but it doesn't be expected, since the data has still not be ready (For OUT, the data has still not received). After the data is ready, there isn't any interrupt since the EP_TRADDR has already points to next TRB entry. To fix it, it toggles cyclt bit before reset operation, and restore it after reset, it could keep DMA stopping. Fixes: 7733f6c32e36 ("usb: cdns3: Add Cadence USB3 DRD Driver") Signed-off-by: Peter Chen <peter.chen@nxp.com> --- drivers/usb/cdns3/gadget.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)