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

Commit 3782f48d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: host: xhci-plat: Fix interrupt storm issue in host mode"

parents 4a7e24c1 dbe2d1b7

drivers/usb/host/xhci-plat.c

+8 −1
Original line number Diff line number Diff line
@@ -300,13 +300,19 @@ static int xhci_plat_runtime_suspend(struct device *dev) 
{

	struct usb_hcd *hcd = dev_get_drvdata(dev);

	struct xhci_hcd *xhci = hcd_to_xhci(hcd);

	int ret;



	if (!xhci)

		return 0;



	dev_dbg(dev, "xhci-plat runtime suspend\n");



	return xhci_suspend(xhci, true);

	disable_irq(hcd->irq);

	ret = xhci_suspend(xhci, true);

	if (ret)

		enable_irq(hcd->irq);



	return ret;

}



static int xhci_plat_runtime_resume(struct device *dev)
@@ -321,6 +327,7 @@ static int xhci_plat_runtime_resume(struct device *dev) 
	dev_dbg(dev, "xhci-plat runtime resume\n");



	ret = xhci_resume(xhci, false);

	enable_irq(hcd->irq);

	pm_runtime_mark_last_busy(dev);



	return ret;

drivers/usb/host/xhci.c

+4 −0
Original line number Diff line number Diff line
@@ -949,6 +949,8 @@ int xhci_suspend(struct xhci_hcd *xhci, bool do_wakeup) 
	if (xhci_handshake(xhci, &xhci->op_regs->status,

		      STS_HALT, STS_HALT, delay)) {

		xhci_warn(xhci, "WARN: xHC CMD_RUN timeout\n");

		set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);

		set_bit(HCD_FLAG_HW_ACCESSIBLE, &xhci->shared_hcd->flags);

		spin_unlock_irq(&xhci->lock);

		return -ETIMEDOUT;

	}
@@ -964,6 +966,8 @@ int xhci_suspend(struct xhci_hcd *xhci, bool do_wakeup) 
	if (xhci_handshake(xhci, &xhci->op_regs->status,

				STS_SAVE, 0, 10 * 1000)) {

		xhci_warn(xhci, "WARN: xHC save state timeout\n");

		set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);

		set_bit(HCD_FLAG_HW_ACCESSIBLE, &xhci->shared_hcd->flags);

		spin_unlock_irq(&xhci->lock);

		return -ETIMEDOUT;

	}