4.14-stable patches

added patches:
	usb-musb-fix-runtime-pm-imbalance-on-error.patch
	usb-musb-start-session-in-resume-for-host-port.patch

diff --git a/queue-4.14/series b/queue-4.14/series
index e198f14d7c1be8eb1b1437d119fd610db63c4299..982ecda3da1a8a636243d8f2f0af285ad6c87cbc 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -30,3 +30,5 @@ l2tp-add-sk_family-checks-to-l2tp_validate_socket.patch
 usb-serial-qcserial-add-dw5816e-qdl-support.patch
 usb-serial-usb_wwan-do-not-resubmit-rx-urb-on-fatal-errors.patch
 usb-serial-option-add-telit-le910c1-eux-compositions.patch
+usb-musb-start-session-in-resume-for-host-port.patch
+usb-musb-fix-runtime-pm-imbalance-on-error.patch

diff --git a/queue-4.14/usb-musb-fix-runtime-pm-imbalance-on-error.patch b/queue-4.14/usb-musb-fix-runtime-pm-imbalance-on-error.patch
new file mode 100644 (file)
index 0000000..467e0d5
--- /dev/null
+++ b/queue-4.14/usb-musb-fix-runtime-pm-imbalance-on-error.patch
@@ -0,0 +1,54 @@
+From e4befc121df03dc8ed2ac1031c98f9538e244bae Mon Sep 17 00:00:00 2001
+From: Dinghao Liu <dinghao.liu@zju.edu.cn>
+Date: Sun, 24 May 2020 21:50:49 -0500
+Subject: usb: musb: Fix runtime PM imbalance on error
+
+From: Dinghao Liu <dinghao.liu@zju.edu.cn>
+
+commit e4befc121df03dc8ed2ac1031c98f9538e244bae upstream.
+
+When copy_from_user() returns an error code, there
+is a runtime PM usage counter imbalance.
+
+Fix this by moving copy_from_user() to the beginning
+of this function.
+
+Fixes: 7b6c1b4c0e1e ("usb: musb: fix runtime PM in debugfs")
+
+Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
+Cc: stable@vger.kernel.org
+Signed-off-by: Bin Liu <b-liu@ti.com>
+Link: https://lore.kernel.org/r/20200525025049.3400-7-b-liu@ti.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/musb/musb_debugfs.c |   10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+--- a/drivers/usb/musb/musb_debugfs.c
++++ b/drivers/usb/musb/musb_debugfs.c
+@@ -206,6 +206,11 @@ static ssize_t musb_test_mode_write(stru
+       u8                      test;
+       char                    buf[24];
+ 
++      memset(buf, 0x00, sizeof(buf));
++
++      if (copy_from_user(buf, ubuf, min_t(size_t, sizeof(buf) - 1, count)))
++              return -EFAULT;
++
+       pm_runtime_get_sync(musb->controller);
+       test = musb_readb(musb->mregs, MUSB_TESTMODE);
+       if (test) {
+@@ -214,11 +219,6 @@ static ssize_t musb_test_mode_write(stru
+               goto ret;
+       }
+ 
+-      memset(buf, 0x00, sizeof(buf));
+-
+-      if (copy_from_user(buf, ubuf, min_t(size_t, sizeof(buf) - 1, count)))
+-              return -EFAULT;
+-
+       if (strstarts(buf, "force host full-speed"))
+               test = MUSB_TEST_FORCE_HOST | MUSB_TEST_FORCE_FS;
+ 

diff --git a/queue-4.14/usb-musb-start-session-in-resume-for-host-port.patch b/queue-4.14/usb-musb-start-session-in-resume-for-host-port.patch
new file mode 100644 (file)
index 0000000..9e9a422
--- /dev/null
+++ b/queue-4.14/usb-musb-start-session-in-resume-for-host-port.patch
@@ -0,0 +1,44 @@
+From 7f88a5ac393f39319f69b8b20cc8d5759878d1a1 Mon Sep 17 00:00:00 2001
+From: Bin Liu <b-liu@ti.com>
+Date: Sun, 24 May 2020 21:50:45 -0500
+Subject: usb: musb: start session in resume for host port
+
+From: Bin Liu <b-liu@ti.com>
+
+commit 7f88a5ac393f39319f69b8b20cc8d5759878d1a1 upstream.
+
+Commit 17539f2f4f0b ("usb: musb: fix enumeration after resume") replaced
+musb_start() in musb_resume() to not override softconnect bit, but it
+doesn't restart the session for host port which was done in musb_start().
+The session could be disabled in musb_suspend(), which leads the host
+port doesn't stay in host mode.
+
+So let's start the session specifically for host port in musb_resume().
+
+Fixes: 17539f2f4f0b ("usb: musb: fix enumeration after resume")
+
+Cc: stable@vger.kernel.org
+Signed-off-by: Bin Liu <b-liu@ti.com>
+Link: https://lore.kernel.org/r/20200525025049.3400-3-b-liu@ti.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/musb/musb_core.c |    7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- a/drivers/usb/musb/musb_core.c
++++ b/drivers/usb/musb/musb_core.c
+@@ -2749,6 +2749,13 @@ static int musb_resume(struct device *de
+       musb_enable_interrupts(musb);
+       musb_platform_enable(musb);
+ 
++      /* session might be disabled in suspend */
++      if (musb->port_mode == MUSB_HOST &&
++          !(musb->ops->quirks & MUSB_PRESERVE_SESSION)) {
++              devctl |= MUSB_DEVCTL_SESSION;
++              musb_writeb(musb->mregs, MUSB_DEVCTL, devctl);
++      }
++
+       spin_lock_irqsave(&musb->lock, flags);
+       error = musb_run_resume_work(musb);
+       if (error)