Commit 61f5acea authored Jan 08, 2018 by Hans de Goede Committed by Marcel Holtmann Jan 08, 2018

Bluetooth: btusb: Restore QCA Rome suspend/resume fix with a "rewritten" version

Commit 7d06d589 ("Revert "Bluetooth: btusb: fix QCA...suspend/resume"")
removed the setting of the BTUSB_RESET_RESUME quirk for QCA Rome devices,
instead favoring adding USB_QUIRK_RESET_RESUME quirks in usb/core/quirks.c.

This was done because the DIY BTUSB_RESET_RESUME reset-resume handling
has several issues (see the original commit message). An added advantage
of moving over to the USB-core reset-resume handling is that it also
disables autosuspend for these devices, which is similarly broken on these.

But there are 2 issues with this approach:
1) It leaves the broken DIY BTUSB_RESET_RESUME code in place for Realtek
   devices.
2) Sofar only 2 of the 10 QCA devices known to the btusb code have been
   added to usb/core/quirks.c and if we fix the Realtek case the same way
   we need to add an additional 14 entries. So in essence we need to
   duplicate a large part of the usb_device_id table in btusb.c in
   usb/core/quirks.c and manually keep them in sync.

This commit instead restores setting a reset-resume quirk for QCA devices
in the btusb.c code, avoiding the duplicate usb_device_id table problem.

This commit avoids the problems with the original DIY BTUSB_RESET_RESUME
code by simply setting the USB_QUIRK_RESET_RESUME quirk directly on the
usb_device.

This commit also moves the BTUSB_REALTEK case over to directly setting the
USB_QUIRK_RESET_RESUME on the usb_device and removes the now unused
BTUSB_RESET_RESUME code.

BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1514836


Fixes: 7d06d589 ("Revert "Bluetooth: btusb: fix QCA...suspend/resume"")
Cc: stable@vger.kernel.org
Cc: Leif Liddy <leif.linux@gmail.com>
Cc: Matthias Kaehlcke <mka@chromium.org>
Cc: Brian Norris <briannorris@chromium.org>
Cc: Daniel Drake <drake@endlessm.com>
Cc: Kai-Heng Feng <kai.heng.feng@canonical.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

parent 948c7ca0

drivers/bluetooth/btusb.c

+10 −12

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@

		#include <linux/module.h>
		#include <linux/usb.h>
		#include <linux/usb/quirks.h>
		#include <linux/firmware.h>
		#include <linux/of_device.h>
		#include <linux/of_irq.h>
		@@ -390,9 +391,8 @@ static const struct usb_device_id blacklist_table[] = {
		#define BTUSB_FIRMWARE_LOADED 7
		#define BTUSB_FIRMWARE_FAILED 8
		#define BTUSB_BOOTING 9
		#define BTUSB_RESET_RESUME 10
		#define BTUSB_DIAG_RUNNING 11
		#define BTUSB_OOB_WAKE_ENABLED 12
		#define BTUSB_DIAG_RUNNING 10
		#define BTUSB_OOB_WAKE_ENABLED 11

		struct btusb_data {
		struct hci_dev *hdev;
		@@ -3120,6 +3120,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.
		*/
		interface_to_usbdev(intf)->quirks \|= USB_QUIRK_RESET_RESUME;
		}

		#ifdef CONFIG_BT_HCIBTUSB_RTL
		@@ -3130,7 +3136,7 @@ static int btusb_probe(struct usb_interface *intf,
		* but the USB hub doesn't notice any status change.
		* Explicitly request a device reset on resume.
		*/
		set_bit(BTUSB_RESET_RESUME, &data->flags);
		interface_to_usbdev(intf)->quirks \|= USB_QUIRK_RESET_RESUME;
		}
		#endif

		@@ -3299,14 +3305,6 @@ static int btusb_suspend(struct usb_interface *intf, pm_message_t message)
		enable_irq(data->oob_wake_irq);
		}

		/* Optionally request a device reset on resume, but only when
		* wakeups are disabled. If wakeups are enabled we assume the
		* device will stay powered up throughout suspend.
		*/
		if (test_bit(BTUSB_RESET_RESUME, &data->flags) &&
		!device_may_wakeup(&data->udev->dev))
		data->udev->reset_resume = 1;

		return 0;
		}

Admin message