From patchwork Wed Oct 3 05:18:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kai-Heng Feng X-Patchwork-Id: 10624303 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 D5F45174A for ; Wed, 3 Oct 2018 05:18:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C78F227F60 for ; Wed, 3 Oct 2018 05:18:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BB7CB283E8; Wed, 3 Oct 2018 05:18:31 +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=-7.9 required=2.0 tests=BAYES_00,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 44F0227F60 for ; Wed, 3 Oct 2018 05:18:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726630AbeJCMFQ (ORCPT ); Wed, 3 Oct 2018 08:05:16 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:54540 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726394AbeJCMFQ (ORCPT ); Wed, 3 Oct 2018 08:05:16 -0400 Received: from 61-220-137-37.hinet-ip.hinet.net ([61.220.137.37] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1g7ZYJ-00027N-A9; Wed, 03 Oct 2018 05:18:27 +0000 From: Kai-Heng Feng To: gregkh@linuxfoundation.org Cc: stern@rowland.harvard.edu, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Kai-Heng Feng Subject: [PATCH] usb: core: Check portchange C_PORT_RESET after resetting Date: Wed, 3 Oct 2018 13:18:22 +0800 Message-Id: <20181003051822.4011-1-kai.heng.feng@canonical.com> X-Mailer: git-send-email 2.17.1 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 Based on USB2.0 Spec Section 11.24.2.7.2.5: "This bit is set when the port transitions from the Resetting state (or, if present, the Speed_eval state) to the Enabled state." Also Section 11.24.2.13: "Setting the reset feature PORT_RESET causes the hub to signal reset on that port. When the reset signaling is complete, the hub sets the C_PORT_RESET status change and immediately enables the port." So let's also check C_PORT_RESET for reset completion. Signed-off-by: Kai-Heng Feng --- drivers/usb/core/hub.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 7801bb30bdba..d96058372280 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -2721,7 +2721,8 @@ static int hub_port_wait_reset(struct usb_hub *hub, int port1, * so also wait for the connection to be re-established. */ if (!(portstatus & USB_PORT_STAT_RESET) && - (portstatus & USB_PORT_STAT_CONNECTION)) + (portstatus & USB_PORT_STAT_CONNECTION) && + (portchange & USB_PORT_STAT_C_RESET)) break; /* switch to the long delay after two short delay failures */