Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2554ae0c authored by Mathias Nyman's avatar Mathias Nyman Committed by Greg Kroah-Hartman
Browse files

xhci: bail out early if driver can't accress host in resume 



[ 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: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20200312144517.1593-2-mathias.nyman@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent fe5b2e54

drivers/usb/host/xhci.c

+3 −1
Original line number Diff line number Diff line
@@ -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");