Kyösti Mälkki (kyosti.malkki@gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3867
-gerrit
commit 3c82d4f662b68aea475b165db5b7cbaea85eeeae Author: Kyösti Mälkki kyosti.malkki@gmail.com Date: Sat Aug 10 10:08:38 2013 +0300
usbdebug: Fix control messages
Implementation did not have support for control messages with a write of non-zero length data stage.
Implementation did not send out status stage after a read of non-zero length data stage.
Change-Id: I16fb9ae39630b975af5461b63d050b9adaccef0f Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- src/lib/usbdebug.c | 41 +++++++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 6 deletions(-)
diff --git a/src/lib/usbdebug.c b/src/lib/usbdebug.c index 5f7a457..e84af5b 100644 --- a/src/lib/usbdebug.c +++ b/src/lib/usbdebug.c @@ -206,6 +206,11 @@ retry: ret = -DBGP_ERR_BAD; }
+ /* Abort on STALL handshake for endpoint 0.*/ + else if ((lpid == USB_PID_STALL) && (pipe->endpoint == 0x0)) { + ret = -DBGP_ERR_BAD; + } + dbgp_print_data(ehci_debug);
return ret; @@ -342,10 +347,10 @@ static int dbgp_control_msg(struct ehci_dbg_port *ehci_debug, unsigned devnum, i u32 pids, addr, ctrl; struct usb_ctrlrequest req; int read; - int ret; + int ret, ret2;
read = (requesttype & USB_DIR_IN) != 0; - if (size > (read ? DBGP_MAX_PACKET:0)) + if (size > DBGP_MAX_PACKET) return -1;
/* Compute the control message */ @@ -364,9 +369,8 @@ static int dbgp_control_msg(struct ehci_dbg_port *ehci_debug, unsigned devnum, i ctrl = read32((unsigned long)&ehci_debug->control); ctrl = DBGP_LEN_UPDATE(ctrl, sizeof(req)); ctrl |= DBGP_OUT; - ctrl |= DBGP_GO;
- /* Send the setup message */ + /* Setup stage */ dbgp_set_data(ehci_debug, &req, sizeof(req)); write32((unsigned long)&ehci_debug->address, addr); write32((unsigned long)&ehci_debug->pids, pids); @@ -374,8 +378,33 @@ static int dbgp_control_msg(struct ehci_dbg_port *ehci_debug, unsigned devnum, i if (ret < 0) return ret;
- /* Read the result */ - ret = dbgp_bulk_read(ehci_debug, pipe, data, size, DBGP_LOOPS); + /* Data stage (optional) */ + if (read && size) { + ret = dbgp_bulk_read(ehci_debug, pipe, data, size, DBGP_LOOPS); + if (ret <= 0) + return ret; + } + if (!read && size) { + ret = dbgp_bulk_write(ehci_debug, pipe, data, size); + } + + /* Status stage in opposite direction */ + pipe->pid = USB_PID_DATA1; + ctrl = read32((unsigned long)&ehci_debug->control); + ctrl = DBGP_LEN_UPDATE(ctrl, 0); + if (read) { + pids = DBGP_PID_SET(pipe->pid, USB_PID_OUT); + ctrl |= DBGP_OUT; + } else { + pids = DBGP_PID_SET(pipe->pid, USB_PID_IN); + ctrl &= ~DBGP_OUT; + } + + write32((unsigned long)&ehci_debug->pids, pids); + ret2 = dbgp_wait_until_done(ehci_debug, pipe, ctrl, DBGP_LOOPS); + if (ret2 < 0) + return ret2; + return ret; }