4.9-stable patches

added patches:
	alsa-usb-audio-apply-the-sample-rate-quirk-for-bose-companion-5.patch
	usb-chipidea-host-disable-port-power-only-if-previously-enabled.patch

diff --git a/queue-4.9/alsa-usb-audio-apply-the-sample-rate-quirk-for-bose-companion-5.patch b/queue-4.9/alsa-usb-audio-apply-the-sample-rate-quirk-for-bose-companion-5.patch
new file mode 100644 (file)
index 0000000..8b24229
--- /dev/null
+++ b/queue-4.9/alsa-usb-audio-apply-the-sample-rate-quirk-for-bose-companion-5.patch
@@ -0,0 +1,32 @@
+From 51d4efab7865e6ea6a4ebcd25b3f03c019515c4c Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Sat, 4 Jan 2020 12:09:36 +0100
+Subject: ALSA: usb-audio: Apply the sample rate quirk for Bose Companion 5
+
+From: Takashi Iwai <tiwai@suse.de>
+
+commit 51d4efab7865e6ea6a4ebcd25b3f03c019515c4c upstream.
+
+Bose Companion 5 (with USB ID 05a7:1020) doesn't seem supporting
+reading back the sample rate, so the existing quirk is needed.
+
+BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=206063
+Cc: <stable@vger.kernel.org>
+Link: https://lore.kernel.org/r/20200104110936.14288-1-tiwai@suse.de
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/usb/quirks.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/sound/usb/quirks.c
++++ b/sound/usb/quirks.c
+@@ -1141,6 +1141,7 @@ bool snd_usb_get_sample_rate_quirk(struc
+       case USB_ID(0x04D8, 0xFEEA): /* Benchmark DAC1 Pre */
+       case USB_ID(0x0556, 0x0014): /* Phoenix Audio TMX320VC */
+       case USB_ID(0x05A3, 0x9420): /* ELP HD USB Camera */
++      case USB_ID(0x05a7, 0x1020): /* Bose Companion 5 */
+       case USB_ID(0x074D, 0x3553): /* Outlaw RR2150 (Micronas UAC3553B) */
+       case USB_ID(0x1395, 0x740a): /* Sennheiser DECT */
+       case USB_ID(0x1901, 0x0191): /* GE B850V3 CP2114 audio interface */

diff --git a/queue-4.9/series b/queue-4.9/series
index ed56204cbce98e4d1245207bb4787e606605e6f4..7c1c63fb510bddf723651f304dc1e63a6aa6176f 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -1,2 +1,4 @@
 kobject-export-kobject_get_unless_zero.patch
 chardev-avoid-potential-use-after-free-in-chrdev_open.patch
+usb-chipidea-host-disable-port-power-only-if-previously-enabled.patch
+alsa-usb-audio-apply-the-sample-rate-quirk-for-bose-companion-5.patch

diff --git a/queue-4.9/usb-chipidea-host-disable-port-power-only-if-previously-enabled.patch b/queue-4.9/usb-chipidea-host-disable-port-power-only-if-previously-enabled.patch
new file mode 100644 (file)
index 0000000..e5deca7
--- /dev/null
+++ b/queue-4.9/usb-chipidea-host-disable-port-power-only-if-previously-enabled.patch
@@ -0,0 +1,77 @@
+From c1ffba305dbcf3fb9ca969c20a97acbddc38f8e9 Mon Sep 17 00:00:00 2001
+From: Guenter Roeck <linux@roeck-us.net>
+Date: Thu, 26 Dec 2019 07:57:54 -0800
+Subject: usb: chipidea: host: Disable port power only if previously enabled
+
+From: Guenter Roeck <linux@roeck-us.net>
+
+commit c1ffba305dbcf3fb9ca969c20a97acbddc38f8e9 upstream.
+
+On shutdown, ehci_power_off() is called unconditionally to power off
+each port, even if it was never called to power on the port.
+For chipidea, this results in a call to ehci_ci_portpower() with a request
+to power off ports even if the port was never powered on.
+This results in the following warning from the regulator code.
+
+WARNING: CPU: 0 PID: 182 at drivers/regulator/core.c:2596 _regulator_disable+0x1a8/0x210
+unbalanced disables for usb_otg2_vbus
+Modules linked in:
+CPU: 0 PID: 182 Comm: init Not tainted 5.4.6 #1
+Hardware name: Freescale i.MX7 Dual (Device Tree)
+[<c0313658>] (unwind_backtrace) from [<c030d698>] (show_stack+0x10/0x14)
+[<c030d698>] (show_stack) from [<c1133afc>] (dump_stack+0xe0/0x10c)
+[<c1133afc>] (dump_stack) from [<c0349098>] (__warn+0xf4/0x10c)
+[<c0349098>] (__warn) from [<c0349128>] (warn_slowpath_fmt+0x78/0xbc)
+[<c0349128>] (warn_slowpath_fmt) from [<c09f36ac>] (_regulator_disable+0x1a8/0x210)
+[<c09f36ac>] (_regulator_disable) from [<c09f374c>] (regulator_disable+0x38/0xe8)
+[<c09f374c>] (regulator_disable) from [<c0df7bac>] (ehci_ci_portpower+0x38/0xdc)
+[<c0df7bac>] (ehci_ci_portpower) from [<c0db4fa4>] (ehci_port_power+0x50/0xa4)
+[<c0db4fa4>] (ehci_port_power) from [<c0db5420>] (ehci_silence_controller+0x5c/0xc4)
+[<c0db5420>] (ehci_silence_controller) from [<c0db7644>] (ehci_stop+0x3c/0xcc)
+[<c0db7644>] (ehci_stop) from [<c0d5bdc4>] (usb_remove_hcd+0xe0/0x19c)
+[<c0d5bdc4>] (usb_remove_hcd) from [<c0df7638>] (host_stop+0x38/0xa8)
+[<c0df7638>] (host_stop) from [<c0df2f34>] (ci_hdrc_remove+0x44/0xe4)
+...
+
+Keeping track of the power enable state avoids the warning and traceback.
+
+Fixes: c8679a2fb8dec ("usb: chipidea: host: add portpower override")
+Cc: Michael Grzeschik <m.grzeschik@pengutronix.de>
+Cc: Peter Chen <peter.chen@freescale.com>
+Cc: stable@vger.kernel.org
+Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Acked-by: Peter Chen <peter.chen@nxp.com>
+Link: https://lore.kernel.org/r/20191226155754.25451-1-linux@roeck-us.net
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/chipidea/host.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/drivers/usb/chipidea/host.c
++++ b/drivers/usb/chipidea/host.c
+@@ -37,6 +37,7 @@ static int (*orig_bus_suspend)(struct us
+ 
+ struct ehci_ci_priv {
+       struct regulator *reg_vbus;
++      bool enabled;
+ };
+ 
+ static int ehci_ci_portpower(struct usb_hcd *hcd, int portnum, bool enable)
+@@ -48,7 +49,7 @@ static int ehci_ci_portpower(struct usb_
+       int ret = 0;
+       int port = HCS_N_PORTS(ehci->hcs_params);
+ 
+-      if (priv->reg_vbus) {
++      if (priv->reg_vbus && enable != priv->enabled) {
+               if (port > 1) {
+                       dev_warn(dev,
+                               "Not support multi-port regulator control\n");
+@@ -64,6 +65,7 @@ static int ehci_ci_portpower(struct usb_
+                               enable ? "enable" : "disable", ret);
+                       return ret;
+               }
++              priv->enabled = enable;
+       }
+ 
+       if (enable && (ci->platdata->phy_mode == USBPHY_INTERFACE_MODE_HSIC)) {