From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934133AbbGHNLb (ORCPT ); Wed, 8 Jul 2015 09:11:31 -0400 Received: from mail-lb0-f172.google.com ([209.85.217.172]:33739 "EHLO mail-lb0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753999AbbGHNL0 (ORCPT ); Wed, 8 Jul 2015 09:11:26 -0400 Subject: Re: [PATCH v3 9/9] usb: dwc3: core: don't break during suspend/resume while we're dual-role To: Roger Quadros , balbi@ti.com References: <1436351524-28385-1-git-send-email-rogerq@ti.com> <1436351860-28813-1-git-send-email-rogerq@ti.com> Cc: tony@atomide.com, Joao.Pinto@synopsys.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org From: Sergei Shtylyov Message-ID: <559D217B.5000500@cogentembedded.com> Date: Wed, 8 Jul 2015 16:11:23 +0300 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.0.1 MIME-Version: 1.0 In-Reply-To: <1436351860-28813-1-git-send-email-rogerq@ti.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hello. On 7/8/2015 1:37 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 e3c094d..3784287 100644 > --- a/drivers/usb/dwc3/core.c > +++ b/drivers/usb/dwc3/core.c > @@ -1444,18 +1444,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)) Hum, enclosing the first == op into parens and not doing it to the second == op doesn't look very consistent... :-) [...] > @@ -1495,18 +1492,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... [...] WBR, Sergei