5.4-stable patches

added patches:
	usb-core-reduce-power-on-good-delay-time-of-root-hub.patch

diff --git a/queue-5.4/series b/queue-5.4/series
index eef8de3922d204702609998a4fcde1357d212663..9dfad70ca30cb2c83d51b3095bf74df0f19fbb4a 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -174,3 +174,4 @@ net-hns3-check-the-return-of-skb_checksum_help.patch
 revert-revert-alsa-usx2y-fix-potential-null-pointer-dereference.patch
 net-hso-bail-out-on-interrupt-urb-allocation-failure.patch
 neighbour-prevent-race-condition-in-neighbour-subsytem.patch
+usb-core-reduce-power-on-good-delay-time-of-root-hub.patch

diff --git a/queue-5.4/usb-core-reduce-power-on-good-delay-time-of-root-hub.patch b/queue-5.4/usb-core-reduce-power-on-good-delay-time-of-root-hub.patch
new file mode 100644 (file)
index 0000000..843a9df
--- /dev/null
+++ b/queue-5.4/usb-core-reduce-power-on-good-delay-time-of-root-hub.patch
@@ -0,0 +1,39 @@
+From 90d28fb53d4a51299ff324dede015d5cb11b88a2 Mon Sep 17 00:00:00 2001
+From: Chunfeng Yun <chunfeng.yun@mediatek.com>
+Date: Sat, 10 Apr 2021 09:20:45 +0800
+Subject: usb: core: reduce power-on-good delay time of root hub
+
+From: Chunfeng Yun <chunfeng.yun@mediatek.com>
+
+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>
+---
+ drivers/usb/core/hub.h |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/drivers/usb/core/hub.h
++++ b/drivers/usb/core/hub.h
+@@ -148,8 +148,10 @@ static inline unsigned hub_power_on_good
+ {
+       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,