From patchwork Fri Apr 13 00:29:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hackmann X-Patchwork-Id: 10339317 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E4F1A604D4 for ; Fri, 13 Apr 2018 00:30:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D72B4285D2 for ; Fri, 13 Apr 2018 00:30:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CB6E1285D8; Fri, 13 Apr 2018 00:30:32 +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.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID 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 BDFCF285D2 for ; Fri, 13 Apr 2018 00:30:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753742AbeDMAaU (ORCPT ); Thu, 12 Apr 2018 20:30:20 -0400 Received: from mail-pl0-f68.google.com ([209.85.160.68]:35900 "EHLO mail-pl0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753694AbeDMAaT (ORCPT ); Thu, 12 Apr 2018 20:30:19 -0400 Received: by mail-pl0-f68.google.com with SMTP id 91-v6so5028884pld.3 for ; Thu, 12 Apr 2018 17:30:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=1BlayLRfFu+78r5GGrXeh/Qmr0IVrkjt4ObWBQ4LbMk=; b=prFBaON8wto4cm8W9KmrUkabr+lAv1ZLlJZ0HRuGKb0+0P5nzvtPJaHj7mcdreklmG 0+7iqIFzkh+9YPcRd19QwbIbg9aDlqYvacS7UDB5KqWWOPKq59Y6lKYENyNcofzDsh2V H/JwTLDcFTG/rhSqNfPvrtjmPY8H35lcLVMIB1Ss4ML+f2ZJHIwjrB4ONaQEBlm52hkN OCjw2WNIWS0n4LkbAptwmznX5viZrcel7+2oG7y7r6E2bFJqPk0UxoepS5jviu0ZLsH4 Q5KG3Ii2H+T8bAmEVJTRCut6OAKwlIwfSjfrdzQiWZFygfAl+SPYxb5iyYbAysZ/Lzq7 VfGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=1BlayLRfFu+78r5GGrXeh/Qmr0IVrkjt4ObWBQ4LbMk=; b=OWcamLES7UyuOLYQf0o7xL3cMLXMzmhD2PxpzsQzRtGS9Sz6j+9k3iOG+MH4ilpq6k Riu2Mdw1m6Ft7nPp6+ZG4V6mQ9VNH/UFlYKrUtyVxnGpw+N7M2GD7DgUq7Y8fJWZFaXr eLRfg8NIskc+PWyQ9NSnW4l7SvJgZej3DaPyyOOwA7COopu9U8z6l5WT7/pMjRxAMdPq IL5BhxVYQ/tLaNP+9K4XuiEXRDnoaooTX7i8RJwgq1U3EsKzecim0Xl+6g+ttjiShCzY djzb95+dQkCIvnuI4C+GuB7jwdRaTcJ27H2Cgmp19H4m2OkeBFpZBW44f0X5Y7p+ZLJW 3aHg== X-Gm-Message-State: ALQs6tAxjC9BE7+rx9oO7XZZ2y/IKFuzrODzXoxS03oDBsqJDCOU+dib 4+7wC+0ItPzhw4beZsKPBe7Tjw== X-Google-Smtp-Source: AIpwx49qvx1uoNwsLdhgtcZ2ipL45dnY1M1TCY1mw3ZvItCibh4JjeDoOdeNWW6HTllbGf80kc9XXg== X-Received: by 2002:a17:902:206:: with SMTP id 6-v6mr3118024plc.376.1523579418575; Thu, 12 Apr 2018 17:30:18 -0700 (PDT) Received: from hackmann.mtv.corp.google.com ([2620:0:1000:1600:2377:5409:db26:9d95]) by smtp.gmail.com with ESMTPSA id d64sm9328270pfa.80.2018.04.12.17.30.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Apr 2018 17:30:17 -0700 (PDT) From: Greg Hackmann To: Adam Wallis , Mathias Nyman , Greg Kroah-Hartman Cc: Badhri Jagan Sridharan , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Hackmann , stable@vger.kernel.org Subject: [PATCH] Revert "xhci: plat: Register shutdown for xhci_plat" Date: Thu, 12 Apr 2018 17:29:51 -0700 Message-Id: <20180413002951.155762-1-ghackmann@google.com> X-Mailer: git-send-email 2.17.0.484.g0c8726318c-goog 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 Pixel 2 field testers reported that when they tried to reboot their phones with some USB devices plugged in, the reboot would get wedged and eventually trigger watchdog reset. Once the Pixel kernel team found a reliable repro case, they narrowed it down to this commit's 4.4.y backport. Reverting the change made the issue go away. This reverts commit b07c12517f2aed0add8ce18146bb426b14099392. Cc: stable@vger.kernel.org Signed-off-by: Greg Hackmann --- drivers/usb/host/xhci-plat.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c index df327dcc2bac..ea089fdda611 100644 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c @@ -420,7 +420,6 @@ MODULE_DEVICE_TABLE(acpi, usb_xhci_acpi_match); static struct platform_driver usb_xhci_driver = { .probe = xhci_plat_probe, .remove = xhci_plat_remove, - .shutdown = usb_hcd_platform_shutdown, .driver = { .name = "xhci-hcd", .pm = &xhci_plat_pm_ops,