xhci: clear root port wake on bits if controller isn't wake-up capable
Subsystems (2)
PATCH v2 1/1 xhci: clear root port wake on bits if controller isn't wake-up capable
When 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 platforms may get a spurious wakeup, even if PCI PME# is disabled.
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".
--- 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
Mathias Nyman
maintainerQuoted 27 lines · Lu Baolu
When 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 platforms may get a spurious wakeup, even if PCI PME# is disabled.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".Signed-off-by Lu Baolu <[email protected]>--- drivers/usb/host/xhci-hub.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)drivers/usb/host/xhci-hub.c +1
-0@@ -22,6 +22,7 @@#include <linux/slab.h> +#include <linux/device.h> #include <asm/unaligned.h> #include "xhci.h"
drivers/usb/host/xhci-hub.c int xhci_bus_suspend(struct usb_hcd *hcd) · line 1148
Quoted 10 lines
drivers/usb/host/xhci-hub.c +3
-1@@ -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 ;
Looks good to me, thanks for fixing.
I can take it, add the "cc: stable" tag and send it forward to Greg once his trees get updated to 3.16 release candidates
-Mathias