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

Commit b45abacd authored by Oliver Neukum's avatar Oliver Neukum Committed by Greg Kroah-Hartman
Browse files

xhci: no switching back on non-ULT Haswell 



The switch back is limited to ULT even on HP. The contrary
finding arose by bad luck in BIOS versions for testing.
This fixes spontaneous resume from S3 on some HP laptops.

Signed-off-by: default avatarOliver Neukum <oneukum@suse.de>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d7499475

drivers/usb/host/xhci-pci.c

+0 −14
Original line number Diff line number Diff line
@@ -127,20 +127,6 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) 
		xhci->quirks |= XHCI_SPURIOUS_REBOOT;

		xhci->quirks |= XHCI_AVOID_BEI;

	}

	if (pdev->vendor == PCI_VENDOR_ID_INTEL &&

	    (pdev->device == PCI_DEVICE_ID_INTEL_LYNXPOINT_XHCI ||

	     pdev->device == PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_XHCI)) {

		/* Workaround for occasional spurious wakeups from S5 (or

		 * any other sleep) on Haswell machines with LPT and LPT-LP

		 * with the new Intel BIOS

		 */

		/* Limit the quirk to only known vendors, as this triggers

		 * yet another BIOS bug on some other machines

		 * https://bugzilla.kernel.org/show_bug.cgi?id=66171

		 */

		if (pdev->subsystem_vendor == PCI_VENDOR_ID_HP)

			xhci->quirks |= XHCI_SPURIOUS_WAKEUP;

	}

	if (pdev->vendor == PCI_VENDOR_ID_INTEL &&

		pdev->device == PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_XHCI) {

		xhci->quirks |= XHCI_SPURIOUS_REBOOT;