Commit fb2ce178 authored by Wesley Cheng's avatar Wesley Cheng Committed by Greg Kroah-Hartman
Browse files

usb: host: xhci: Do not re-initialize the XHCI HC if being removed 



During XHCI resume, if there was a host controller error detected the
routine will attempt to re-initialize the XHCI HC, so that it can return
back to an operational state.  If the XHCI host controller is being
removed, this sequence would be already handled within the XHCI halt path,
leading to a duplicate set of reg ops/calls.  In addition, since the XHCI
bus is being removed, the overhead added in restarting the HCD is
unnecessary.  Check for the XHC state before setting the reinit_xhc
parameter, which is responsible for triggering the restart.

Signed-off-by: default avatarWesley Cheng <quic_wcheng@quicinc.com>
Message-ID: <20230531222719.14143-2-quic_wcheng@quicinc.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 256a02e2

drivers/usb/host/xhci.c

+2 −1
Original line number Diff line number Diff line
@@ -1028,7 +1028,8 @@ int xhci_resume(struct xhci_hcd *xhci, pm_message_t msg) 
	temp = readl(&xhci->op_regs->status);



	/* re-initialize the HC on Restore Error, or Host Controller Error */

	if (temp & (STS_SRE | STS_HCE)) {

	if ((temp & (STS_SRE | STS_HCE)) &&

	    !(xhci->xhc_state & XHCI_STATE_REMOVING)) {

		reinit_xhc = true;

		if (!xhci->broken_suspend)

			xhci_warn(xhci, "xHC error in resume, USBSTS 0x%x, Reinit\n", temp);