From: Roel Kluin <roel.kluin@gmail.com>
To: rjarzmik@free.fr, dbrownell@users.sourceforge.net
Cc: linux-usb@vger.kernel.org, lkml <linux-kernel@vger.kernel.org>
Subject: [PATCH ?] usb/gadget/pxa27x_udc: test ep0state == IN_DATA_STAGE rather than non-bool USB_DIR_IN
Date: Wed, 14 May 2008 12:29:41 +0200 [thread overview]
Message-ID: <482ABF15.8090006@gmail.com> (raw)
The patch below was not tested!
#------------------------------------------------------------------------------#
drivers/usb/gadget/pxa27x_udc.c uses USB_DIR_IN as if boolean in functions
inc_ep_stats_{reqs,bytes}, lines 763, 795, 933, 985, 1037 and 1074, but
USB_DIR_IN is defined 0x80.
handle_ep0_ctrl_req() tests USB_DIR_IN bitwise and pxa_udc's ep0_state is set
IN_DATA_STAGE or OUT_DATA_STAGE. so ep->dev->ep0state == IN_DATA_STAGE should be
tested rather than USB_DIR_IN
I am uncertain whether this fix is correct and sufficient, feedback appreciated.
- Maybe more tests are required: is ep->dev == NULL or similar
- Maybe I should test ep->dev->ep0state == OUT_DATA_STAGE rather than
ep->dev->ep0state != IN_DATA_STAGE (instead of !USB_DIR_IN)
---
USB_DIR_IN is not boolean, test ep0state == IN_DATA_STAGE instead.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
---
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c
index 75eba20..ea18995 100644
--- a/drivers/usb/gadget/pxa27x_udc.c
+++ b/drivers/usb/gadget/pxa27x_udc.c
@@ -760,7 +760,7 @@ static void req_done(struct pxa_ep *ep, struct pxa27x_request *req, int status)
*/
static void ep_end_out_req(struct pxa_ep *ep, struct pxa27x_request *req)
{
- inc_ep_stats_reqs(ep, !USB_DIR_IN);
+ inc_ep_stats_reqs(ep, ep->dev->ep0state != IN_DATA_STAGE);
req_done(ep, req, 0);
}
@@ -792,7 +792,7 @@ static void ep0_end_out_req(struct pxa_ep *ep, struct pxa27x_request *req)
*/
static void ep_end_in_req(struct pxa_ep *ep, struct pxa27x_request *req)
{
- inc_ep_stats_reqs(ep, USB_DIR_IN);
+ inc_ep_stats_reqs(ep, ep->dev->ep0state == IN_DATA_STAGE);
req_done(ep, req, 0);
}
@@ -930,7 +930,8 @@ static int read_fifo(struct pxa_ep *ep, struct pxa27x_request *req)
while (epout_has_pkt(ep)) {
count = read_packet(ep, req);
- inc_ep_stats_bytes(ep, count, !USB_DIR_IN);
+ inc_ep_stats_bytes(ep, count,
+ ep->dev->ep0state != IN_DATA_STAGE);
is_short = (count < ep->fifo_size);
ep_dbg(ep, "read udccsr:%03x, count:%d bytes%s req %p %d/%d\n",
@@ -982,7 +983,8 @@ static int write_fifo(struct pxa_ep *ep, struct pxa27x_request *req)
}
count = write_packet(ep, req, max);
- inc_ep_stats_bytes(ep, count, USB_DIR_IN);
+ inc_ep_stats_bytes(ep, count,
+ ep->dev->ep0state == IN_DATA_STAGE);
totcount += count;
/* last packet is usually short (or a zlp) */
@@ -1034,7 +1036,8 @@ static int read_ep0_fifo(struct pxa_ep *ep, struct pxa27x_request *req)
while (epout_has_pkt(ep)) {
count = read_packet(ep, req);
udc_ep_writel(ep, UDCCSR, UDCCSR0_OPC);
- inc_ep_stats_bytes(ep, count, !USB_DIR_IN);
+ inc_ep_stats_bytes(ep, count,
+ ep->dev->ep0state != IN_DATA_STAGE);
is_short = (count < ep->fifo_size);
ep_dbg(ep, "read udccsr:%03x, count:%d bytes%s req %p %d/%d\n",
next reply other threads:[~2008-05-14 10:29 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-14 10:29 Roel Kluin [this message]
2008-05-14 19:12 ` [PATCH ?] usb/gadget/pxa27x_udc: test ep0state == IN_DATA_STAGE rather than non-bool USB_DIR_IN Robert Jarzmik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=482ABF15.8090006@gmail.com \
--to=roel.kluin@gmail.com \
--cc=dbrownell@users.sourceforge.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=rjarzmik@free.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox