[v2,2/3] Bluetooth: btusb: Load firmware exclusively for Intel BT
diff mbox series

Message ID 20190717074920.21624-2-kai.heng.feng@canonical.com
State Not Applicable
Delegated to: Johannes Berg
Headers show
  • [v2,1/3] Bluetooth: btintel: Add firmware lock function
Related show

Commit Message

Kai-Heng Feng July 17, 2019, 7:49 a.m. UTC
To avoid the firmware loading race between Bluetooth and WiFi on Intel
8260, load firmware exclusively when IWLWIFI is enabled.

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

Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
 - Add bug report link.
 - Rebase on latest wireless-next.

 drivers/bluetooth/btusb.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff mbox series

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 50aed5259c2b..ca7a5757a2ba 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -2272,8 +2272,16 @@  static int btusb_setup_intel_new(struct hci_dev *hdev)
 	set_bit(BTUSB_DOWNLOADING, &data->flags);
+	btintel_firmware_lock();
 	/* Start firmware downloading and get boot parameter */
 	err = btintel_download_firmware(hdev, fw, &boot_param);
+	btintel_firmware_unlock();
 	if (err < 0)
 		goto done;