From patchwork Wed Sep 2 14:24:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Quadros X-Patchwork-Id: 7112191 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 648AEBEEC1 for ; Wed, 2 Sep 2015 14:26:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9326020680 for ; Wed, 2 Sep 2015 14:26:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8983020675 for ; Wed, 2 Sep 2015 14:26:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754891AbbIBOYw (ORCPT ); Wed, 2 Sep 2015 10:24:52 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:56923 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753929AbbIBOYv (ORCPT ); Wed, 2 Sep 2015 10:24:51 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id t82EOkrs014627; Wed, 2 Sep 2015 09:24:47 -0500 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id t82EOkXo005522; Wed, 2 Sep 2015 09:24:46 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.224.2; Wed, 2 Sep 2015 09:24:46 -0500 Received: from rockdesk.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id t82EOPFT024150; Wed, 2 Sep 2015 09:24:44 -0500 From: Roger Quadros To: CC: , , , , , , , , Roger Quadros Subject: [PATCH v4 6/9] usb: dwc3: save/restore OTG registers during suspend/resume Date: Wed, 2 Sep 2015 17:24:21 +0300 Message-ID: <1441203864-15786-7-git-send-email-rogerq@ti.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1441203864-15786-1-git-send-email-rogerq@ti.com> References: <1441203864-15786-1-git-send-email-rogerq@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Without this we loose OTG controller register context and malfunction after a system suspend-resume. Signed-off-by: Roger Quadros --- 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;