leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xhci: Regression fix for 3.13

Browse Source 
Hi Greg,
 
 In 3.12-rc5, I merged a patch that was supposed to fix spurious reboots on
 shutdown on HP systems.  The quirk was broadly applied to all Intel Haswell and
 Haswell ULT systems.  Turns out the quirk caused non-HP systems to reboot on
 suspend.  They shutdown just fine with the quirk patch reverted.  This patch
 narrows the xHCI quirk to only run on HP systems.
 
 Sometimes fixing firmware issues feels like plugging holes in a leaky boat.
 
 Sarah Sharp
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJSp2/HAAoJEBMGWMLi1Gc5hXoP/ireKAz1nA5O7GXSfKSipeRv
 IPnAbGs2cSHSpS2zHd5ogIQ6fCG77/mEe8enZVfYuxGluv6xhFMP483s2gmCbzW8
 brgC66nLYd0Wbgm98W8CIesoeigKGCb7a0g7Ztl6CC6ZkzQXrfQHm8yBwJh2wNrQ
 Uig/OPL+oRwHHF7EfDxwwHfkC7l9BBYKN000U5vBumzqEVB0N265rGQNcZGkyjj9
 exnNqJfWJONwUjuiX9cEfnb4NfGWdphqUO9TPR28k2LM6DIusU/IDiQqyeWgF9NV
 lRdxig4BAF2uc23/7SsWknt9+duJWMPOQkSqMn8AFTQGMzreuaQBj07z0Si2LU42
 nqaMAMcFZpSvgIUl1miwKpv8GK677r+J6G/SrmLJuqh+qRWOnJZ/iQ01CuOAJKxj
 CxHKg3xL6MsdEMUGgeetSWWoVCCJrnZq3gma/4Foah6mukNTwhIHGWdhrx2GJFoo
 gtJnS7GKRoFS5iyRnv3touiFoV1XZ/H7ToU5f6T5jgAQXJuqTk9auay+RGnly+v0
 hF7ZkDdmcyQNV/S1g2ZwCcbhPg2zjHY7qhMm7ARh4rlttWCv3iALde1Hx87PTb86
 Pw8k7NGs2BkZ4ZsAUlHKNQOrOPevlkm2Dt6TCjSTo1gXxH2++r/Bj4qYzs7fUs9Q
 YboJeMtJlRKjHCoUV7J0
 =g+6b
 -----END PGP SIGNATURE-----

Merge tag 'for-usb-linus-2013-12-10' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci into usb-linus

Sarah writes:

xhci: Regression fix for 3.13

Hi Greg,

In 3.12-rc5, I merged a patch that was supposed to fix spurious reboots on
shutdown on HP systems.  The quirk was broadly applied to all Intel Haswell and
Haswell ULT systems.  Turns out the quirk caused non-HP systems to reboot on
suspend.  They shutdown just fine with the quirk patch reverted.  This patch
narrows the xHCI quirk to only run on HP systems.

Sometimes fixing firmware issues feels like plugging holes in a leaky boat.

Sarah Sharp
This commit is contained in:
Greg Kroah-Hartman 2013-12-10 12:48:15 -08:00
commit 1caab68bff
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/usb/host/xhci-pci.c
View File

@ -128,7 +128,12 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
* any other sleep) on Haswell machines with LPT and LPT-LP
* with the new Intel BIOS
*/
xhci->quirks |= XHCI_SPURIOUS_WAKEUP;
/* 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_ETRON &&
pdev->device == PCI_DEVICE_ID_ASROCK_P67) {