usb: core: lpm: set lpm_capable for root hub device

Commit 25cd2882e2fc ("usb/xhci: Change how we indicate a host supports
Link PM.") removed the code to set lpm_capable for USB 3.0 super-speed
root hub. The intention of that change was to avoid touching usb core
internal field, a.k.a. lpm_capable, and let usb core to set it by
checking U1 and U2 exit latency values in the descriptor.

Usb core checks and sets lpm_capable in hub_port_init(). Unfortunately,
root hub is a special usb device as it has no parent. Hub_port_init()
will never be called for a root hub device. That means lpm_capable will
by no means be set for the root hub. As the result, lpm isn't functional
at all in Linux kernel.

This patch add the code to check and set lpm_capable when registering a
root hub device. It could be back-ported to kernels as old as v3.15,
that contains the Commit 25cd2882e2fc ("usb/xhci: Change how we indicate
a host supports Link PM.").

Cc: stable@vger.kernel.org # 3.15
Reported-by: Kevin Strasser <kevin.strasser@linux.intel.com>
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by Lu Baolu and committed by Greg Kroah-Hartman 2d2a3167 7021deae

+7 -3
+5 -2
drivers/usb/core/hcd.c
··· 1022 dev_name(&usb_dev->dev), retval); 1023 return (retval < 0) ? retval : -EMSGSIZE; 1024 } 1025 - if (usb_dev->speed == USB_SPEED_SUPER) { 1026 retval = usb_get_bos_descriptor(usb_dev); 1027 - if (retval < 0) { 1028 mutex_unlock(&usb_bus_list_lock); 1029 dev_dbg(parent_dev, "can't read %s bos descriptor %d\n", 1030 dev_name(&usb_dev->dev), retval);
··· 1022 dev_name(&usb_dev->dev), retval); 1023 return (retval < 0) ? retval : -EMSGSIZE; 1024 } 1025 + 1026 + if (le16_to_cpu(usb_dev->descriptor.bcdUSB) >= 0x0201) { 1027 retval = usb_get_bos_descriptor(usb_dev); 1028 + if (!retval) { 1029 + usb_dev->lpm_capable = usb_device_supports_lpm(usb_dev); 1030 + } else if (usb_dev->speed == USB_SPEED_SUPER) { 1031 mutex_unlock(&usb_bus_list_lock); 1032 dev_dbg(parent_dev, "can't read %s bos descriptor %d\n", 1033 dev_name(&usb_dev->dev), retval);
+1 -1
drivers/usb/core/hub.c
··· 122 return usb_get_intfdata(hdev->actconfig->interface[0]); 123 } 124 125 - static int usb_device_supports_lpm(struct usb_device *udev) 126 { 127 /* USB 2.1 (and greater) devices indicate LPM support through 128 * their USB 2.0 Extended Capabilities BOS descriptor.
··· 122 return usb_get_intfdata(hdev->actconfig->interface[0]); 123 } 124 125 + int usb_device_supports_lpm(struct usb_device *udev) 126 { 127 /* USB 2.1 (and greater) devices indicate LPM support through 128 * their USB 2.0 Extended Capabilities BOS descriptor.
+1
drivers/usb/core/usb.h
··· 65 extern void usb_hub_cleanup(void); 66 extern int usb_major_init(void); 67 extern void usb_major_cleanup(void); 68 69 #ifdef CONFIG_PM 70
··· 65 extern void usb_hub_cleanup(void); 66 extern int usb_major_init(void); 67 extern void usb_major_cleanup(void); 68 + extern int usb_device_supports_lpm(struct usb_device *udev); 69 70 #ifdef CONFIG_PM 71