From: Felipe Balbi <balbi@ti.com> To: Roger Quadros <rogerq@ti.com> Cc: <balbi@ti.com>, <tony@atomide.com>, <Joao.Pinto@synopsys.com>, <sergei.shtylyov@cogentembedded.com>, <peter.chen@freescale.com>, <jun.li@freescale.com>, <linux-usb@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <linux-omap@vger.kernel.org> Subject: Re: [PATCH v4 9/9] usb: dwc3: core: don't break during suspend/resume while we're dual-role Date: Wed, 2 Sep 2015 09:48:12 -0500 [thread overview] Message-ID: <20150902144812.GJ8299@saruman.tx.rr.com> (raw) In-Reply-To: <1441203864-15786-10-git-send-email-rogerq@ti.com> [-- Attachment #1: Type: text/plain, Size: 2527 bytes --] On Wed, Sep 02, 2015 at 05:24:24PM +0300, 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 <rogerq@ti.com> > --- > 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); you don't need disable_irq() here. In fact, it causes problems since you're calling it with IRQs disabled. > } > > - 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))) > dwc3_gadget_suspend(dwc); > - /* FALLTHROUGH */ > - case USB_DR_MODE_HOST: > - default: > - dwc3_event_buffers_cleanup(dwc); > - break; > - } > + > + dwc3_event_buffers_cleanup(dwc); > > dwc->gctl = dwc3_readl(dwc->regs, DWC3_GCTL); > spin_unlock_irqrestore(&dwc->lock, flags); > @@ -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))) > dwc3_gadget_resume(dwc); > - /* FALLTHROUGH */ > - case USB_DR_MODE_HOST: > - default: > - /* do nothing */ > - break; > - } > > spin_unlock_irqrestore(&dwc->lock, flags); > > -- > 2.1.4 > -- balbi [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 819 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Felipe Balbi <balbi@ti.com> To: Roger Quadros <rogerq@ti.com> Cc: balbi@ti.com, tony@atomide.com, Joao.Pinto@synopsys.com, sergei.shtylyov@cogentembedded.com, peter.chen@freescale.com, jun.li@freescale.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org Subject: Re: [PATCH v4 9/9] usb: dwc3: core: don't break during suspend/resume while we're dual-role Date: Wed, 2 Sep 2015 09:48:12 -0500 [thread overview] Message-ID: <20150902144812.GJ8299@saruman.tx.rr.com> (raw) In-Reply-To: <1441203864-15786-10-git-send-email-rogerq@ti.com> [-- Attachment #1: Type: text/plain, Size: 2527 bytes --] On Wed, Sep 02, 2015 at 05:24:24PM +0300, 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 <rogerq@ti.com> > --- > 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); you don't need disable_irq() here. In fact, it causes problems since you're calling it with IRQs disabled. > } > > - 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))) > dwc3_gadget_suspend(dwc); > - /* FALLTHROUGH */ > - case USB_DR_MODE_HOST: > - default: > - dwc3_event_buffers_cleanup(dwc); > - break; > - } > + > + dwc3_event_buffers_cleanup(dwc); > > dwc->gctl = dwc3_readl(dwc->regs, DWC3_GCTL); > spin_unlock_irqrestore(&dwc->lock, flags); > @@ -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))) > dwc3_gadget_resume(dwc); > - /* FALLTHROUGH */ > - case USB_DR_MODE_HOST: > - default: > - /* do nothing */ > - break; > - } > > spin_unlock_irqrestore(&dwc->lock, flags); > > -- > 2.1.4 > -- balbi [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2015-09-02 14:48 UTC|newest] Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-09-02 14:24 [PATCH v4 0/9] usb: dwc3: add dual-role support Roger Quadros 2015-09-02 14:24 ` Roger Quadros 2015-09-02 14:24 ` [PATCH v4 1/9] " Roger Quadros 2015-09-02 14:24 ` Roger Quadros 2015-09-02 14:31 ` Felipe Balbi 2015-09-02 14:31 ` Felipe Balbi 2015-09-03 12:21 ` Roger Quadros 2015-09-03 12:21 ` Roger Quadros 2015-09-03 15:44 ` Felipe Balbi 2015-09-03 15:44 ` Felipe Balbi 2015-09-04 9:06 ` Roger Quadros 2015-09-04 9:06 ` Roger Quadros 2015-09-07 9:42 ` Roger Quadros 2015-09-07 9:42 ` Roger Quadros 2015-09-06 2:02 ` Peter Chen 2015-09-06 2:02 ` Peter Chen 2015-09-07 9:39 ` Roger Quadros 2015-09-07 9:39 ` Roger Quadros 2015-09-02 14:24 ` [PATCH v4 2/9] usb: dwc3: core.h: add some register definitions Roger Quadros 2015-09-02 14:24 ` Roger Quadros 2015-09-02 14:24 ` [PATCH v4 3/9] usb: dwc3: dwc3-omap: Make the wrapper interrupt shared Roger Quadros 2015-09-02 14:24 ` Roger Quadros 2015-09-02 14:32 ` Felipe Balbi 2015-09-02 14:32 ` Felipe Balbi 2015-09-02 14:24 ` [PATCH v4 4/9] usb: dwc3: core: Adapt to named interrupts Roger Quadros 2015-09-02 14:24 ` Roger Quadros 2015-09-02 14:34 ` Felipe Balbi 2015-09-02 14:34 ` Felipe Balbi 2015-09-03 12:46 ` Roger Quadros 2015-09-03 12:46 ` Roger Quadros 2015-09-03 15:48 ` Felipe Balbi 2015-09-03 15:48 ` Felipe Balbi 2015-09-04 9:11 ` Roger Quadros 2015-09-04 9:11 ` Roger Quadros 2015-09-02 14:24 ` [PATCH v4 5/9] usb: dwc3: core: make dual-role work with OTG irq Roger Quadros 2015-09-02 14:24 ` Roger Quadros 2015-09-02 14:43 ` Felipe Balbi 2015-09-02 14:43 ` Felipe Balbi 2015-09-03 13:52 ` Roger Quadros 2015-09-03 13:52 ` Roger Quadros 2015-09-03 15:51 ` Felipe Balbi 2015-09-03 15:51 ` Felipe Balbi 2015-09-04 9:13 ` Roger Quadros 2015-09-04 9:13 ` Roger Quadros 2015-09-06 2:20 ` Peter Chen 2015-09-06 2:20 ` Peter Chen 2015-09-15 14:46 ` Roger Quadros 2015-09-15 14:46 ` Roger Quadros 2015-09-02 14:24 ` [PATCH v4 6/9] usb: dwc3: save/restore OTG registers during suspend/resume Roger Quadros 2015-09-02 14:24 ` Roger Quadros 2015-09-02 14:44 ` Felipe Balbi 2015-09-02 14:44 ` Felipe Balbi 2015-09-03 13:54 ` Roger Quadros 2015-09-03 13:54 ` Roger Quadros 2015-09-02 14:24 ` [PATCH v4 7/9] usb: dwc3: gadget: Fix suspend/resume during dual-role mode Roger Quadros 2015-09-02 14:24 ` Roger Quadros 2015-09-02 14:24 ` [PATCH v4 8/9] usb: dwc3: core: Prevent otg events from disabling themselves Roger Quadros 2015-09-02 14:24 ` Roger Quadros 2015-09-02 14:47 ` Felipe Balbi 2015-09-02 14:47 ` Felipe Balbi 2015-09-03 13:54 ` Roger Quadros 2015-09-03 13:54 ` Roger Quadros 2015-09-02 14:24 ` [PATCH v4 9/9] usb: dwc3: core: don't break during suspend/resume while we're dual-role Roger Quadros 2015-09-02 14:24 ` Roger Quadros 2015-09-02 14:48 ` Felipe Balbi [this message] 2015-09-02 14:48 ` Felipe Balbi 2015-09-03 14:02 ` Roger Quadros 2015-09-03 14:02 ` Roger Quadros 2015-09-02 17:22 ` Sergei Shtylyov 2015-09-03 14:01 ` Roger Quadros 2015-09-03 14:01 ` Roger Quadros 2015-09-03 14:05 ` Sergei Shtylyov 2015-09-03 14:05 ` Sergei Shtylyov 2015-09-03 14:10 ` Roger Quadros 2015-09-03 14:10 ` Roger Quadros 2015-09-03 14:13 ` Sergei Shtylyov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20150902144812.GJ8299@saruman.tx.rr.com \ --to=balbi@ti.com \ --cc=Joao.Pinto@synopsys.com \ --cc=jun.li@freescale.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=linux-usb@vger.kernel.org \ --cc=peter.chen@freescale.com \ --cc=rogerq@ti.com \ --cc=sergei.shtylyov@cogentembedded.com \ --cc=tony@atomide.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.