| From b45abacde3d551c6696c6738bef4a1805d0bf27a Mon Sep 17 00:00:00 2001 |
| From: Oliver Neukum <oneukum@suse.de> |
| Date: Mon, 27 Oct 2014 14:53:29 +0100 |
| Subject: xhci: no switching back on non-ULT Haswell |
| |
| From: Oliver Neukum <oneukum@suse.de> |
| |
| commit b45abacde3d551c6696c6738bef4a1805d0bf27a upstream. |
| |
| 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: Oliver Neukum <oneukum@suse.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/usb/host/xhci-pci.c | 14 -------------- |
| 1 file changed, 14 deletions(-) |
| |
| --- a/drivers/usb/host/xhci-pci.c |
| +++ b/drivers/usb/host/xhci-pci.c |
| @@ -126,20 +126,6 @@ static void xhci_pci_quirks(struct devic |
| 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; |
| } |
