From mboxrd@z Thu Jan 1 00:00:00 1970 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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,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 55FA8CA9ED3 for ; Mon, 4 Nov 2019 21:48:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2A84F21D71 for ; Mon, 4 Nov 2019 21:48:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572904136; bh=gm02P0hdLtAPE3ZcCkhPqB2TsKDDYjKvo/7pGrzTdRs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Ev0q/3rDyb4yKoABF+X9LTusoK1Sk30bIwFgX2H3fAiA+eMYxcwG9kDSTsdJrkbvB e/WfaE1Xl4XWGnvbvjDKQ8eZSyks5DN2H6bmXvk3D41bwvbmwsJZwe2LhuiRRJ3DHd 3yCdl1OEtOlbl6WdHr8Hm/W0xlMp2eiDXmM0EjBM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730175AbfKDVsy (ORCPT ); Mon, 4 Nov 2019 16:48:54 -0500 Received: from mail.kernel.org ([198.145.29.99]:39740 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730158AbfKDVsx (ORCPT ); Mon, 4 Nov 2019 16:48:53 -0500 Received: from localhost (6.204-14-84.ripe.coltfrance.com [84.14.204.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 195AF2184C; Mon, 4 Nov 2019 21:48:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572904132; bh=gm02P0hdLtAPE3ZcCkhPqB2TsKDDYjKvo/7pGrzTdRs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Dxo3UScfMIlABBNaR6Cl13KeacVcU1DJcIWtNQIl/1ygwp3tx3gJ+Mm3qCKXerYkj aYDImtbVbMDn0qxfxdfEHURFstvuiXW8J6gSDQD6cSz0jrqeFy4JAD3xlsML6wT9IA 7/gV7JnEucL4omzVm5sg4Wci4ZlDcpjyzw8+Nzho= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jan-Marek Glogowski , Alan Stern , Sasha Levin Subject: [PATCH 4.4 08/46] usb: handle warm-reset port requests on hub resume Date: Mon, 4 Nov 2019 22:44:39 +0100 Message-Id: <20191104211839.545438587@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191104211830.912265604@linuxfoundation.org> References: <20191104211830.912265604@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jan-Marek Glogowski [ Upstream commit 4fdc1790e6a9ef22399c6bc6e63b80f4609f3b7e ] On plug-in of my USB-C device, its USB_SS_PORT_LS_SS_INACTIVE link state bit is set. Greping all the kernel for this bit shows that the port status requests a warm-reset this way. This just happens, if its the only device on the root hub, the hub therefore resumes and the HCDs status_urb isn't yet available. If a warm-reset request is detected, this sets the hubs event_bits, which will prevent any auto-suspend and allows the hubs workqueue to warm-reset the port later in port_event. Signed-off-by: Jan-Marek Glogowski Acked-by: Alan Stern Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/usb/core/hub.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 5c274c5440da4..11881c5a1fb0c 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -102,6 +102,8 @@ EXPORT_SYMBOL_GPL(ehci_cf_port_reset_rwsem); static void hub_release(struct kref *kref); static int usb_reset_and_verify_device(struct usb_device *udev); static int hub_port_disable(struct usb_hub *hub, int port1, int set_state); +static bool hub_port_warm_reset_required(struct usb_hub *hub, int port1, + u16 portstatus); static inline char *portspeed(struct usb_hub *hub, int portstatus) { @@ -1092,6 +1094,11 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type) USB_PORT_FEAT_ENABLE); } + /* Make sure a warm-reset request is handled by port_event */ + if (type == HUB_RESUME && + hub_port_warm_reset_required(hub, port1, portstatus)) + set_bit(port1, hub->event_bits); + /* * Add debounce if USB3 link is in polling/link training state. * Link will automatically transition to Enabled state after -- 2.20.1