From patchwork Tue Jan 7 22:11:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dann frazier X-Patchwork-Id: 1219095 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47smn84sk2z9sR1; Wed, 8 Jan 2020 09:11:40 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1iox4Z-0001N3-4a; Tue, 07 Jan 2020 22:11:35 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iox4Y-0001Mx-2d for kernel-team@lists.ubuntu.com; Tue, 07 Jan 2020 22:11:34 +0000 Received: from mail-io1-f70.google.com ([209.85.166.70]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iox4X-0004FU-Nx for kernel-team@lists.ubuntu.com; Tue, 07 Jan 2020 22:11:33 +0000 Received: by mail-io1-f70.google.com with SMTP id d10so769680iod.19 for ; Tue, 07 Jan 2020 14:11:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=XX8+UgC8L8vAcYDsCeqxnDb7HDJVFW4XOA8/LzFT28s=; b=VySlKaslRuUTdtCa1OEHMep/BXkmZtwdp/HG7ILeM6JyeYbCChcn5IRdB3oAxoHj4t YAfogUJm+CUzSGDpha+sZXOEm7/0nkWn18ZS0c3ajyGOi2PTYrEpOEnoFxzbmFKBU21G ezrxLWeW4lM0dMbaedRcfk2Wbu6abn07V9NY76yKkyiLPdtHm2c2sjsm9PjjLU8vlmM9 RaKERrsNrtaizSwGTUV3iWfexP18NgcbvvYWISyY35np3/n4S8AcbnlgA+3KC0eAIRno 22te1KNIJk1OtysDW/uBaSIAumKdA03xi8oQ4pIyxab2KPN2a5Rhr7nt3Rpl4VWb+cjE q0hQ== X-Gm-Message-State: APjAAAWb/IJTNDx5MFSRdgxeCGNCGtI6UK+IcC99PJtyJ1AVS+2Ok/2T U9rrMOhv8Ja09pnF+vUBUsPCzWp+9n1tK7mPWE2jR/2pDT4FvSfeiUwdPZV9U7ACUaJ8M+RNzFT lM10cAV0JRwhMlGWF8AwKfnpo91Vihk7dPIf/e99/kg== X-Received: by 2002:a5d:840a:: with SMTP id i10mr961544ion.225.1578435092596; Tue, 07 Jan 2020 14:11:32 -0800 (PST) X-Google-Smtp-Source: APXvYqzWkkkbgYWDtQaKAs/ETgnKOXX2WhAANWsZ6fg0HYh57gHVDSVrEMfDF4ldOEFBqlOGmD6E9Q== X-Received: by 2002:a5d:840a:: with SMTP id i10mr961526ion.225.1578435092246; Tue, 07 Jan 2020 14:11:32 -0800 (PST) Received: from xps13.canonical.com (c-71-56-235-36.hsd1.co.comcast.net. [71.56.235.36]) by smtp.gmail.com with ESMTPSA id j79sm280820ila.52.2020.01.07.14.11.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 14:11:31 -0800 (PST) From: dann frazier To: kernel-team@lists.ubuntu.com Subject: [PATCH][F][SRU B/D/E] UBUNTU: SAUCE: Revert "usb: handle warm-reset port requests on hub resume" Date: Tue, 7 Jan 2020 15:11:29 -0700 Message-Id: <20200107221129.34729-1-dann.frazier@canonical.com> X-Mailer: git-send-email 2.25.0.rc1 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1856608 This reverts upstream commit 4fdc1790e6a9ef22399c6bc6e63b80f4609f3b7e due to a regression. Signed-off-by: dann frazier Acked-by: Marcelo Henrique Cerri Acked-by: Stefan Bader --- drivers/usb/core/hub.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 59b708ffc019f..4ddac9bd68e3c 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -104,8 +104,6 @@ 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) { @@ -1112,11 +1110,6 @@ 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