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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 CE3EAC2BBFD for ; Fri, 10 Apr 2020 03:54:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9C89720936 for ; Fri, 10 Apr 2020 03:54:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586490881; bh=3dyfdrcJtqedEAe78Sa25EvOU4P26dhA8o3gaVQR+yg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=bMpdDsmwxrKg6qiBPvIaY/tPDfNl+zXZwbY97We4OOgDKxXcjDSZBPIkCMecUcXRq SMbQteJBBco8FjfRFrZEHCA4S50inWJ9OkShVliDl1Q1J0IbZJIFnnHJ0cHox0w/k4 WzgUzVgQZJv2MAx87x3pbQ5RSQ5ceblxOeef52GI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727208AbgDJDuV (ORCPT ); Thu, 9 Apr 2020 23:50:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:34688 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728839AbgDJDuO (ORCPT ); Thu, 9 Apr 2020 23:50:14 -0400 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 068F420936; Fri, 10 Apr 2020 03:50:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586490614; bh=3dyfdrcJtqedEAe78Sa25EvOU4P26dhA8o3gaVQR+yg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZVA5Vg2f5ZJirXk1dN/nuhmk6RtZZZK1A7vFpn5EHh3RvW7jE4POMP6/nRT1s00vy VMEmHLDM2QInyCfV+r3MhPaSKr9U4Op0Ff1kCEdd1FdFuOg8+oFDi+JKSYSE1c6Wss 7De6xcVz6VzAZoUkQrAGHPx3OvdohG/uuYDRDHoo= 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.19 07/32] xhci: bail out early if driver can't accress host in resume Date: Thu, 9 Apr 2020 23:49:40 -0400 Message-Id: <20200410035005.9371-7-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200410035005.9371-1-sashal@kernel.org> References: <20200410035005.9371-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@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