All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mathias Nyman <mathias.nyman@linux.intel.com>
To: <gregkh@linuxfoundation.org>
Cc: <linux-usb@vger.kernel.org>,
	Mathias Nyman <mathias.nyman@linux.intel.com>
Subject: [PATCH 1/9] xhci: bail out early if driver can't accress host in resume
Date: Thu, 12 Mar 2020 16:45:09 +0200	[thread overview]
Message-ID: <20200312144517.1593-2-mathias.nyman@linux.intel.com> (raw)
In-Reply-To: <20200312144517.1593-1-mathias.nyman@linux.intel.com>

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 <mathias.nyman@linux.intel.com>
---
 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 dbac0fa9748d..fe38275363e0 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.17.1


  reply	other threads:[~2020-03-12 14:42 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-12 14:45 [PATCH 0/9] xhci features for usb-next Mathias Nyman
2020-03-12 14:45 ` Mathias Nyman [this message]
2020-03-12 14:45 ` [PATCH 2/9] xhci: Add a separate debug message for split transaction errors Mathias Nyman
2020-03-12 14:45 ` [PATCH 3/9] xhci: Show host status when watchdog triggers and host is assumed dead Mathias Nyman
2020-03-12 14:45 ` [PATCH 4/9] usb: xhci: Enable LPM for VIA LABS VL805 Mathias Nyman
2020-03-12 14:45 ` [PATCH 5/9] usb: host: xhci-tegra: Tegra186/Tegra194 LPM Mathias Nyman
2020-03-12 14:45 ` [PATCH 6/9] xhci: Ensure link state is U3 after setting USB_SS_PORT_LS_U3 Mathias Nyman
2020-03-12 14:45 ` [PATCH 7/9] xhci: Wait until link state trainsits to U0 after setting USB_SS_PORT_LS_U0 Mathias Nyman
2020-03-12 14:45 ` [PATCH 8/9] xhci: Finetune host initiated USB3 rootport link suspend and resume Mathias Nyman
2020-03-12 14:45 ` [PATCH 9/9] xhci-pci: Allow host runtime PM as default for Intel Tiger Lake xHCI Mathias Nyman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200312144517.1593-2-mathias.nyman@linux.intel.com \
    --to=mathias.nyman@linux.intel.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-usb@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.