From: Roger Quadros <rogerq@ti.com> To: <balbi@ti.com> Cc: <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>, Roger Quadros <rogerq@ti.com> Subject: [PATCH v4 6/9] usb: dwc3: save/restore OTG registers during suspend/resume Date: Wed, 2 Sep 2015 17:24:21 +0300 [thread overview] Message-ID: <1441203864-15786-7-git-send-email-rogerq@ti.com> (raw) In-Reply-To: <1441203864-15786-1-git-send-email-rogerq@ti.com> Without this we loose OTG controller register context and malfunction after a system suspend-resume. Signed-off-by: Roger Quadros <rogerq@ti.com> --- drivers/usb/dwc3/core.c | 17 +++++++++++++++++ drivers/usb/dwc3/core.h | 6 +++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 632ee53..684010c 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -56,6 +56,7 @@ void dwc3_set_mode(struct dwc3 *dwc, u32 mode) reg = dwc3_readl(dwc->regs, DWC3_GCTL); reg &= ~(DWC3_GCTL_PRTCAPDIR(DWC3_GCTL_PRTCAP_OTG)); reg |= DWC3_GCTL_PRTCAPDIR(mode); + dwc->current_mode = mode; dwc3_writel(dwc->regs, DWC3_GCTL, reg); } @@ -1443,6 +1444,14 @@ static int dwc3_suspend(struct device *dev) spin_lock_irqsave(&dwc->lock, flags); + /* Save OTG state only if we're really using it */ + if (dwc->current_mode == DWC3_GCTL_PRTCAP_OTG) { + dwc->ocfg = dwc3_readl(dwc->regs, DWC3_OCFG); + dwc->octl = dwc3_readl(dwc->regs, DWC3_OCTL); + dwc->oevt = dwc3_readl(dwc->regs, DWC3_OEVT); + dwc->oevten = dwc3_readl(dwc->regs, DWC3_OEVTEN); + } + switch (dwc->dr_mode) { case USB_DR_MODE_PERIPHERAL: case USB_DR_MODE_OTG: @@ -1486,6 +1495,14 @@ static int dwc3_resume(struct device *dev) dwc3_event_buffers_setup(dwc); dwc3_writel(dwc->regs, DWC3_GCTL, dwc->gctl); + /* Restore OTG state only if we're really using it */ + if (dwc->current_mode == DWC3_GCTL_PRTCAP_OTG) { + dwc3_writel(dwc->regs, DWC3_OCFG, dwc->ocfg); + dwc3_writel(dwc->regs, DWC3_OCTL, dwc->octl); + dwc3_writel(dwc->regs, DWC3_OEVT, dwc->oevt); + dwc3_writel(dwc->regs, DWC3_OEVTEN, dwc->oevten); + } + switch (dwc->dr_mode) { case USB_DR_MODE_PERIPHERAL: case USB_DR_MODE_OTG: diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index 129ef37..1115ce0 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -737,6 +737,7 @@ struct dwc3_scratchpad_array { * @regs: base address for our registers * @regs_size: address space size * @oevten: otg interrupt enable mask copy + * @current_mode: current mode of operation written to PRTCAPDIR * @nr_scratch: number of scratch buffers * @num_event_buffers: calculated number of event buffers * @u1u2: only used on revisions <1.83a for workaround @@ -858,9 +859,12 @@ struct dwc3 { /* used for suspend/resume */ u32 dcfg; u32 gctl; - + u32 ocfg; + u32 octl; + u32 oevt; u32 oevten; + u32 current_mode; u32 nr_scratch; u32 num_event_buffers; u32 u1u2; -- 2.1.4
WARNING: multiple messages have this Message-ID (diff)
From: Roger Quadros <rogerq@ti.com> To: balbi@ti.com Cc: 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, Roger Quadros <rogerq@ti.com> Subject: [PATCH v4 6/9] usb: dwc3: save/restore OTG registers during suspend/resume Date: Wed, 2 Sep 2015 17:24:21 +0300 [thread overview] Message-ID: <1441203864-15786-7-git-send-email-rogerq@ti.com> (raw) In-Reply-To: <1441203864-15786-1-git-send-email-rogerq@ti.com> Without this we loose OTG controller register context and malfunction after a system suspend-resume. Signed-off-by: Roger Quadros <rogerq@ti.com> --- drivers/usb/dwc3/core.c | 17 +++++++++++++++++ drivers/usb/dwc3/core.h | 6 +++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 632ee53..684010c 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -56,6 +56,7 @@ void dwc3_set_mode(struct dwc3 *dwc, u32 mode) reg = dwc3_readl(dwc->regs, DWC3_GCTL); reg &= ~(DWC3_GCTL_PRTCAPDIR(DWC3_GCTL_PRTCAP_OTG)); reg |= DWC3_GCTL_PRTCAPDIR(mode); + dwc->current_mode = mode; dwc3_writel(dwc->regs, DWC3_GCTL, reg); } @@ -1443,6 +1444,14 @@ static int dwc3_suspend(struct device *dev) spin_lock_irqsave(&dwc->lock, flags); + /* Save OTG state only if we're really using it */ + if (dwc->current_mode == DWC3_GCTL_PRTCAP_OTG) { + dwc->ocfg = dwc3_readl(dwc->regs, DWC3_OCFG); + dwc->octl = dwc3_readl(dwc->regs, DWC3_OCTL); + dwc->oevt = dwc3_readl(dwc->regs, DWC3_OEVT); + dwc->oevten = dwc3_readl(dwc->regs, DWC3_OEVTEN); + } + switch (dwc->dr_mode) { case USB_DR_MODE_PERIPHERAL: case USB_DR_MODE_OTG: @@ -1486,6 +1495,14 @@ static int dwc3_resume(struct device *dev) dwc3_event_buffers_setup(dwc); dwc3_writel(dwc->regs, DWC3_GCTL, dwc->gctl); + /* Restore OTG state only if we're really using it */ + if (dwc->current_mode == DWC3_GCTL_PRTCAP_OTG) { + dwc3_writel(dwc->regs, DWC3_OCFG, dwc->ocfg); + dwc3_writel(dwc->regs, DWC3_OCTL, dwc->octl); + dwc3_writel(dwc->regs, DWC3_OEVT, dwc->oevt); + dwc3_writel(dwc->regs, DWC3_OEVTEN, dwc->oevten); + } + switch (dwc->dr_mode) { case USB_DR_MODE_PERIPHERAL: case USB_DR_MODE_OTG: diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index 129ef37..1115ce0 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -737,6 +737,7 @@ struct dwc3_scratchpad_array { * @regs: base address for our registers * @regs_size: address space size * @oevten: otg interrupt enable mask copy + * @current_mode: current mode of operation written to PRTCAPDIR * @nr_scratch: number of scratch buffers * @num_event_buffers: calculated number of event buffers * @u1u2: only used on revisions <1.83a for workaround @@ -858,9 +859,12 @@ struct dwc3 { /* used for suspend/resume */ u32 dcfg; u32 gctl; - + u32 ocfg; + u32 octl; + u32 oevt; u32 oevten; + u32 current_mode; u32 nr_scratch; u32 num_event_buffers; u32 u1u2; -- 2.1.4
next prev parent reply other threads:[~2015-09-02 14:24 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 ` Roger Quadros [this message] 2015-09-02 14:24 ` [PATCH v4 6/9] usb: dwc3: save/restore OTG registers during suspend/resume 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 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=1441203864-15786-7-git-send-email-rogerq@ti.com \ --to=rogerq@ti.com \ --cc=Joao.Pinto@synopsys.com \ --cc=balbi@ti.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=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.