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=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 31814C2BB85 for ; Thu, 16 Apr 2020 15:48:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0941A214AF for ; Thu, 16 Apr 2020 15:48:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587052102; bh=aj+C3qty4HdDe8GL8geUEloqbIzbEgqKD6KeLaYq//Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=xWkUZlGnz8Ypz7VtFO+5OO7OAq/omAcqIJ+REJLajcRDpaCFibBSKxgNwiH1WrUm1 stoqeQJXacw8YJfsUX7MBmQQN/FbPQB4PUu7oAf62qwutsO7SBkXgvdWBHQXbLtoFq qQg4AaVBqMk9X0oFKgRlo5aao+ROFhUAe/mSifyc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2442555AbgDPPsT (ORCPT ); Thu, 16 Apr 2020 11:48:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:44618 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2896705AbgDPNdY (ORCPT ); Thu, 16 Apr 2020 09:33:24 -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 EB6B2221F4; Thu, 16 Apr 2020 13:33:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587044003; bh=aj+C3qty4HdDe8GL8geUEloqbIzbEgqKD6KeLaYq//Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F6U7pDi+wQ1qISrUK0D2oFVALag4ePJm0DY5H98aKs3O66VnRbxzsmX+1g3UAIm5h u6PCFUGVFmmRHqBSOhQKG1e8NpZPAY04SeRPbd78TzClOpravzvRCr2kbTJoPOoXlq FiXX0AjPlZRgtoNs8rUmR+9Ic166OQcvX38xicqU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mathias Nyman , Sasha Levin Subject: [PATCH 5.5 042/257] xhci: bail out early if driver cant accress host in resume Date: Thu, 16 Apr 2020 15:21:33 +0200 Message-Id: <20200416131331.200370170@linuxfoundation.org> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200416131325.891903893@linuxfoundation.org> References: <20200416131325.891903893@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 dbac0fa9748d5..fe38275363e0f 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -1157,8 +1157,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