Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E927AC282C8 for ; Mon, 28 Jan 2019 17:01:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AEE2C21741 for ; Mon, 28 Jan 2019 17:01:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548694905; bh=EIupvfExS/UwKCCe747/G3Uc+3mQJ30AnPAskqAnOd0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Drw6XmGeyF4cxSdK3PQtnL1HT94xUfaBGfllE1XpJATHmHmFYUpk1dQNunajdvPzM yPO/5fkEqe8ou/ZQ9ss+l6ICYnupSKAWVtFZQKx31MnfVvIG8pryv405C+EAoWRHmj MAuigKqb/JlqF2W54DFIFp6Vpzu2RjqtUehFD2Kw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732970AbfA1RBo (ORCPT ); Mon, 28 Jan 2019 12:01:44 -0500 Received: from mail.kernel.org ([198.145.29.99]:44530 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733110AbfA1QO7 (ORCPT ); Mon, 28 Jan 2019 11:14:59 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2AEA52086C; Mon, 28 Jan 2019 16:14:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548692098; bh=EIupvfExS/UwKCCe747/G3Uc+3mQJ30AnPAskqAnOd0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vwsb5bjCasbcwb2PYRgnzZJuoaORgg5ts1+iNOs8EIOTG8/0zz4mFOrjvmthwC+gi XmgYoMavAi6U2tk3ILEVcsZpIFQMT61gCJiaZIuZhasVihvONcr8wn7aDS93YwDveP IfJny+GISP1fMfdxB4UemVHmWlc3W4FcPzhC+BEo= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mathias Nyman , Greg Kroah-Hartman , Sasha Levin , linux-usb@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 066/170] usb: hub: delay hub autosuspend if USB3 port is still link training Date: Mon, 28 Jan 2019 11:10:16 -0500 Message-Id: <20190128161200.55107-66-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190128161200.55107-1-sashal@kernel.org> References: <20190128161200.55107-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Mathias Nyman [ Upstream commit e86108940e541febf35813402ff29fa6f4a9ac0b ] When initializing a hub we want to give a USB3 port in link training the same debounce delay time before autosuspening the hub as already trained, connected enabled ports. USB3 ports won't reach the enabled state with "current connect status" and "connect status change" bits set until the USB3 link training finishes. Catching the port in link training (polling) and adding the debounce delay prevents unnecessary failed attempts to autosuspend the hub. Signed-off-by: Mathias Nyman Acked-by: Alan Stern Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/usb/core/hub.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index a073cb5be013..4a4e666a8e09 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -1110,6 +1110,16 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type) USB_PORT_FEAT_ENABLE); } + /* + * Add debounce if USB3 link is in polling/link training state. + * Link will automatically transition to Enabled state after + * link training completes. + */ + if (hub_is_superspeed(hdev) && + ((portstatus & USB_PORT_STAT_LINK_STATE) == + USB_SS_PORT_LS_POLLING)) + need_debounce_delay = true; + /* Clear status-change flags; we'll debounce later */ if (portchange & USB_PORT_STAT_C_CONNECTION) { need_debounce_delay = true; -- 2.19.1