lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wusb: timeout when waiting for ASL/PZL updates in whci-hcd

Browse Source 
Timeout if an ASL or PZL update doesn't not complete and reset the
hardware.

Signed-off-by: David Vrabel <david.vrabel@csr.com>
This commit is contained in:
David Vrabel
2009-01-07 10:54:22 +00:00
parent a23e66f3b8
commit a5e6ced58d
4 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/usb/host/whci/asl.c
View File

@@ -170,12 +170,17 @@ void asl_stop(struct whc *whc)
void asl_update(struct whc *whc, uint32_t wusbcmd) void asl_update(struct whc *whc, uint32_t wusbcmd)
{ {
struct wusbhc *wusbhc = &whc->wusbhc; struct wusbhc *wusbhc = &whc->wusbhc;
long t;
mutex_lock(&wusbhc->mutex); mutex_lock(&wusbhc->mutex);
if (wusbhc->active) { if (wusbhc->active) {
whc_write_wusbcmd(whc, wusbcmd, wusbcmd); whc_write_wusbcmd(whc, wusbcmd, wusbcmd);
wait_event(whc->async_list_wq, t = wait_event_timeout(
(le_readl(whc->base + WUSBCMD) & WUSBCMD_ASYNC_UPDATED) == 0); whc->async_list_wq,
(le_readl(whc->base + WUSBCMD) & WUSBCMD_ASYNC_UPDATED) == 0,
msecs_to_jiffies(1000));
if (t == 0)
whc_hw_error(whc, "ASL update timeout");
} }
mutex_unlock(&wusbhc->mutex); mutex_unlock(&wusbhc->mutex);
} }

15
drivers/usb/host/whci/hw.c
View File

@@ -87,3 +87,18 @@ out:
return ret; return ret;
} }
/**
* whc_hw_error - recover from a hardware error
* @whc: the WHCI HC that broke.
* @reason: a description of the failure.
*
* Recover from broken hardware with a full reset.
*/
void whc_hw_error(struct whc *whc, const char *reason)
{
struct wusbhc *wusbhc = &whc->wusbhc;
dev_err(&whc->umc->dev, "hardware error: %s\n", reason);
wusbhc_reset_all(wusbhc);
}

9
drivers/usb/host/whci/pzl.c
View File

@@ -183,12 +183,17 @@ void pzl_stop(struct whc *whc)
void pzl_update(struct whc *whc, uint32_t wusbcmd) void pzl_update(struct whc *whc, uint32_t wusbcmd)
{ {
struct wusbhc *wusbhc = &whc->wusbhc; struct wusbhc *wusbhc = &whc->wusbhc;
long t;
mutex_lock(&wusbhc->mutex); mutex_lock(&wusbhc->mutex);
if (wusbhc->active) { if (wusbhc->active) {
whc_write_wusbcmd(whc, wusbcmd, wusbcmd); whc_write_wusbcmd(whc, wusbcmd, wusbcmd);
wait_event(whc->periodic_list_wq, t = wait_event_timeout(
(le_readl(whc->base + WUSBCMD) & WUSBCMD_PERIODIC_UPDATED) == 0); whc->periodic_list_wq,
(le_readl(whc->base + WUSBCMD) & WUSBCMD_PERIODIC_UPDATED) == 0,
msecs_to_jiffies(1000));
if (t == 0)
whc_hw_error(whc, "PZL update timeout");
} }
mutex_unlock(&wusbhc->mutex); mutex_unlock(&wusbhc->mutex);
} }

1
drivers/usb/host/whci/whcd.h
View File

@@ -137,6 +137,7 @@ void whc_clean_up(struct whc *whc);
/* hw.c */ /* hw.c */
void whc_write_wusbcmd(struct whc *whc, u32 mask, u32 val); void whc_write_wusbcmd(struct whc *whc, u32 mask, u32 val);
int whc_do_gencmd(struct whc *whc, u32 cmd, u32 params, void *addr, size_t len); int whc_do_gencmd(struct whc *whc, u32 cmd, u32 params, void *addr, size_t len);
void whc_hw_error(struct whc *whc, const char *reason);
/* wusb.c */ /* wusb.c */
int whc_wusbhc_start(struct wusbhc *wusbhc); int whc_wusbhc_start(struct wusbhc *wusbhc);