| Message ID | Pine.LNX.4.44L0.1610211642420.1898-100000@iolanthe.rowland.org |
|---|---|
| State | Accepted |
| Headers | show |
On Fri, Oct 21, 2016 at 04:49:07PM -0400, Alan Stern wrote: > The UHCI controllers in Intel chipsets rely on a platform-specific > non-PME mechanism for wakeup signalling. They can generate wakeup > signals even though they don't support PME. > > We need to let the USB core know this so that it will enable runtime > suspend for UHCI controllers. > > Signed-off-by: Alan Stern <stern@rowland.harvard.edu> > CC: <stable@vger.kernel.org> > > --- > > Greg: > > This patch is somewhat independent of the 1/2 patch I sent to Bjorn. > Still, it will help to keep them together. Is it okay to have him > merge both of them through his tree? Fine with me: Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sat, Oct 22, 2016 at 12:03:44PM +0200, Greg KH wrote: > On Fri, Oct 21, 2016 at 04:49:07PM -0400, Alan Stern wrote: > > The UHCI controllers in Intel chipsets rely on a platform-specific > > non-PME mechanism for wakeup signalling. They can generate wakeup > > signals even though they don't support PME. > > > > We need to let the USB core know this so that it will enable runtime > > suspend for UHCI controllers. > > > > Signed-off-by: Alan Stern <stern@rowland.harvard.edu> > > CC: <stable@vger.kernel.org> > > > > --- > > > > Greg: > > > > This patch is somewhat independent of the 1/2 patch I sent to Bjorn. > > Still, it will help to keep them together. Is it okay to have him > > merge both of them through his tree? > > Fine with me: > > Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> I applied both these patches to pci/pm for v4.10, thanks! -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Index: usb-4.x/drivers/usb/host/uhci-pci.c =================================================================== --- usb-4.x.orig/drivers/usb/host/uhci-pci.c +++ usb-4.x/drivers/usb/host/uhci-pci.c @@ -129,6 +129,10 @@ static int uhci_pci_init(struct usb_hcd if (to_pci_dev(uhci_dev(uhci))->vendor == PCI_VENDOR_ID_HP) uhci->wait_for_hp = 1; + /* Intel controllers use non-PME wakeup signalling */ + if (to_pci_dev(uhci_dev(uhci))->vendor == PCI_VENDOR_ID_INTEL) + device_set_run_wake(uhci_dev(uhci), 1); + /* Set up pointers to PCI-specific functions */ uhci->reset_hc = uhci_pci_reset_hc; uhci->check_and_reset_hc = uhci_pci_check_and_reset_hc;
The UHCI controllers in Intel chipsets rely on a platform-specific non-PME mechanism for wakeup signalling. They can generate wakeup signals even though they don't support PME. We need to let the USB core know this so that it will enable runtime suspend for UHCI controllers. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> CC: <stable@vger.kernel.org> --- Greg: This patch is somewhat independent of the 1/2 patch I sent to Bjorn. Still, it will help to keep them together. Is it okay to have him merge both of them through his tree? Alan Stern [as1815] drivers/usb/host/uhci-pci.c | 4 ++++ 1 file changed, 4 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html