From mboxrd@z Thu Jan 1 00:00:00 1970 From: Roger Quadros Subject: Re: [PATCH v4 9/9] usb: dwc3: core: don't break during suspend/resume while we're dual-role Date: Thu, 3 Sep 2015 17:01:32 +0300 Message-ID: <55E852BC.9000502@ti.com> References: <1441203864-15786-1-git-send-email-rogerq@ti.com> <1441203864-15786-10-git-send-email-rogerq@ti.com> <55E7303D.8080904@cogentembedded.com> Mime-Version: 1.0 Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <55E7303D.8080904-M4DtvfQ/ZS1MRgGoP+s0PdBPR1lH4CV8@public.gmane.org> Sender: linux-usb-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Sergei Shtylyov , balbi-l0cyMroinI0@public.gmane.org Cc: tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org, Joao.Pinto-HKixBCOQz3hWk0Htik3J/w@public.gmane.org, peter.chen-KZfg59tc24xl57MIdRCFDg@public.gmane.org, jun.li-KZfg59tc24xl57MIdRCFDg@public.gmane.org, linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: linux-omap@vger.kernel.org On 02/09/15 20:22, Sergei Shtylyov wrote: > Hello. > > On 09/02/2015 05:24 PM, Roger Quadros wrote: > >> We can't rely just on dr_mode to decide if we're in host or gadget >> mode when we're configured as otg/dual-role. So while dr_mode is >> OTG, we find out from the otg state machine if we're in host >> or gadget mode and take the necessary actions during suspend/resume. >> >> Also make sure that we disable OTG irq and events during system suspend >> so that we don't lockup the system during system suspend/resume. >> >> Signed-off-by: Roger Quadros >> --- >> drivers/usb/dwc3/core.c | 27 +++++++++------------------ >> 1 file changed, 9 insertions(+), 18 deletions(-) >> >> diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c >> index 654aebf..25891e3 100644 >> --- a/drivers/usb/dwc3/core.c >> +++ b/drivers/usb/dwc3/core.c >> @@ -1455,18 +1455,15 @@ static int dwc3_suspend(struct device *dev) >> dwc->octl = dwc3_readl(dwc->regs, DWC3_OCTL); >> dwc->oevt = dwc3_readl(dwc->regs, DWC3_OEVT); >> dwc->oevten = dwc3_readl(dwc->regs, DWC3_OEVTEN); >> + dwc3_writel(dwc->regs, DWC3_OEVTEN, 0); >> + disable_irq(dwc->otg_irq); >> } >> >> - switch (dwc->dr_mode) { >> - case USB_DR_MODE_PERIPHERAL: >> - case USB_DR_MODE_OTG: >> + if (dwc->dr_mode == USB_DR_MODE_PERIPHERAL || >> + ((dwc->dr_mode == USB_DR_MODE_OTG) && (dwc->fsm->protocol == PROTO_GADGET))) > > Hm, you're not very consistent about your parens. :-) You're right. Should be if ((dwc->dr_mode == USB_DR_MODE_PERIPHERAL) || ((dwc->dr_mode == USB_DR_MODE_OTG) && (dwc->fsm->protocol == PROTO_GADGET))) > > [...] >> @@ -1506,18 +1503,12 @@ static int dwc3_resume(struct device *dev) >> dwc3_writel(dwc->regs, DWC3_OCTL, dwc->octl); >> dwc3_writel(dwc->regs, DWC3_OEVT, dwc->oevt); >> dwc3_writel(dwc->regs, DWC3_OEVTEN, dwc->oevten); >> + enable_irq(dwc->otg_irq); >> } >> >> - switch (dwc->dr_mode) { >> - case USB_DR_MODE_PERIPHERAL: >> - case USB_DR_MODE_OTG: >> + if (dwc->dr_mode == USB_DR_MODE_PERIPHERAL || >> + ((dwc->dr_mode == USB_DR_MODE_OTG) && (dwc->fsm->protocol == PROTO_GADGET))) > > Same here... -- cheers, -roger -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html