From patchwork Fri Apr 19 11:24:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artur Petrosyan X-Patchwork-Id: 10909533 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 1918F1850 for ; Fri, 19 Apr 2019 18:53:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0CF0028DF2 for ; Fri, 19 Apr 2019 18:53:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0126028DF8; Fri, 19 Apr 2019 18:53:16 +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 A025828DF6 for ; Fri, 19 Apr 2019 18:53:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727306AbfDSSxP (ORCPT ); Fri, 19 Apr 2019 14:53:15 -0400 Received: from dc2-smtprelay2.synopsys.com ([198.182.61.142]:37882 "EHLO smtprelay-out1.synopsys.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728517AbfDSSxN (ORCPT ); Fri, 19 Apr 2019 14:53:13 -0400 Received: from mailhost.synopsys.com (badc-mailhost2.synopsys.com [10.192.0.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by smtprelay-out1.synopsys.com (Postfix) with ESMTPS id D41B4C0AE2; Fri, 19 Apr 2019 11:24:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=synopsys.com; s=mail; t=1555673060; bh=2lhgBLvaIPkRZOt9UI2QbxNBZj29AWGnNMoRlexj8dQ=; h=From:To:CC:Subject:Date:References:In-Reply-To:From; b=FQEEbvyXcT0EqfZj7qiffvmuYzlKpU+j2Jpf4ERZ/VG5lBZa/OIbusH8L3KA6/mYl QTvKdmB4qfevGyxl5nZ8ZmSppoy6I3WElA15/FTzWG00PzGgYKxXKgPxGqymocdNyT MWPpI0Ux/5mzhwMmlYYvrmpyI7kClQqhnGs4NPcEcvJjpuzdolVV+K4rijg5Bs7HPQ XZxmDybj/tgIJ9fIKLu7w54os8cAzov5dBgnz1rqoBkwIZ3hRUP5zTjrLXMnnvvMFy 6rjIgU/WmB/UtOYNLTj8UwO6Ak3gMl/85nKtvB/xtKxRG74Uq2eqwS6YAJFs8t5jtc uroqN+kTfoFkw== Received: from US01WEHTC3.internal.synopsys.com (us01wehtc3.internal.synopsys.com [10.15.84.232]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mailhost.synopsys.com (Postfix) with ESMTPS id DED75A0067; Fri, 19 Apr 2019 11:24:20 +0000 (UTC) Received: from US01HYBRID2.internal.synopsys.com (10.15.246.24) by US01WEHTC3.internal.synopsys.com (10.15.84.232) with Microsoft SMTP Server (TLS) id 14.3.408.0; Fri, 19 Apr 2019 04:24:20 -0700 Received: from NAM03-CO1-obe.outbound.protection.outlook.com (10.13.134.195) by mrs.synopsys.com (10.15.246.24) with Microsoft SMTP Server (TLS) id 14.3.408.0; Fri, 19 Apr 2019 04:24:20 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=synopsys.onmicrosoft.com; s=selector1-synopsys-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2lhgBLvaIPkRZOt9UI2QbxNBZj29AWGnNMoRlexj8dQ=; b=QQavyk0YPWF/hh1kSaVoGha1jEn9c9Mchijl59UYeARnbRKZpf88emQM86eaJoehhF/mC+iKQ/llxEUIEqzsBJfapjZd4aA9qkLN1Nv+pXnEi7FFBwOIz654Eh4DEzG2QgRvZPPcoEPv3KgWjisxSAFaYoDdG85/C9Fzh8qcqu4= Received: from SN1PR12MB2431.namprd12.prod.outlook.com (52.132.195.146) by SN1PR12MB2383.namprd12.prod.outlook.com (52.132.194.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1813.14; Fri, 19 Apr 2019 11:24:19 +0000 Received: from SN1PR12MB2431.namprd12.prod.outlook.com ([fe80::5ca6:ee5f:1147:df5a]) by SN1PR12MB2431.namprd12.prod.outlook.com ([fe80::5ca6:ee5f:1147:df5a%4]) with mapi id 15.20.1813.013; Fri, 19 Apr 2019 11:24:19 +0000 From: Artur Petrosyan To: Felipe Balbi , Greg Kroah-Hartman , Minas Harutyunyan , "linux-usb@vger.kernel.org" CC: John Youn , Artur Petrosyan Subject: [PATCH v1 05/14] usb: dwc2: Add port conn. sts. checking in _dwc2_hcd_resume() function. Thread-Topic: [PATCH v1 05/14] usb: dwc2: Add port conn. sts. checking in _dwc2_hcd_resume() function. Thread-Index: AQHU9qJtnV9CkqFmy0auvIy58fBMvw== Date: Fri, 19 Apr 2019 11:24:18 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: VI1PR04CA0077.eurprd04.prod.outlook.com (2603:10a6:802:2::48) To SN1PR12MB2431.namprd12.prod.outlook.com (2603:10b6:802:27::18) authentication-results: spf=none (sender IP is ) smtp.mailfrom=arturp@synopsys.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [84.53.141.191] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 7351ef1c-f3b3-4ec5-0612-08d6c4b98f84 x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(5600141)(711020)(4605104)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7193020);SRVR:SN1PR12MB2383; x-ms-traffictypediagnostic: SN1PR12MB2383: x-microsoft-antispam-prvs: x-forefront-prvs: 0012E6D357 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(376002)(396003)(39850400004)(346002)(136003)(366004)(199004)(189003)(110136005)(316002)(2616005)(54906003)(68736007)(99286004)(478600001)(8936002)(2501003)(64756008)(52116002)(73956011)(66946007)(118296001)(66446008)(3846002)(6116002)(66066001)(8676002)(36756003)(14454004)(386003)(186003)(305945005)(2906002)(4326008)(102836004)(6436002)(26005)(486006)(256004)(25786009)(53936002)(14444005)(476003)(71200400001)(71190400001)(6512007)(86362001)(107886003)(5660300002)(97736004)(81156014)(446003)(76176011)(6506007)(7736002)(6486002)(11346002)(66476007)(66556008)(81166006);DIR:OUT;SFP:1102;SCL:1;SRVR:SN1PR12MB2383;H:SN1PR12MB2431.namprd12.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: synopsys.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: krFTt6pk+agd0vZnigVnyV/jE3feW3qbOywCMmVBz1OjU9Zq1hDPxEZMb0N+lrbxxpYCGX1Qs2YSfcr0IV4RFRgFhzUbCaF6SjtGr746+4PbJ4SJhe+9VmdfK/8lZuoN6GEwrp6vUhkKfLfIc+63MRAskUJIYi62WyR4YHGzMjDoUkoHnEGuXcr5YevoDf9JIjWKEuJHL5Imgoq4zDkCfQhZeagoxve+JUQ1UVgFAZ2PSrpZLgs+9QAwiq2OISRQBz5qEiNqmn9dnJ9LLcC7sK3AieU4cMwcldMofqpwnZqsrqdkW43n4n8bXs0UgqnFetJr0PCXVHBM50d4goNyvUj5rrnAx2anZDszZH1fXdZ29EPK/6cuvVcjozYIJyJMEwmYqIgry+pGkY9/thxJIf7RDEoEiHCh8KhnHiVIW04= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 7351ef1c-f3b3-4ec5-0612-08d6c4b98f84 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Apr 2019 11:24:18.8371 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: c33c9f88-1eb7-4099-9700-16013fd9e8aa X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB2383 X-OriginatorOrg: synopsys.com 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 Added port connection status checking which prevents exiting from Partial Power Down mode from _dwc2_hcd_resume() when no entering to Partial Power Down mode happened. Signed-off-by: Artur Petrosyan --- drivers/usb/dwc2/hcd.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c index 1d18258b5ff8..8367902a47eb 100644 --- a/drivers/usb/dwc2/hcd.c +++ b/drivers/usb/dwc2/hcd.c @@ -4544,6 +4544,9 @@ static int _dwc2_hcd_resume(struct usb_hcd *hcd) struct dwc2_hsotg *hsotg = dwc2_hcd_to_hsotg(hcd); unsigned long flags; int ret = 0; + u32 hprt0; + + hprt0 = dwc2_read_hprt0(hsotg); spin_lock_irqsave(&hsotg->lock, flags); @@ -4553,7 +4556,8 @@ static int _dwc2_hcd_resume(struct usb_hcd *hcd) if (hsotg->lx_state != DWC2_L2) goto unlock; - if (hsotg->params.power_down != DWC2_POWER_DOWN_PARAM_PARTIAL) { + if (hsotg->params.power_down != DWC2_POWER_DOWN_PARAM_PARTIAL || + hprt0 & HPRT0_CONNSTS) { hsotg->lx_state = DWC2_L0; goto unlock; }