From patchwork Fri Nov 2 15:29:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artur Petrosyan X-Patchwork-Id: 10665691 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 30911109C for ; Fri, 2 Nov 2018 15:29:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1ECF12C16D for ; Fri, 2 Nov 2018 15:29:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 126722C1FC; Fri, 2 Nov 2018 15:29:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B0DB52C16D for ; Fri, 2 Nov 2018 15:29:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726265AbeKCAhV (ORCPT ); Fri, 2 Nov 2018 20:37:21 -0400 Received: from us01smtprelay-2.synopsys.com ([198.182.60.111]:34798 "EHLO smtprelay.synopsys.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726085AbeKCAhV (ORCPT ); Fri, 2 Nov 2018 20:37:21 -0400 Received: from mailhost.synopsys.com (mailhost2.synopsys.com [10.13.184.66]) by smtprelay.synopsys.com (Postfix) with ESMTP id C51AD10C0839; Fri, 2 Nov 2018 08:29:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=synopsys.com; s=mail; t=1541172594; bh=dy0YN7i+1aIjYG56/kxrTPhiu1w1l/pQmixa5BJQ9Bc=; h=Date:In-Reply-To:References:From:Subject:To:CC:From; b=E5XYd/rXd04t0POqH8b7gPa2kLqKIcTHAmKPTBAm2xrTRB0gXdGCf4JhiIjPFvQ51 p8bPj6lvyGojxqxPBqCN/dcDbTh+xK8FRdEzQ80HGc6kwG0RbBURGvPQDapRP9QTE7 Sh3SPAL4LXl8rlnlDhyoK6NPYQ/y9ty1xeUzB/NN5S8T9UJ5s/eEaAPHs+48r+r+WX yksHORzIEU2mVMJ3Psi71pY16MWcB7g4th2KgTtWyo/womd9IaomjFjtY9VeVyskLP FjFqoMCln+hDtW2GJI/ow2qIKNroHRf2pv7Sz1kWYVCGzPrHNk6iffvhC+HiC4g8Fj dyOxRu9SAkI/g== Received: from US01WEHTC2.internal.synopsys.com (us01wehtc2.internal.synopsys.com [10.12.239.237]) by mailhost.synopsys.com (Postfix) with ESMTP id B72B73AD7; Fri, 2 Nov 2018 08:29:54 -0700 (PDT) Received: from US01WEHTC1.internal.synopsys.com (10.12.239.236) by US01WEHTC2.internal.synopsys.com (10.12.239.237) with Microsoft SMTP Server (TLS) id 14.3.408.0; Fri, 2 Nov 2018 08:29:54 -0700 Received: from arturp-ubuntu (10.13.184.20) by us01wehtc1.internal.synopsys.com (10.12.239.236) with Microsoft SMTP Server (TLS) id 14.3.408.0; Fri, 2 Nov 2018 08:29:53 -0700 Received: by arturp-ubuntu (sSMTP sendmail emulation); Fri, 02 Nov 2018 11:29:48 -0400 Date: Fri, 2 Nov 2018 11:29:48 -0400 Message-ID: <00dcd1fe84dbb8fba6d1c82ead62e549e9549637.1541168990.git.arturp@synopsys.com> In-Reply-To: References: From: Artur Petrosyan Subject: [PATCH v1 1/2] usb: dwc2: gadget: Fix WkupAlert interrupt handler. To: Felipe Balbi , Greg Kroah-Hartman , Minas Harutyunyan , CC: John Youn , Artur Petrosyan , Grigor Tovmasyan MIME-Version: 1.0 X-Originating-IP: [10.13.184.20] Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP According to the databook DCTL_RMTWKUPSIG bit is defined in DCTL register not in DCFG. Updated setting DCTL_RMTWKUPSIG bit to DCTL register. Fixes: 187c5298a122 ("usb: dwc2: gadget: Add handler for WkupAlert interrupt") Signed-off-by: Artur Petrosyan Signed-off-by: Minas Harutyunyan --- drivers/usb/dwc2/gadget.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c index 2d6d2c8244de..6bd4054e894d 100644 --- a/drivers/usb/dwc2/gadget.c +++ b/drivers/usb/dwc2/gadget.c @@ -262,7 +262,7 @@ static void dwc2_gadget_wkup_alert_handler(struct dwc2_hsotg *hsotg) if (gintsts2 & GINTSTS2_WKUP_ALERT_INT) { dev_dbg(hsotg->dev, "%s: Wkup_Alert_Int\n", __func__); dwc2_clear_bit(hsotg, GINTSTS2, GINTSTS2_WKUP_ALERT_INT); - dwc2_set_bit(hsotg, DCFG, DCTL_RMTWKUPSIG); + dwc2_set_bit(hsotg, DCTL, DCTL_RMTWKUPSIG); } } From patchwork Fri Nov 2 15:29:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artur Petrosyan X-Patchwork-Id: 10665693 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A841B13BF for ; Fri, 2 Nov 2018 15:30:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9762E2C17D for ; Fri, 2 Nov 2018 15:30:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8A7882C18C; Fri, 2 Nov 2018 15:30:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2906D2C17D for ; Fri, 2 Nov 2018 15:30:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726700AbeKCAh2 (ORCPT ); Fri, 2 Nov 2018 20:37:28 -0400 Received: from smtprelay2.synopsys.com ([198.182.60.111]:34802 "EHLO smtprelay.synopsys.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726085AbeKCAh2 (ORCPT ); Fri, 2 Nov 2018 20:37:28 -0400 Received: from mailhost.synopsys.com (mailhost3.synopsys.com [10.12.238.238]) by smtprelay.synopsys.com (Postfix) with ESMTP id 5CF8410C057E; Fri, 2 Nov 2018 08:30:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=synopsys.com; s=mail; t=1541172601; bh=cblZ8ihnXsKigNC4cXQxVzAyDDFp/CpQLO9vxWaQ1Ys=; h=Date:In-Reply-To:References:From:Subject:To:CC:From; b=NfWsQbdwRSJahuvL7JpSO6qvZp73KTrN+1zSM8rrobeLhJzjL8M6WJxNoXuczIwp4 GbkAL5WQld8OBbZMtzcNnYOfAUOPDpXIYqjM606beKIsjT48rd7lL7XzeNbTjwXTFZ GN/g080Y9WeiyvP+rr7Edu/QqfuzluC//fEgJkyLDOd5/UmngowPy+2XryZY/Q7m1H FKHdbSO8qRjJrHmUX2nHHTfEv94S7z68SPb9ENXh+pceZ6SpLuPn/mdsNxNSw1f6vw kkksgN2OiCe2nUyttxbhv05HnXACIkz3oVdhRCEHcXStY4inw2Dmk+Z8F9RlnkRoPy BC9rcjsNBf7rQ== Received: from US01WEHTC3.internal.synopsys.com (us01wehtc3.internal.synopsys.com [10.15.84.232]) by mailhost.synopsys.com (Postfix) with ESMTP id 4C8073106; Fri, 2 Nov 2018 08:30:01 -0700 (PDT) Received: from US01WEHTC1.internal.synopsys.com (10.12.239.236) by US01WEHTC3.internal.synopsys.com (10.15.84.232) with Microsoft SMTP Server (TLS) id 14.3.408.0; Fri, 2 Nov 2018 08:30:01 -0700 Received: from arturp-ubuntu (10.13.184.20) by us01wehtc1.internal.synopsys.com (10.12.239.236) with Microsoft SMTP Server (TLS) id 14.3.408.0; Fri, 2 Nov 2018 08:29:59 -0700 Received: by arturp-ubuntu (sSMTP sendmail emulation); Fri, 02 Nov 2018 11:29:55 -0400 Date: Fri, 2 Nov 2018 11:29:55 -0400 Message-ID: In-Reply-To: References: From: Artur Petrosyan Subject: [PATCH v1 2/2] usb: dwc2: gadget: Accept LPM token when TxFIFO is not empty To: Felipe Balbi , Greg Kroah-Hartman , Minas Harutyunyan , CC: John Youn , Artur Petrosyan MIME-Version: 1.0 X-Originating-IP: [10.13.184.20] Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Set GLPMCFG_LPM_ACCEPT_CTRL_ISOC bit in GLPMCFG register to accept LPM token during ISOC transfers when TxFIFO is not empty. - Added two definitions. #define GLPMCFG_LPM_ACCEPT_CTRL_CONTROL BIT(21) #define GLPMCFG_LPM_ACCEPT_CTRL_ISOC BIT(22) This patch uses GLPMCFG_LPM_ACCEPT_CTRL_ISOC. GLPMCFG_LPM_ACCEPT_CTRL_CONTROL is defined for further use. - Added setting GLPMCFG_LPM_ACCEPT_CTRL_ISOC bit in GLPMCFG register in dwc2_gadget_init_lpm function. Signed-off-by: Artur Petrosyan Signed-off-by: Minas Harutyunyan --- drivers/usb/dwc2/gadget.c | 1 + drivers/usb/dwc2/hw.h | 2 ++ 2 files changed, 3 insertions(+) diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c index 6bd4054e894d..94f3ba995580 100644 --- a/drivers/usb/dwc2/gadget.c +++ b/drivers/usb/dwc2/gadget.c @@ -5026,6 +5026,7 @@ void dwc2_gadget_init_lpm(struct dwc2_hsotg *hsotg) val |= hsotg->params.lpm_clock_gating ? GLPMCFG_ENBLSLPM : 0; val |= hsotg->params.hird_threshold << GLPMCFG_HIRD_THRES_SHIFT; val |= hsotg->params.besl ? GLPMCFG_ENBESL : 0; + val |= GLPMCFG_LPM_ACCEPT_CTRL_ISOC; dwc2_writel(hsotg, val, GLPMCFG); dev_dbg(hsotg->dev, "GLPMCFG=0x%08x\n", dwc2_readl(hsotg, GLPMCFG)); diff --git a/drivers/usb/dwc2/hw.h b/drivers/usb/dwc2/hw.h index 2b1ea441b7d4..98af924a9a5c 100644 --- a/drivers/usb/dwc2/hw.h +++ b/drivers/usb/dwc2/hw.h @@ -333,6 +333,8 @@ #define GLPMCFG_SNDLPM BIT(24) #define GLPMCFG_RETRY_CNT_MASK (0x7 << 21) #define GLPMCFG_RETRY_CNT_SHIFT 21 +#define GLPMCFG_LPM_ACCEPT_CTRL_CONTROL BIT(21) +#define GLPMCFG_LPM_ACCEPT_CTRL_ISOC BIT(22) #define GLPMCFG_LPM_CHNL_INDX_MASK (0xf << 17) #define GLPMCFG_LPM_CHNL_INDX_SHIFT 17 #define GLPMCFG_L1RESUMEOK BIT(16)