From patchwork Tue Oct 30 12:26:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artur Petrosyan X-Patchwork-Id: 10660849 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 949F714BD for ; Tue, 30 Oct 2018 12:26:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 76F9E2A295 for ; Tue, 30 Oct 2018 12:26:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6AB922A2BE; Tue, 30 Oct 2018 12:26: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 23D912A295 for ; Tue, 30 Oct 2018 12:26:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726731AbeJ3VUJ (ORCPT ); Tue, 30 Oct 2018 17:20:09 -0400 Received: from us01smtprelay-2.synopsys.com ([198.182.60.111]:39604 "EHLO smtprelay.synopsys.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726218AbeJ3VUJ (ORCPT ); Tue, 30 Oct 2018 17:20:09 -0400 Received: from mailhost.synopsys.com (mailhost1.synopsys.com [10.12.238.239]) by smtprelay.synopsys.com (Postfix) with ESMTP id 41C5F10C061C; Tue, 30 Oct 2018 05:26:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=synopsys.com; s=mail; t=1540902414; bh=2Om0lyrOAUOR+eaO8MS5L5HJkf2YH3YIUBAqHy7ViQU=; h=Date:In-Reply-To:References:From:Subject:To:CC:From; b=XS04bwJKALfO77frMTQ4bv0lapEDvHaEfV4/+oHa4i7hhgSEe70TSCijxNKP8IXYq zUKFZOuj2dDB6uhQgEIamqCVe8wG0Gf751oVfbvQPLoTsIDSk6VrTUjsqSqbcMJM5T fEtTwx9kqr7rr9NKYxf29YzDz/yuEyNeuwRP0RIQ1lgngElRRAm/IHknFdqk0WPSq0 m+z6Qod8yqvpdWdJQP7zPeXtnheoc/JzoCEKL4RsytnOCvnu3tLs64SAR5tb1LuQSr 0B6/9e+uPCHVHEHXDzx4BvkFIe9tzQUHyK/8ip3lFqOax7IfUXmG1uFNMQ5AYUXnIt y/LQYeKfI+JhA== Received: from us01wehtc1.internal.synopsys.com (us01wehtc1-vip.internal.synopsys.com [10.12.239.236]) by mailhost.synopsys.com (Postfix) with ESMTP id 303855433; Tue, 30 Oct 2018 05:26:54 -0700 (PDT) Received: from US01WEHTC2.internal.synopsys.com (10.12.239.238) by us01wehtc1.internal.synopsys.com (10.12.239.231) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 30 Oct 2018 05:26:54 -0700 Received: from arturp-ubuntu (10.13.184.20) by US01WEHTC2.internal.synopsys.com (10.12.239.238) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 30 Oct 2018 05:26:50 -0700 Received: by arturp-ubuntu (sSMTP sendmail emulation); Tue, 30 Oct 2018 08:26:45 -0400 Date: Tue, 30 Oct 2018 08:26:45 -0400 Message-ID: In-Reply-To: References: From: Artur Petrosyan Subject: [PATCH 1/2] usb: dwc2: gadget: Fix WkupAlert interrupt handler. 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 According to the databook DCTL_RMTWKUPSIG bit is defined in DCTL register not in DCFG. Updated setting DCTL_RMTWKUPSIG bit to DCTL register. 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 Tue Oct 30 12:26:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artur Petrosyan X-Patchwork-Id: 10660851 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 4943617DF for ; Tue, 30 Oct 2018 12:27:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2BC0228700 for ; Tue, 30 Oct 2018 12:27:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1F5842A2A3; Tue, 30 Oct 2018 12:27: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 C107228700 for ; Tue, 30 Oct 2018 12:27:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726903AbeJ3VUP (ORCPT ); Tue, 30 Oct 2018 17:20:15 -0400 Received: from smtprelay.synopsys.com ([198.182.60.111]:39612 "EHLO smtprelay.synopsys.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726761AbeJ3VUP (ORCPT ); Tue, 30 Oct 2018 17:20:15 -0400 Received: from mailhost.synopsys.com (mailhost1.synopsys.com [10.12.238.239]) by smtprelay.synopsys.com (Postfix) with ESMTP id 6C21A10C129F; Tue, 30 Oct 2018 05:27:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=synopsys.com; s=mail; t=1540902420; bh=Aw9zmEZYvf69Va0vIKeODOz1xjLkC/NCK81iIBWu83I=; h=Date:In-Reply-To:References:From:Subject:To:CC:From; b=QbVI0AqntJ42Ro9Id+teiLdQ1ruZjT4teHbC9KRkCfHIQOYEVrzJ6pu+FRggnQ7N8 k+xQAIaDiUWl7/arWhsCcJxli5Y/Qmuv6anYCZm2bvA2nnTqGDEezmhQmn84wqxQks USkLm0u1o1reK28J2oWlsv2RLl8qAxIFcONQD0DNRUMlx8MIgh9DTBFEYnJA94qRIl kHyiUsR3WbNNxi2hkW+CY2mfoLmgX6rEZhzNmCF2p+8EUeEGQjsmjh6neCOh61vS80 586+KcNK7uAYwYuXU+oG6AbwrI9SHpjcgBdDdIWQzHl8U45iNu8Qez3TGjIiRb39rL OuikgMTW0FWRQ== Received: from US01WXQAHTC1.internal.synopsys.com (us01wxqahtc1.internal.synopsys.com [10.12.238.230]) by mailhost.synopsys.com (Postfix) with ESMTP id 5C8175446; Tue, 30 Oct 2018 05:27:00 -0700 (PDT) Received: from US01WEHTC2.internal.synopsys.com (10.12.239.238) by US01WXQAHTC1.internal.synopsys.com (10.12.238.230) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 30 Oct 2018 05:27:00 -0700 Received: from arturp-ubuntu (10.13.184.20) by US01WEHTC2.internal.synopsys.com (10.12.239.238) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 30 Oct 2018 05:26:58 -0700 Received: by arturp-ubuntu (sSMTP sendmail emulation); Tue, 30 Oct 2018 08:26:54 -0400 Date: Tue, 30 Oct 2018 08:26:54 -0400 Message-ID: In-Reply-To: References: From: Artur Petrosyan Subject: [PATCH 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 To accept LPM token during ISOC transfers when TxFIFO is not empty. Signed-off-by: Artur Petrosyan Signed-off-by: Minas Harutyunyan --- drivers/usb/dwc2/gadget.c | 1 + drivers/usb/dwc2/hw.h | 3 +++ 2 files changed, 4 insertions(+) diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c index 6bd4054e894d..63d53619fd21 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_RETRY_CNT_1; 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..84d2b32f4831 100644 --- a/drivers/usb/dwc2/hw.h +++ b/drivers/usb/dwc2/hw.h @@ -333,6 +333,9 @@ #define GLPMCFG_SNDLPM BIT(24) #define GLPMCFG_RETRY_CNT_MASK (0x7 << 21) #define GLPMCFG_RETRY_CNT_SHIFT 21 +#define GLPMCFG_RETRY_CNT_0 21 +#define GLPMCFG_RETRY_CNT_1 22 +#define GLPMCFG_RETRY_CNT_2 23 #define GLPMCFG_LPM_CHNL_INDX_MASK (0xf << 17) #define GLPMCFG_LPM_CHNL_INDX_SHIFT 17 #define GLPMCFG_L1RESUMEOK BIT(16)