Commit 4ec1cd3e authored by Mathias Nyman's avatar Mathias Nyman Committed by Greg Kroah-Hartman

xhci: Fix sleeping with spin_lock_irq() held in ASmedia 1042A workaround

The flow control workaround for ASM1042A xHC hosts sleeps between
register polling. The workaround gets called in several places, among
them with spin_lock_irq() held when xHC host is resumed or hoplug removed.

This was noticed as kernel panics at resume on a Dell XPS15 9550 with
TB16 thunderbolt dock.

Avoid sleeping with spin_lock_irq() held, use udelay() instead

The original workaround was added to 4.9 and 4.12 stable releases,
this patch needs to be applied to those as well.

Fixes: 9da5a109 ("xhci: Bad Ethernet performance plugged in ASM1042A host")
Cc: <stable@vger.kernel.org> #4.9+
Reported-by: default avatarJose Marino <marinoj@nso.edu>
Tested-by: default avatarJose Marino <marinoj@nso.edu>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c6b8e793
...@@ -447,7 +447,7 @@ static int usb_asmedia_wait_write(struct pci_dev *pdev) ...@@ -447,7 +447,7 @@ static int usb_asmedia_wait_write(struct pci_dev *pdev)
if ((value & ASMT_CONTROL_WRITE_BIT) == 0) if ((value & ASMT_CONTROL_WRITE_BIT) == 0)
return 0; return 0;
usleep_range(40, 60); udelay(50);
} }
dev_warn(&pdev->dev, "%s: check_write_ready timeout", __func__); dev_warn(&pdev->dev, "%s: check_write_ready timeout", __func__);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment