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 8/9] usb: dwc3: core: Prevent otg events from disabling themselves Date: Wed, 2 Sep 2015 09:47:05 -0500 [thread overview] Message-ID: <20150902144705.GI8299@saruman.tx.rr.com> (raw) In-Reply-To: <1441203864-15786-9-git-send-email-rogerq@ti.com> [-- Attachment #1: Type: text/plain, Size: 1847 bytes --] On Wed, Sep 02, 2015 at 05:24:23PM +0300, Roger Quadros wrote: > There is a race happening during dwc3_drd_init() that causes > otg events to get disabled. This is what happens. > > dwc3_otg_irq() happens immediately when PRTCAP is set to OTG, > even though OEVTEN is 0. This is because BIT 31 IRQ of > OEVT can't be disabled by OEVTEN. > We configure OEVTEN in dwc3_otg_init() but dwc3_otg_irq() has > already saved OEVTEN as 0 into dwc->oevten. So finally when > dwc3_irq_thread_irq() is called we save 0 into OEVTEN > thus disabling OTG irqs forever. > > We fix this by disabling IRQs when configuring OEVTEN in > dwc3_otg_init(). > > Signed-off-by: Roger Quadros <rogerq@ti.com> can't you just merge this patch into the one which introduced the bug to start with ? > --- > drivers/usb/dwc3/core.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c > index 684010c..654aebf 100644 > --- a/drivers/usb/dwc3/core.c > +++ b/drivers/usb/dwc3/core.c > @@ -921,6 +921,7 @@ static int dwc3_drd_init(struct dwc3 *dwc) > int ret, id, vbus; > struct usb_otg_caps *otgcaps = &dwc->otg_config.otg_caps; > u32 reg; > + unsigned long flags; > > otgcaps->otg_rev = 0; > otgcaps->hnp_support = false; > @@ -993,6 +994,8 @@ try_otg_core: > goto error; > } > > + spin_lock_irqsave(&dwc->lock, flags); > + > /* we need to set OTG to get events from OTG core */ > dwc3_set_mode(dwc, DWC3_GCTL_PRTCAP_OTG); > /* GUSB2PHYCFG0.SusPHY=0 */ > @@ -1018,6 +1021,8 @@ try_otg_core: > /* OCTL.PeriMode = 1 */ > dwc3_writel(dwc->regs, DWC3_OCTL, DWC3_OCTL_PERIMODE); > > + spin_unlock_irqrestore(&dwc->lock, flags); > + > dwc3_otg_fsm_sync(dwc); > usb_otg_sync_inputs(dwc->fsm); > > -- > 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 8/9] usb: dwc3: core: Prevent otg events from disabling themselves Date: Wed, 2 Sep 2015 09:47:05 -0500 [thread overview] Message-ID: <20150902144705.GI8299@saruman.tx.rr.com> (raw) In-Reply-To: <1441203864-15786-9-git-send-email-rogerq@ti.com> [-- Attachment #1: Type: text/plain, Size: 1847 bytes --] On Wed, Sep 02, 2015 at 05:24:23PM +0300, Roger Quadros wrote: > There is a race happening during dwc3_drd_init() that causes > otg events to get disabled. This is what happens. > > dwc3_otg_irq() happens immediately when PRTCAP is set to OTG, > even though OEVTEN is 0. This is because BIT 31 IRQ of > OEVT can't be disabled by OEVTEN. > We configure OEVTEN in dwc3_otg_init() but dwc3_otg_irq() has > already saved OEVTEN as 0 into dwc->oevten. So finally when > dwc3_irq_thread_irq() is called we save 0 into OEVTEN > thus disabling OTG irqs forever. > > We fix this by disabling IRQs when configuring OEVTEN in > dwc3_otg_init(). > > Signed-off-by: Roger Quadros <rogerq@ti.com> can't you just merge this patch into the one which introduced the bug to start with ? > --- > drivers/usb/dwc3/core.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c > index 684010c..654aebf 100644 > --- a/drivers/usb/dwc3/core.c > +++ b/drivers/usb/dwc3/core.c > @@ -921,6 +921,7 @@ static int dwc3_drd_init(struct dwc3 *dwc) > int ret, id, vbus; > struct usb_otg_caps *otgcaps = &dwc->otg_config.otg_caps; > u32 reg; > + unsigned long flags; > > otgcaps->otg_rev = 0; > otgcaps->hnp_support = false; > @@ -993,6 +994,8 @@ try_otg_core: > goto error; > } > > + spin_lock_irqsave(&dwc->lock, flags); > + > /* we need to set OTG to get events from OTG core */ > dwc3_set_mode(dwc, DWC3_GCTL_PRTCAP_OTG); > /* GUSB2PHYCFG0.SusPHY=0 */ > @@ -1018,6 +1021,8 @@ try_otg_core: > /* OCTL.PeriMode = 1 */ > dwc3_writel(dwc->regs, DWC3_OCTL, DWC3_OCTL_PERIMODE); > > + spin_unlock_irqrestore(&dwc->lock, flags); > + > dwc3_otg_fsm_sync(dwc); > usb_otg_sync_inputs(dwc->fsm); > > -- > 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:47 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 [this message] 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 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=20150902144705.GI8299@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.