Commit b32563b6 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'for-net-next-2021-11-16' of... 

Merge tag 'for-net-next-2021-11-16' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next



Luiz Augusto von Dentz says:

====================
bluetooth-next pull request for net-next:

 - Add support for AOSP Bluetooth Quality Report
 - Enables AOSP extension for Mediatek Chip (MT7921 & MT7922)
 - Rework of HCI command execution serialization
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 65483559 28491d7e

drivers/bluetooth/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -19,6 +19,10 @@ config BT_QCA 
	tristate

	select FW_LOADER



config BT_MTK

	tristate

	select FW_LOADER



config BT_HCIBTUSB

	tristate "HCI USB driver"

	depends on USB
@@ -55,6 +59,7 @@ config BT_HCIBTUSB_BCM 
config BT_HCIBTUSB_MTK

	bool "MediaTek protocol support"

	depends on BT_HCIBTUSB

	select BT_MTK

	default n

	help

	  The MediaTek protocol support enables firmware download
@@ -383,6 +388,7 @@ config BT_ATH3K 
config BT_MTKSDIO

	tristate "MediaTek HCI SDIO driver"

	depends on MMC

	select BT_MTK

	help

	  MediaTek Bluetooth HCI SDIO driver.

	  This driver is required if you want to use MediaTek Bluetooth

drivers/bluetooth/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ obj-$(CONFIG_BT_QCOMSMD) += btqcomsmd.o 
obj-$(CONFIG_BT_BCM)		+= btbcm.o

obj-$(CONFIG_BT_RTL)		+= btrtl.o

obj-$(CONFIG_BT_QCA)		+= btqca.o

obj-$(CONFIG_BT_MTK)		+= btmtk.o



obj-$(CONFIG_BT_VIRTIO)		+= virtio_bt.o

drivers/bluetooth/bfusb.c

+3 −0
Original line number Diff line number Diff line
@@ -628,6 +628,9 @@ static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i 
	data->bulk_out_ep   = bulk_out_ep->desc.bEndpointAddress;

	data->bulk_pkt_size = le16_to_cpu(bulk_out_ep->desc.wMaxPacketSize);



	if (!data->bulk_pkt_size)

		goto done;



	rwlock_init(&data->lock);



	data->reassembly = NULL;

drivers/bluetooth/btintel.c

+14 −8
Original line number Diff line number Diff line
@@ -2081,15 +2081,17 @@ static int btintel_prepare_fw_download_tlv(struct hci_dev *hdev, 
	if (ver->img_type == 0x03) {

		btintel_clear_flag(hdev, INTEL_BOOTLOADER);

		btintel_check_bdaddr(hdev);

	}



	/* If the OTP has no valid Bluetooth device address, then there will

	 * also be no valid address for the operational firmware.

	} else {

		/*

		 * Check for valid bd address in boot loader mode. Device

		 * will be marked as unconfigured if empty bd address is

		 * found.

		 */

		if (!bacmp(&ver->otp_bd_addr, BDADDR_ANY)) {

			bt_dev_info(hdev, "No device address configured");

			set_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks);

		}

	}



	btintel_get_fw_name_tlv(ver, fwname, sizeof(fwname), "sfi");

	err = firmware_request_nowarn(&fw, fwname, &hdev->dev);
@@ -2466,6 +2468,10 @@ static int btintel_setup_combined(struct hci_dev *hdev) 
		goto exit_error;

	}



	/* memset ver_tlv to start with clean state as few fields are exclusive

	 * to bootloader mode and are not populated in operational mode

	 */

	memset(&ver_tlv, 0, sizeof(ver_tlv));

	/* For TLV type device, parse the tlv data */

	err = btintel_parse_version_tlv(hdev, &ver_tlv, skb);

	if (err) {

drivers/bluetooth/btmrvl_main.c

+1 −1
Original line number Diff line number Diff line 
/**

/*

 * Marvell Bluetooth driver

 *

 * Copyright (C) 2009, Marvell International Ltd.