sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

USBDEBUG: retry harder for slow devices

Browse Source 
Some usb debug devices don't respond fast enough. The linux kernel
(which uses almost the same usbdebug code) added a bit more
retry code, so let's copy that. Even if it might look stupid,
i pass the DBG_LOOPS argument through all functions to keep
the code at least a bit in sync with the linux kernel code.

Change-Id: I7c4b63b8bf1d2270fd6b8c8aa835e2cb324820bd
Signed-off-by: Sven Schnelle <svens@stackframe.org>
Reviewed-on: http://review.coreboot.org/1375
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Sven Schnelle
2012-07-25 14:19:45 +02:00
parent 4141993536
commit 1068087c64
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/lib/usbdebug.c
View File

@@ -80,6 +80,7 @@
#define HUB_RESET_TIMEOUT 500 #define HUB_RESET_TIMEOUT 500
#define DBGP_MAX_PACKET 8 #define DBGP_MAX_PACKET 8
#define DBGP_LOOPS 1000
static int dbgp_wait_until_complete(struct ehci_dbg_port *ehci_debug) static int dbgp_wait_until_complete(struct ehci_dbg_port *ehci_debug)
{ {
@@ -108,11 +109,10 @@ static void dbgp_breath(void)
/* Sleep to give the debug port a chance to breathe */ /* Sleep to give the debug port a chance to breathe */
} }
static int dbgp_wait_until_done(struct ehci_dbg_port *ehci_debug, unsigned ctrl) static int dbgp_wait_until_done(struct ehci_dbg_port *ehci_debug, unsigned ctrl, int loop)
{ {
u32 pids, lpid; u32 pids, lpid;
int ret; int ret;
int loop = 3;
retry: retry:
write32((unsigned long)&ehci_debug->control, ctrl | DBGP_GO); write32((unsigned long)&ehci_debug->control, ctrl | DBGP_GO);
@@ -120,8 +120,11 @@ retry:
pids = read32((unsigned long)&ehci_debug->pids); pids = read32((unsigned long)&ehci_debug->pids);
lpid = DBGP_PID_GET(pids); lpid = DBGP_PID_GET(pids);
if (ret < 0) if (ret < 0) {
if (ret == -DBGP_ERR_BAD && --loop > 0)
goto retry;
return ret; return ret;
}
/* If the port is getting full or it has dropped data /* If the port is getting full or it has dropped data
* start pacing ourselves, not necessary but it's friendly. * start pacing ourselves, not necessary but it's friendly.
@@ -190,7 +193,7 @@ static int dbgp_bulk_write(struct ehci_dbg_port *ehci_debug,
write32((unsigned long)&ehci_debug->address, addr); write32((unsigned long)&ehci_debug->address, addr);
write32((unsigned long)&ehci_debug->pids, pids); write32((unsigned long)&ehci_debug->pids, pids);
ret = dbgp_wait_until_done(ehci_debug, ctrl); ret = dbgp_wait_until_done(ehci_debug, ctrl, DBGP_LOOPS);
return ret; return ret;
} }
@@ -202,7 +205,7 @@ int dbgp_bulk_write_x(struct ehci_debug_info *dbg_info, const char *bytes, int s
} }
static int dbgp_bulk_read(struct ehci_dbg_port *ehci_debug, unsigned devnum, static int dbgp_bulk_read(struct ehci_dbg_port *ehci_debug, unsigned devnum,
unsigned endpoint, void *data, int size) unsigned endpoint, void *data, int size, int loops)
{ {
u32 pids, addr, ctrl; u32 pids, addr, ctrl;
int ret; int ret;
@@ -222,7 +225,7 @@ static int dbgp_bulk_read(struct ehci_dbg_port *ehci_debug, unsigned devnum,
write32((unsigned long)&ehci_debug->address, addr); write32((unsigned long)&ehci_debug->address, addr);
write32((unsigned long)&ehci_debug->pids, pids); write32((unsigned long)&ehci_debug->pids, pids);
ret = dbgp_wait_until_done(ehci_debug, ctrl); ret = dbgp_wait_until_done(ehci_debug, ctrl, loops);
if (ret < 0) if (ret < 0)
return ret; return ret;
@@ -235,7 +238,7 @@ static int dbgp_bulk_read(struct ehci_dbg_port *ehci_debug, unsigned devnum,
int dbgp_bulk_read_x(struct ehci_debug_info *dbg_info, void *data, int size) int dbgp_bulk_read_x(struct ehci_debug_info *dbg_info, void *data, int size)
{ {
return dbgp_bulk_read(dbg_info->ehci_debug, dbg_info->devnum, return dbgp_bulk_read(dbg_info->ehci_debug, dbg_info->devnum,
dbg_info->endpoint_in, data, size); dbg_info->endpoint_in, data, size, DBGP_LOOPS);
} }
static void dbgp_mdelay(int ms) static void dbgp_mdelay(int ms)
@@ -279,13 +282,13 @@ static int dbgp_control_msg(struct ehci_dbg_port *ehci_debug, unsigned devnum, i
dbgp_set_data(ehci_debug, &req, sizeof(req)); dbgp_set_data(ehci_debug, &req, sizeof(req));
write32((unsigned long)&ehci_debug->address, addr); write32((unsigned long)&ehci_debug->address, addr);
write32((unsigned long)&ehci_debug->pids, pids); write32((unsigned long)&ehci_debug->pids, pids);
ret = dbgp_wait_until_done(ehci_debug, ctrl); ret = dbgp_wait_until_done(ehci_debug, ctrl, DBGP_LOOPS);
if (ret < 0) if (ret < 0)
return ret; return ret;
/* Read the result */ /* Read the result */
ret = dbgp_bulk_read(ehci_debug, devnum, 0, data, size); ret = dbgp_bulk_read(ehci_debug, devnum, 0, data, size, DBGP_LOOPS);
return ret; return ret;
} }