[linux-oem,1/1] Bluetooth: btusb: fix QCA Rome suspend/resume

Message ID 20171123042431.11696-2-kai.heng.feng@canonical.com
State New
Headers show
Series
  • [linux-oem,1/1] Bluetooth: btusb: fix QCA Rome suspend/resume
Related show

Commit Message

Kai-Heng Feng Nov. 23, 2017, 4:24 a.m.
From: Leif Liddy <leif.linux@gmail.com>

BugLink: https://bugs.launchpad.net/bugs/1734020

There's been numerous reported instances where BTUSB_QCA_ROME
bluetooth controllers stop functioning upon resume from suspend. These
devices seem to be losing power during suspend. Patch will detect a status
change on resume and perform a reset.

Signed-off-by: Leif Liddy <leif.linux@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
(cherry picked from commit fd865802c66bc451dc515ed89360f84376ce1a56)
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
---
 drivers/bluetooth/btusb.c | 6 ++++++
 1 file changed, 6 insertions(+)

Patch

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index e331e212f5fc..99c97f65149e 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -3068,6 +3068,12 @@  static int btusb_probe(struct usb_interface *intf,
 	if (id->driver_info & BTUSB_QCA_ROME) {
 		data->setup_on_usb = btusb_setup_qca;
 		hdev->set_bdaddr = btusb_set_bdaddr_ath3012;
+
+		/* QCA Rome devices lose their updated firmware over suspend,
+		 * but the USB hub doesn't notice any status change.
+		 * Explicitly request a device reset on resume.
+		 */
+		set_bit(BTUSB_RESET_RESUME, &data->flags);
 	}
 
 #ifdef CONFIG_BT_HCIBTUSB_RTL