usb: core: reduce power-on-good delay time of root hub

BugLink: https://bugs.launchpad.net/bugs/1931166
commit 90d28fb53d4a51299ff324dede015d5cb11b88a2 upstream.

Return the exactly delay time given by root hub descriptor,
this helps to reduce resume time etc.

Due to the root hub descriptor is usually provided by the host
controller driver, if there is compatibility for a root hub,
we can fix it easily without affect other root hub

Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
Link: https://lore.kernel.org/r/1618017645-12259-1-git-send-email-chunfeng.yun@mediatek.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

diff --git a/drivers/usb/core/hub.h b/drivers/usb/core/hub.h
index 92fc6c8f54eba61b8e471b47752a112a5dcc1f82..5bd2831dc9921ddce822b5a6643467190c743630 100644 (file)
--- a/drivers/usb/core/hub.h
+++ b/drivers/usb/core/hub.h
@@ -147,8 +147,10 @@ static inline unsigned hub_power_on_good_delay(struct usb_hub *hub)
 {
        unsigned delay = hub->descriptor->bPwrOn2PwrGood * 2;
 
-       /* Wait at least 100 msec for power to become stable */
-       return max(delay, 100U);
+       if (!hub->hdev->parent) /* root hub */
+               return delay;
+       else /* Wait at least 100 msec for power to become stable */
+               return max(delay, 100U);
 }
 
 static inline int hub_port_debounce_be_connected(struct usb_hub *hub,