leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb: dwc3: gadget: extract unlocked dwc3_gadget_wakeup()

Browse Source 
we will need this from StartTransfer to make sure
link is in U0 before starting a transfer.

Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
This commit is contained in:
Felipe Balbi 2016-04-04 11:24:04 +03:00
parent 2b0f11df84
commit 218ef7b647
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/usb/dwc3/gadget.c
View File

@ -1361,22 +1361,16 @@ static int dwc3_gadget_get_frame(struct usb_gadget *g)
return DWC3_DSTS_SOFFN(reg); return DWC3_DSTS_SOFFN(reg);
} }
static int dwc3_gadget_wakeup(struct usb_gadget *g) static int __dwc3_gadget_wakeup(struct dwc3 *dwc)
{ {
struct dwc3 *dwc = gadget_to_dwc(g);
unsigned long timeout; unsigned long timeout;
unsigned long flags;
int ret;
u32 reg; u32 reg;
int ret = 0;
u8 link_state; u8 link_state;
u8 speed; u8 speed;
spin_lock_irqsave(&dwc->lock, flags);
/* /*
* According to the Databook Remote wakeup request should * According to the Databook Remote wakeup request should
* be issued only when the device is in early suspend state. * be issued only when the device is in early suspend state.
@ -1389,8 +1383,7 @@ static int dwc3_gadget_wakeup(struct usb_gadget *g)
if ((speed == DWC3_DSTS_SUPERSPEED) || if ((speed == DWC3_DSTS_SUPERSPEED) ||
(speed == DWC3_DSTS_SUPERSPEED_PLUS)) { (speed == DWC3_DSTS_SUPERSPEED_PLUS)) {
dwc3_trace(trace_dwc3_gadget, "no wakeup on SuperSpeed\n"); dwc3_trace(trace_dwc3_gadget, "no wakeup on SuperSpeed\n");
ret = -EINVAL; return -EINVAL;
goto out;
} }
link_state = DWC3_DSTS_USBLNKST(reg); link_state = DWC3_DSTS_USBLNKST(reg);
@ -1403,14 +1396,13 @@ static int dwc3_gadget_wakeup(struct usb_gadget *g)
dwc3_trace(trace_dwc3_gadget, dwc3_trace(trace_dwc3_gadget,
"can't wakeup from '%s'\n", "can't wakeup from '%s'\n",
dwc3_gadget_link_string(link_state)); dwc3_gadget_link_string(link_state));
ret = -EINVAL; return -EINVAL;
goto out;
} }
ret = dwc3_gadget_set_link_state(dwc, DWC3_LINK_STATE_RECOV); ret = dwc3_gadget_set_link_state(dwc, DWC3_LINK_STATE_RECOV);
if (ret < 0) { if (ret < 0) {
dev_err(dwc->dev, "failed to put link in Recovery\n"); dev_err(dwc->dev, "failed to put link in Recovery\n");
goto out; return ret;
} }
/* Recent versions do this automatically */ /* Recent versions do this automatically */
@ -1434,10 +1426,20 @@ static int dwc3_gadget_wakeup(struct usb_gadget *g)
if (DWC3_DSTS_USBLNKST(reg) != DWC3_LINK_STATE_U0) { if (DWC3_DSTS_USBLNKST(reg) != DWC3_LINK_STATE_U0) {
dev_err(dwc->dev, "failed to send remote wakeup\n"); dev_err(dwc->dev, "failed to send remote wakeup\n");
ret = -EINVAL; return -EINVAL;
} }
out: return 0;
}
static int dwc3_gadget_wakeup(struct usb_gadget *g)
{
struct dwc3 *dwc = gadget_to_dwc(g);
unsigned long flags;
int ret;
spin_lock_irqsave(&dwc->lock, flags);
ret = __dwc3_gadget_wakeup(dwc);
spin_unlock_irqrestore(&dwc->lock, flags); spin_unlock_irqrestore(&dwc->lock, flags);
return ret; return ret;