[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20171220110008.11856-1-kai.heng.feng@canonical.com>
Date: Wed, 20 Dec 2017 19:00:07 +0800
From: Kai-Heng Feng <kai.heng.feng@...onical.com>
To: gregkh@...uxfoundation.org, marcel@...tmann.org
Cc: linux-usb@...r.kernel.org, linux-bluetooth@...r.kernel.org,
linux-kernel@...r.kernel.org,
Kai-Heng Feng <kai.heng.feng@...onical.com>,
stable@...r.kernel.org, Leif Liddy <leif.linux@...il.com>,
Matthias Kaehlcke <mka@...omium.org>,
Brian Norris <briannorris@...omium.org>,
Daniel Drake <drake@...lessm.com>
Subject: [PATCH 1/2] Revert "Bluetooth: btusb: fix QCA Rome suspend/resume"
This reverts commit fd865802c66bc451dc515ed89360f84376ce1a56.
This commit causes a regression on some QCA ROME chips. The USB device
reset happens in btusb_open(), hence firmware loading gets interrupted.
Furthermore, this commit stops working after commit
("a0085f2510e8976614ad8f766b209448b385492f Bluetooth: btusb: driver to
enable the usb-wakeup feature"). Reset-resume quirk only gets enabled in
btusb_suspend() when it's not a wakeup source.
If we really want to reset the USB device, we need to do it before
btusb_open(). Let's handle it in drivers/usb/core/quirks.c.
Cc: stable@...r.kernel.org
Cc: Leif Liddy <leif.linux@...il.com>
Cc: Matthias Kaehlcke <mka@...omium.org>
Cc: Brian Norris <briannorris@...omium.org>
Cc: Daniel Drake <drake@...lessm.com>
Signed-off-by: Kai-Heng Feng <kai.heng.feng@...onical.com>
---
Daniel, Cc you because this also affects your original quirk patch for
Realtek btusb.
drivers/bluetooth/btusb.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index f7120c9eb9bd..da353c4acdc7 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -3117,12 +3117,6 @@ 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
--
2.14.1
Powered by blists - more mailing lists