* [PATCH 1/2] usb: gadget: aspeed_udc: cleanup loop in ast_dma_descriptor_setup()
@ 2022-06-18 8:54 Dan Carpenter
2022-06-18 8:54 ` [PATCH 2/2] usb: gadget: aspeed_udc: unlock on error in ast_udc_ep_queue() Dan Carpenter
2022-06-22 5:25 ` [PATCH 1/2] usb: gadget: aspeed_udc: cleanup loop in ast_dma_descriptor_setup() Neal Liu
0 siblings, 2 replies; 4+ messages in thread
From: Dan Carpenter @ 2022-06-18 8:54 UTC (permalink / raw)
To: Neal Liu
Cc: Felipe Balbi, Greg Kroah-Hartman, Joel Stanley, Andrew Jeffery,
linux-aspeed, linux-usb, kernel-janitors
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 <dan.carpenter@oracle.com>
---
drivers/usb/gadget/udc/aspeed_udc.c | 24 +++++++++++-------------
1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/drivers/usb/gadget/udc/aspeed_udc.c b/drivers/usb/gadget/udc/aspeed_udc.c
index 1fc15228ff15..77376ae04224 100644
--- a/drivers/usb/gadget/udc/aspeed_udc.c
+++ b/drivers/usb/gadget/udc/aspeed_udc.c
@@ -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;
--
2.35.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] usb: gadget: aspeed_udc: unlock on error in ast_udc_ep_queue()
2022-06-18 8:54 [PATCH 1/2] usb: gadget: aspeed_udc: cleanup loop in ast_dma_descriptor_setup() Dan Carpenter
@ 2022-06-18 8:54 ` Dan Carpenter
2022-06-21 9:24 ` Neal Liu
2022-06-22 5:25 ` [PATCH 1/2] usb: gadget: aspeed_udc: cleanup loop in ast_dma_descriptor_setup() Neal Liu
1 sibling, 1 reply; 4+ messages in thread
From: Dan Carpenter @ 2022-06-18 8:54 UTC (permalink / raw)
To: Neal Liu
Cc: Felipe Balbi, Greg Kroah-Hartman, Joel Stanley, Andrew Jeffery,
linux-aspeed, linux-usb, kernel-janitors
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 <dan.carpenter@oracle.com>
---
drivers/usb/gadget/udc/aspeed_udc.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/gadget/udc/aspeed_udc.c b/drivers/usb/gadget/udc/aspeed_udc.c
index 77376ae04224..4dead40895dd 100644
--- a/drivers/usb/gadget/udc/aspeed_udc.c
+++ b/drivers/usb/gadget/udc/aspeed_udc.c
@@ -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);
--
2.35.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* RE: [PATCH 2/2] usb: gadget: aspeed_udc: unlock on error in ast_udc_ep_queue()
2022-06-18 8:54 ` [PATCH 2/2] usb: gadget: aspeed_udc: unlock on error in ast_udc_ep_queue() Dan Carpenter
@ 2022-06-21 9:24 ` Neal Liu
0 siblings, 0 replies; 4+ messages in thread
From: Neal Liu @ 2022-06-21 9:24 UTC (permalink / raw)
To: Dan Carpenter
Cc: Felipe Balbi, Greg Kroah-Hartman, Joel Stanley, Andrew Jeffery,
linux-aspeed@lists.ozlabs.org, linux-usb@vger.kernel.org,
kernel-janitors@vger.kernel.org
> 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 <dan.carpenter@oracle.com>
> ---
> drivers/usb/gadget/udc/aspeed_udc.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/gadget/udc/aspeed_udc.c
> b/drivers/usb/gadget/udc/aspeed_udc.c
> index 77376ae04224..4dead40895dd 100644
> --- a/drivers/usb/gadget/udc/aspeed_udc.c
> +++ b/drivers/usb/gadget/udc/aspeed_udc.c
> @@ -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@HK0PR06MB3202.apcprd06.prod.outlook.com/
>
> ast_udc_ep0_queue(ep, req);
> --
> 2.35.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: [PATCH 1/2] usb: gadget: aspeed_udc: cleanup loop in ast_dma_descriptor_setup()
2022-06-18 8:54 [PATCH 1/2] usb: gadget: aspeed_udc: cleanup loop in ast_dma_descriptor_setup() Dan Carpenter
2022-06-18 8:54 ` [PATCH 2/2] usb: gadget: aspeed_udc: unlock on error in ast_udc_ep_queue() Dan Carpenter
@ 2022-06-22 5:25 ` Neal Liu
1 sibling, 0 replies; 4+ messages in thread
From: Neal Liu @ 2022-06-22 5:25 UTC (permalink / raw)
To: Dan Carpenter
Cc: Felipe Balbi, Greg Kroah-Hartman, Joel Stanley, Andrew Jeffery,
linux-aspeed@lists.ozlabs.org, linux-usb@vger.kernel.org,
kernel-janitors@vger.kernel.org
> 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 <dan.carpenter@oracle.com>
> ---
> drivers/usb/gadget/udc/aspeed_udc.c | 24 +++++++++++-------------
> 1 file changed, 11 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/usb/gadget/udc/aspeed_udc.c
> b/drivers/usb/gadget/udc/aspeed_udc.c
> index 1fc15228ff15..77376ae04224 100644
> --- a/drivers/usb/gadget/udc/aspeed_udc.c
> +++ b/drivers/usb/gadget/udc/aspeed_udc.c
> @@ -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) {
>
Simpler loop looks good to me. But short packet need to be considered also. (chunk == 0)
> 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;
> --
> 2.35.1
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-06-22 5:25 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-18 8:54 [PATCH 1/2] usb: gadget: aspeed_udc: cleanup loop in ast_dma_descriptor_setup() Dan Carpenter
2022-06-18 8:54 ` [PATCH 2/2] usb: gadget: aspeed_udc: unlock on error in ast_udc_ep_queue() Dan Carpenter
2022-06-21 9:24 ` Neal Liu
2022-06-22 5:25 ` [PATCH 1/2] usb: gadget: aspeed_udc: cleanup loop in ast_dma_descriptor_setup() Neal Liu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).