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=unavailable 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 73251C2BB85 for ; Thu, 16 Apr 2020 16:02:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 443D321924 for ; Thu, 16 Apr 2020 16:02:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587052975; bh=3dyfdrcJtqedEAe78Sa25EvOU4P26dhA8o3gaVQR+yg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Yd0VbkQsQ8coULk2omebDiAaUJsAzmACaS0rThcbwoLlxc4G4NvypUWxvv6aerYEu YAWdyPBwO6B4QaM4u+1QisjRvDevTCZtterYeNcWmL/liV4Un1tQumyv+ToC6R2WXk PA34y8CEkMLrsMnFZdC7/Y/GB2elK076Hj9u2ckw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2636664AbgDPQCw (ORCPT ); Thu, 16 Apr 2020 12:02:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:34428 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2895269AbgDPN0e (ORCPT ); Thu, 16 Apr 2020 09:26:34 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 E181F21D91; Thu, 16 Apr 2020 13:26:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587043581; bh=3dyfdrcJtqedEAe78Sa25EvOU4P26dhA8o3gaVQR+yg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HCFS9w/CoaWJ0RpNZg2G87vjkB56KeKdjI+Hy+bBMQWY0JBHLS/xf/TPct1uazByY FnPEynfaWUO8XXesPHZmtSFFWNyWdotWVyPKiR+9/ztL4+J3avh6JpBZP8eugsOBy0 +ZxyIejC1AjpYsyMdEprWl1sVMfxALLHn69nZ/84= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mathias Nyman , Sasha Levin Subject: [PATCH 4.19 016/146] xhci: bail out early if driver cant accress host in resume Date: Thu, 16 Apr 2020 15:22:37 +0200 Message-Id: <20200416131244.759791477@linuxfoundation.org> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200416131242.353444678@linuxfoundation.org> References: <20200416131242.353444678@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mathias Nyman [ Upstream commit 72ae194704da212e2ec312ab182a96799d070755 ] Bail out early if the xHC host needs to be reset at resume but driver can't access xHC PCI registers. If xhci driver already fails to reset the controller then there is no point in attempting to free, re-initialize, re-allocate and re-start the host. If failure to access the host is detected later, failing the resume, xhci interrupts will be double freed when remove is called. Signed-off-by: Mathias Nyman Link: https://lore.kernel.org/r/20200312144517.1593-2-mathias.nyman@linux.intel.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/usb/host/xhci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 65cc362717fcb..b4177287d7d0f 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -1147,8 +1147,10 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated) xhci_dbg(xhci, "Stop HCD\n"); xhci_halt(xhci); xhci_zero_64b_regs(xhci); - xhci_reset(xhci); + retval = xhci_reset(xhci); spin_unlock_irq(&xhci->lock); + if (retval) + return retval; xhci_cleanup_msix(xhci); xhci_dbg(xhci, "// Disabling event ring interrupts\n"); -- 2.20.1