usb: gadget: aspeed_udc: cleanup loop in ast_dma_descriptor_setup()
Subsystems (4)
PATCH 1/2 usb: gadget: aspeed_udc: cleanup loop in ast_dma_descriptor_setup()
The "chunk >= 0" condition does not work because count is a u32. Also, really we shouldn't enter the loop when "chunk" is zero.
Once that condition is fixed then there is no need for the "last" variable. I reversed the "if (chunk <= ep->chunk_max)" as well. The new loop is much simpler.
--- drivers/usb/gadget/udc/aspeed_udc.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)
drivers/usb/gadget/udc/aspeed_udc.c +11 -13
@@ -476,8 +476,8 @@ static int ast_dma_descriptor_setup(struct ast_udc_ep *ep, u32 dma_buf, {struct ast_udc_dev *udc = ep->udc;struct device *dev = &udc->pdev->dev; -u32 offset, chunk; -int count, last; +int chunk, count; +u32 offset;if (!ep->descs) { dev_warn(dev, "%s: Empty DMA descs list failure\n",
@@ -486,30 +486,28 @@ static int ast_dma_descriptor_setup(struct ast_udc_ep *ep, u32 dma_buf, } chunk = tx_len; - offset = count = last =0 ; + offset = count =0 ;EP_DBG (ep,"req @%p, %s:%d, %s:0x%x, %s:0x%x\n" , req,"wptr" , ep->descs_wptr,"dma_buf" , dma_buf,"tx_len" , tx_len);/* Create Descriptor Lists */ -while (chunk >=0 && !last && count <AST_UDC_DESCS_COUNT ) { +while (chunk >0 && count <AST_UDC_DESCS_COUNT ) { ep->descs[ep->descs_wptr].des_0 = dma_buf + offset; -if (chunk <= ep->chunk_max) { - ep->descs[ep->descs_wptr].des_1 = chunk; - last =1 ; - }else { +if (chunk > ep->chunk_max) ep->descs[ep->descs_wptr].des_1 = ep->chunk_max; - chunk -= ep->chunk_max; - } +else + ep->descs[ep->descs_wptr].des_1 = chunk; + + chunk -= ep->chunk_max; -EP_DBG (ep,"descs[%d]: 0x%x 0x%x, last:%d\n" , +EP_DBG (ep,"descs[%d]: 0x%x 0x%x\n" , ep->descs_wptr, ep->descs[ep->descs_wptr].des_0, - ep->descs[ep->descs_wptr].des_1, - last); + ep->descs[ep->descs_wptr].des_1);if (count ==0 ) req->saved_dma_wptr = ep->descs_wptr;
Signature · 1 line
2.35.1
PATCH 2/2 usb: gadget: aspeed_udc: unlock on error in ast_udc_ep_queue()
Call spin_unlock_irqrestore(&udc->lock, flags); before returning an error code.
--- drivers/usb/gadget/udc/aspeed_udc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/gadget/udc/aspeed_udc.c +2 -1
@@ -663,7 +663,8 @@ static int ast_udc_ep_queue(struct usb_ep *_ep, struct usb_request *_req,if (ep->ep.desc ==NULL ) {if ((req->req.dma %4 ) !=0 ) {dev_warn (dev,"EP0 req dma alignment error\n" ); -return -ESHUTDOWN ; + rc = -ESHUTDOWN ; + goto end; }ast_udc_ep0_queue (ep, req);
Signature · 1 line
2.35.1
Neal Liu
maintainerRE: [PATCH 2/2] usb: gadget: aspeed_udc: unlock on error in ast_udc_ep_queue()
Quoted 14 lines
Call
spin_unlock_irqrestore(&udc->lock, flags); before returning an error code.Fixes 055276c13205 ("usb: gadget: add Aspeed ast2600 udc driver")Signed-off-by Dan Carpenter <[email protected]>--- drivers/usb/gadget/udc/aspeed_udc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/usb/gadget/udc/aspeed_udc.c +0
-0
drivers/usb/gadget/udc/aspeed_udc.c static int ast_udc_ep_queue(struct usb_ep *_ep, struct · line 669
Quoted 8 lines
drivers/usb/gadget/udc/aspeed_udc.c +2
-1@@ -663,7 +663,8 @@ static int ast_udc_ep_queue(struct usb_ep *_ep, struct usb_request *_req, if (ep->ep.desc == NULL) {if ((req->req.dma %4 ) !=0 ) {dev_warn (dev,"EP0 req dma alignment error\n" ); -return -ESHUTDOWN ; + rc = -ESHUTDOWN ; + goto end; }
One step late, thanks for the patch anyway.
https://lore.kernel.org/lkml/HK0PR06MB3202958ED74CD706458B85CE80AF9 at HK0PR06MB3202.apcprd06.prod.outlook.com/
Quoted 4 lines
drivers/usb/gadget/udc/aspeed_udc.c +0
-1ast_udc_ep0_queue (ep, req); --2.35.1
Neal Liu
maintainerQuoted 35 lines
The "chunk >= 0" condition does not work because count is a u32. Also, really we shouldn't enter the loop when "chunk" is zero.
Once that condition is fixed then there is no need for the "last" variable. I reversed the "if (chunk <=
ep->chunk_max)" as well. The new loop is much simpler.Fixes 055276c13205 ("usb: gadget: add Aspeed ast2600 udc driver")Signed-off-by Dan Carpenter <[email protected]>--- drivers/usb/gadget/udc/aspeed_udc.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)drivers/usb/gadget/udc/aspeed_udc.c +3
-2@@ -476,8 +476,8 @@ static int ast_dma_descriptor_setup(struct ast_udc_ep *ep, u32 dma_buf, {struct ast_udc_dev *udc = ep->udc;struct device *dev = &udc->pdev->dev; -u32 offset, chunk; -int count, last; +int chunk, count; +u32 offset;if (!ep->descs) { dev_warn(dev, "%s: Empty DMA descs list failure\n", @@ -486,30 +486,28 @@ static int ast_dma_descriptor_setup(struct ast_udc_ep *ep, u32
dma_buf,drivers/usb/gadget/udc/aspeed_udc.c +0
-0} chunk = tx_len;
drivers/usb/gadget/udc/aspeed_udc.c static int ast_dma_descriptor_setup(struct ast_udc_ep *ep, u32 dma_buf, · line 496
Quoted 10 lines
drivers/usb/gadget/udc/aspeed_udc.c +2
-2- offset = count = last =0 ; + offset = count =0 ;EP_DBG (ep,"req @%p, %s:%d, %s:0x%x, %s:0x%x\n" , req,"wptr" , ep->descs_wptr,"dma_buf" , dma_buf,"tx_len" , tx_len);/* Create Descriptor Lists */ -while (chunk >=0 && !last && count <AST_UDC_DESCS_COUNT ) { +while (chunk >0 && count <AST_UDC_DESCS_COUNT ) {
Simpler loop looks good to me. But short packet need to be considered also. (chunk == 0)
Quoted 27 lines
drivers/usb/gadget/udc/aspeed_udc.c +7
-10ep->descs[ep->descs_wptr].des_0 = dma_buf + offset; -if (chunk <= ep->chunk_max) { - ep->descs[ep->descs_wptr].des_1 = chunk; - last =1 ; - }else { +if (chunk > ep->chunk_max) ep->descs[ep->descs_wptr].des_1 = ep->chunk_max; - chunk -= ep->chunk_max; - } +else + ep->descs[ep->descs_wptr].des_1 = chunk; + + chunk -= ep->chunk_max; -EP_DBG (ep,"descs[%d]: 0x%x 0x%x, last:%d\n" , +EP_DBG (ep,"descs[%d]: 0x%x 0x%x\n" , ep->descs_wptr, ep->descs[ep->descs_wptr].des_0, - ep->descs[ep->descs_wptr].des_1, - last); + ep->descs[ep->descs_wptr].des_1);if (count ==0 ) req->saved_dma_wptr = ep->descs_wptr; --2.35.1