xhci: clear root port wake on bits if controller isn't wake-up capable
Subsystems (2)
PATCH 1/1 xhci: clear root port wake on bits if controller isn't wake-up capable
When the xHCI PCI host is suspended, if do_wakeup is false in xhci_pci_suspend, xhci_bus_suspend needs to clear all root port wake on bits. Otherwise some Intel platform may get a spurious wakeup, even if PCI PME# is disabled.
http://marc.info/?l=linux-usb&m=138194006009255&w=2
--- drivers/usb/host/xhci-hub.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/usb/host/xhci-hub.c +4 -1
@@ -22,6 +22,7 @@#include <linux/slab.h> +#include <linux/device.h> #include <asm/unaligned.h> #include "xhci.h"
@@ -1139,7 +1140,9 @@ int xhci_bus_suspend(struct usb_hcd *hcd)* including the USB 3.0 roothub, but only if CONFIG_PM_RUNTIME * is enabled, so also enable remote wake here. */ -if (hcd->self.root_hub->do_remote_wakeup) { +if (hcd->self.root_hub->do_remote_wakeup + &&device_may_wakeup (hcd->self.controller)) { +if (t1 &PORT_CONNECT ) { t2 |=PORT_WKOC_E |PORT_WKDISC_E ; t2 &= ~PORT_WKCONN_E ;
Signature · 1 line
1.9.1
Greg Kroah-Hartman
maintainerQuoted 10 lines · Lu Baolu
When the xHCI PCI host is suspended, if
do_wakeupis false inxhci_pci_suspend,xhci_bus_suspendneeds to clear all root port wake on bits. Otherwise some Intel platform may get a spurious wakeup, even if PCI PME# is disabled.http://marc.info/?l=linux-usb&m=138194006009255&w=2
Signed-off-by Lu Baolu <[email protected]>--- drivers/usb/host/xhci-hub.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
Should this also be a stable kernel patch? If so, how far back?
thanks,
greg k-h
Quoted 5 lines · Greg Kroah-Hartman
Quoted 4 lines · Lu Baolu
When the xHCI PCI host is suspended, if
do_wakeupis false inxhci_pci_suspend,xhci_bus_suspendneeds to clear all root port wake on bits. Otherwise some Intel platform may get a spurious wakeup, even if PCI PME# is disabled.
Quoted 7 lines
Quoted 6 lines
http://marc.info/?l=linux-usb&m=138194006009255&w=2
Signed-off-by Lu Baolu <[email protected]>--- drivers/usb/host/xhci-hub.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)Should this also be a stable kernel patch? If so, how far back?
Yes.
This patch should be back-ported to kernels as old as 2.6.37, that contains the commit 9777e3ce907d4cb5a513902a87ecd03b52499569 "USB: xHCI: bus power management implementation".
Thanks,
-baolu
Quoted 11 lines
thanks,
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/