[PATCH 3/4] Revert "xhci: clear root port wake on bits if controller isn't wake-up capable"
From: Lu Baolu commit ff8cbf250b44 ("xhci: clear root port wake on bits if controller isn't") can cause device detection error if runtime PM is enabled, and S3 wake is disabled. Revert it. https://bugzilla.kernel.org/show_bug.cgi?id=85701 This commit got into stable and should be reverted from there as well. Cc: stable Signed-off-by: Lu Baolu Reported-by: Dmitry Nezhevenko [Mathias Nyman: reword commit message] Signed-off-by: Mathias Nyman --- drivers/usb/host/xhci-hub.c | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c index 696160d..388cfd8 100644 --- a/drivers/usb/host/xhci-hub.c +++ b/drivers/usb/host/xhci-hub.c @@ -22,7 +22,6 @@ #include -#include #include #include "xhci.h" @@ -1149,9 +1148,7 @@ 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 - && device_may_wakeup(hcd->self.controller)) { - + if (hcd->self.root_hub->do_remote_wakeup) { if (t1 & PORT_CONNECT) { t2 |= PORT_WKOC_E | PORT_WKDISC_E; t2 &= ~PORT_WKCONN_E; -- 1.8.3.2 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/4] Revert "xhci: clear root port wake on bits if controller isn't wake-up capable"
On Fri, Nov 14, 2014 at 07:23:51PM +0200, Mathias Nyman wrote: > From: Lu Baolu > > commit ff8cbf250b44 ("xhci: clear root port wake on bits if controller isn't") > can cause device detection error if runtime PM is enabled, and S3 wake > is disabled. Revert it. > https://bugzilla.kernel.org/show_bug.cgi?id=85701 > > This commit got into stable and should be reverted from there as well. how far back ? Aparently 2.6.37+ > Cc: stable > Signed-off-by: Lu Baolu > Reported-by: Dmitry Nezhevenko > [Mathias Nyman: reword commit message] > Signed-off-by: Mathias Nyman > --- > drivers/usb/host/xhci-hub.c | 5 + > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c > index 696160d..388cfd8 100644 > --- a/drivers/usb/host/xhci-hub.c > +++ b/drivers/usb/host/xhci-hub.c > @@ -22,7 +22,6 @@ > > > #include > -#include > #include > > #include "xhci.h" > @@ -1149,9 +1148,7 @@ 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 > - && device_may_wakeup(hcd->self.controller)) { > - > + if (hcd->self.root_hub->do_remote_wakeup) { > if (t1 & PORT_CONNECT) { > t2 |= PORT_WKOC_E | PORT_WKDISC_E; > t2 &= ~PORT_WKCONN_E; > -- > 1.8.3.2 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-usb" in > the body of a message to majord...@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- balbi signature.asc Description: Digital signature
Re: [PATCH 3/4] Revert "xhci: clear root port wake on bits if controller isn't wake-up capable"
On 14.11.2014 19:30, Felipe Balbi wrote: > On Fri, Nov 14, 2014 at 07:23:51PM +0200, Mathias Nyman wrote: >> From: Lu Baolu >> >> commit ff8cbf250b44 ("xhci: clear root port wake on bits if controller >> isn't") >> can cause device detection error if runtime PM is enabled, and S3 wake >> is disabled. Revert it. >> https://bugzilla.kernel.org/show_bug.cgi?id=85701 >> >> This commit got into stable and should be reverted from there as well. > > how far back ? Aparently 2.6.37+ > That's how far the original patch says it should go yes, but I only found stable mails from 3.11.20.14, 3.2.62 3.13.11.6 -Mathias -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/4] Revert "xhci: clear root port wake on bits if controller isn't wake-up capable"
On Fri, Nov 14, 2014 at 07:40:01PM +0200, Mathias Nyman wrote: > On 14.11.2014 19:30, Felipe Balbi wrote: > > On Fri, Nov 14, 2014 at 07:23:51PM +0200, Mathias Nyman wrote: > >> From: Lu Baolu > >> > >> commit ff8cbf250b44 ("xhci: clear root port wake on bits if controller > >> isn't") > >> can cause device detection error if runtime PM is enabled, and S3 wake > >> is disabled. Revert it. > >> https://bugzilla.kernel.org/show_bug.cgi?id=85701 > >> > >> This commit got into stable and should be reverted from there as well. > > > > how far back ? Aparently 2.6.37+ > > > > That's how far the original patch says it should go yes, but I only found > stable mails from > 3.11.20.14, > 3.2.62 > 3.13.11.6 ok, so v3.2+ sounds like the right approach. -- balbi signature.asc Description: Digital signature