asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dwc3-msm: Remove additional check for link state U3

Browse source 
GSI can be suspended from function suspend and bus suspend. In case
of bus suspend, controller explicitly suspends the gadget only when
link state is U3/L2. In case of function suspend, link state cannot
be in U3/L2 as other functions are active. Therefore explicit
check for link state U3 is either redundant (suspend interrupt) or
not required (function suspend).

Change-Id: Icc4ef916c24e8b7cd563e48e642661b50aad8f27
Signed-off-by: Vamsi Krishna Samavedam <vskrishn@codeaurora.org>
This commit is contained in:
Vamsi Krishna Samavedam 2018-12-05 14:27:21 -08:00 committed by Gerrit - the friendly Code Review server
parent 50a8ed052a
commit e2c98d5d28
1 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/usb/dwc3/dwc3-msm.c
View file

@ -1326,13 +1326,9 @@ static void gsi_set_clear_dbell(struct usb_ep *ep,
*
* @usb_ep - pointer to usb_ep instance to access DWC3 regs
*/
static bool gsi_check_ready_to_suspend(struct usb_ep *ep, bool f_suspend)
static bool gsi_check_ready_to_suspend(struct dwc3_msm *mdwc)
{
u32 timeout = 1500;
u32 reg = 0;
struct dwc3_ep *dep = to_dwc3_ep(ep);
struct dwc3 *dwc = dep->dwc;
struct dwc3_msm *mdwc = dev_get_drvdata(dwc->dev->parent);
while (dwc3_msm_read_reg_field(mdwc->base,
GSI_IF_STS(mdwc->gsi_reg[IF_STS]), GSI_WR_CTRL_STATE_MASK)) {
@ -1342,14 +1338,6 @@ static bool gsi_check_ready_to_suspend(struct usb_ep *ep, bool f_suspend)
return false;
}
}
/* Check for U3 only if we are not handling Function Suspend */
if (!f_suspend) {
reg = dwc3_readl(dwc->regs, DWC3_DSTS);
if (DWC3_DSTS_USBLNKST(reg) != DWC3_LINK_STATE_U3) {
dev_err(mdwc->dev, "Unable to suspend GSI ch\n");
return false;
}
}
return true;
}
@ -1381,7 +1369,7 @@ static int dwc3_msm_gsi_ep_op(struct usb_ep *ep,
struct dwc3_msm *mdwc = dev_get_drvdata(dwc->dev->parent);
struct usb_gsi_request *request;
struct gsi_channel_info *ch_info;
bool block_db, f_suspend;
bool block_db;
unsigned long flags;
dbg_log_string("%s(%d):%s", ep->name, ep->ep_num, gsi_op_to_string(op));
@ -1441,8 +1429,7 @@ static int dwc3_msm_gsi_ep_op(struct usb_ep *ep,
gsi_set_clear_dbell(ep, block_db);
break;
case GSI_EP_OP_CHECK_FOR_SUSPEND:
f_suspend = *((bool *)op_data);
ret = gsi_check_ready_to_suspend(ep, f_suspend);
ret = gsi_check_ready_to_suspend(mdwc);
break;
case GSI_EP_OP_DISABLE:
ret = ep->ops->disable(ep);