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: 52974 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by patches.linaro.org (Postfix) with ESMTPS id 6684B2300B for ; Wed, 2 Sep 2015 14:25:08 +0000 (UTC) Received: by laeb10 with SMTP id b10sf5062908lae.1 for ; Wed, 02 Sep 2015 07:25:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender:precedence :list-id:x-original-sender:x-original-authentication-results :mailing-list:list-post:list-help:list-archive:list-unsubscribe; bh=iSgd2gcjeNGMwJxKOZkHlAvLLTNaJMxt6tMRgzuxYEY=; b=LB5hs62Z6fRC5aDbtWd+4WKBYdNSguStldqKhzX5I4tFTrmismRbknIQ0Ko2sevC2J t8tsXDKboX64unSUCLJIt6WWl0xOQsXUP9eK/Wy8P1cfdukcMXQ+5OvLBHNH3Q+tzQpJ XV9RYlngkAVQYL+T9KcgI+s3FjYeSSB9DMNCuYnCRht5Gqs67ZD4RHz2bAzUKKigFdkS jqWoWZUCgIcjwWK7D1iYN8QnErkon7X+zILkh9ET9dtMIGM/68e8YqpEIX8p6f59rVMK v1xCx05GFwIsSbms37XM46Yfg3wLvLOk7WDNJXWEFmasKQlq95WfRIb6c4Sku4GlSif6 KKKQ== X-Gm-Message-State: ALoCoQmjuPKy2gHVMShyHcxMef84Hzn1yJy7QFXk0fxbJuG1sYnF0PK7Ue4hWQ4Xpirj8qTr3mZJ X-Received: by 10.112.139.65 with SMTP id qw1mr9114025lbb.24.1441203907442; Wed, 02 Sep 2015 07:25:07 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.170.232 with SMTP id ap8ls73862lac.18.gmail; Wed, 02 Sep 2015 07:25:07 -0700 (PDT) X-Received: by 10.112.218.5 with SMTP id pc5mr15683431lbc.97.1441203907262; Wed, 02 Sep 2015 07:25:07 -0700 (PDT) Received: from mail-la0-f43.google.com (mail-la0-f43.google.com. [209.85.215.43]) by mx.google.com with ESMTPS id zs5si19795681lbb.37.2015.09.02.07.25.07 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Sep 2015 07:25:07 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) client-ip=209.85.215.43; Received: by lanb10 with SMTP id b10so8213687lan.3 for ; Wed, 02 Sep 2015 07:25:07 -0700 (PDT) X-Received: by 10.152.43.198 with SMTP id y6mr7821456lal.41.1441203907135; Wed, 02 Sep 2015 07:25:07 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.164.42 with SMTP id yn10csp614781lbb; Wed, 2 Sep 2015 07:25:06 -0700 (PDT) X-Received: by 10.68.235.99 with SMTP id ul3mr41363405pbc.138.1441203903901; Wed, 02 Sep 2015 07:25:03 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id vr1si32358668pab.21.2015.09.02.07.25.02; Wed, 02 Sep 2015 07:25:03 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754906AbbIBOYx (ORCPT + 28 others); Wed, 2 Sep 2015 10:24:53 -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-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: rogerq@ti.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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;