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

Merge branch 'for-upstream' of... 

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next



Johan Hedberg says:

====================
pull request: bluetooth-next 2020-04-17

Here's the first bluetooth-next pull request for the 5.8 kernel:

 - Added debugfs option to control MITM flag usage during pairing
 - Added new BT_MODE socket option
 - Added support for Qualcom QCA6390 device
 - Added support for Realtek RTL8761B device
 - Added support for mSBC audio codec over USB endpoints
 - Added framework for Microsoft HCI vendor extensions
 - Added new Read Security Information management command
 - Fixes/cleanup to link layer privacy related code
 - Various other smaller cleanups & fixes
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2fcd8014 7edc9079

Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ Required properties: 
   * "qcom,wcn3990-bt"

   * "qcom,wcn3991-bt"

   * "qcom,wcn3998-bt"

   * "qcom,qca6390-bt"



Optional properties for compatible string qcom,qca6174-bt:

drivers/bluetooth/btqca.c

+13 −5
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ int qca_read_soc_version(struct hci_dev *hdev, u32 *soc_version, 
	 * VSE event. WCN3991 sends version command response as a payload to

	 * command complete event.

	 */

	if (soc_type == QCA_WCN3991) {

	if (soc_type >= QCA_WCN3991) {

		event_type = 0;

		rlen += 1;

		rtype = EDL_PATCH_VER_REQ_CMD;
@@ -69,7 +69,7 @@ int qca_read_soc_version(struct hci_dev *hdev, u32 *soc_version, 
		goto out;

	}



	if (soc_type == QCA_WCN3991)

	if (soc_type >= QCA_WCN3991)

		memmove(&edl->data, &edl->data[1], sizeof(*ver));



	ver = (struct qca_btsoc_version *)(edl->data);
@@ -217,7 +217,7 @@ static void qca_tlv_check_data(struct qca_fw_config *config, 
				tlv_nvm->data[0] |= 0x80;



				/* UART Baud Rate */

				if (soc_type == QCA_WCN3991)

				if (soc_type >= QCA_WCN3991)

					tlv_nvm->data[1] = nvm_baud_rate;

				else

					tlv_nvm->data[2] = nvm_baud_rate;
@@ -268,7 +268,7 @@ static int qca_tlv_send_segment(struct hci_dev *hdev, int seg_size, 
	 * VSE event. WCN3991 sends version command response as a payload to

	 * command complete event.

	 */

	if (soc_type == QCA_WCN3991) {

	if (soc_type >= QCA_WCN3991) {

		event_type = 0;

		rlen = sizeof(*edl);

		rtype = EDL_PATCH_TLV_REQ_CMD;
@@ -301,7 +301,7 @@ static int qca_tlv_send_segment(struct hci_dev *hdev, int seg_size, 
		err = -EIO;

	}



	if (soc_type == QCA_WCN3991)

	if (soc_type >= QCA_WCN3991)

		goto out;



	tlv_resp = (struct tlv_seg_resp *)(edl->data);
@@ -442,6 +442,11 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, 
			    (soc_ver & 0x0000000f);

		snprintf(config.fwname, sizeof(config.fwname),

			 "qca/crbtfw%02x.tlv", rom_ver);

	} else if (soc_type == QCA_QCA6390) {

		rom_ver = ((soc_ver & 0x00000f00) >> 0x04) |

			    (soc_ver & 0x0000000f);

		snprintf(config.fwname, sizeof(config.fwname),

			 "qca/htbtfw%02x.tlv", rom_ver);

	} else {

		snprintf(config.fwname, sizeof(config.fwname),

			 "qca/rampatch_%08x.bin", soc_ver);
@@ -464,6 +469,9 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, 
	else if (qca_is_wcn399x(soc_type))

		snprintf(config.fwname, sizeof(config.fwname),

			 "qca/crnv%02x.bin", rom_ver);

	else if (soc_type == QCA_QCA6390)

		snprintf(config.fwname, sizeof(config.fwname),

			 "qca/htnv%02x.bin", rom_ver);

	else

		snprintf(config.fwname, sizeof(config.fwname),

			 "qca/nvm_%08x.bin", soc_ver);

drivers/bluetooth/btqca.h

+2 −1
Original line number Diff line number Diff line
@@ -125,8 +125,9 @@ enum qca_btsoc_type { 
	QCA_AR3002,

	QCA_ROME,

	QCA_WCN3990,

	QCA_WCN3991,

	QCA_WCN3998,

	QCA_WCN3991,

	QCA_QCA6390,

};



#if IS_ENABLED(CONFIG_BT_QCA)

drivers/bluetooth/btrtl.c

+9 −1
Original line number Diff line number Diff line
@@ -130,12 +130,19 @@ static const struct id_table ic_id_table[] = { 
	  .cfg_name = "rtl_bt/rtl8821c_config" },



	/* 8761A */

	{ IC_MATCH_FL_LMPSUBV, RTL_ROM_LMP_8761A, 0x0,

	{ IC_INFO(RTL_ROM_LMP_8761A, 0xa),

	  .config_needed = false,

	  .has_rom_version = true,

	  .fw_name  = "rtl_bt/rtl8761a_fw.bin",

	  .cfg_name = "rtl_bt/rtl8761a_config" },



	/* 8761B */

	{ IC_INFO(RTL_ROM_LMP_8761A, 0xb),

	  .config_needed = false,

	  .has_rom_version = true,

	  .fw_name  = "rtl_bt/rtl8761b_fw.bin",

	  .cfg_name = "rtl_bt/rtl8761b_config" },



	/* 8822C with UART interface */

	{ .match_flags = IC_MATCH_FL_LMPSUBV | IC_MATCH_FL_HCIREV |

			 IC_MATCH_FL_HCIBUS,
@@ -267,6 +274,7 @@ static int rtlbt_parse_firmware(struct hci_dev *hdev, 
		{ RTL_ROM_LMP_8723B, 9 },	/* 8723D */

		{ RTL_ROM_LMP_8821A, 10 },	/* 8821C */

		{ RTL_ROM_LMP_8822B, 13 },	/* 8822C */

		{ RTL_ROM_LMP_8761A, 14 },	/* 8761B */

	};



	min_size = sizeof(struct rtl_epatch_header) + sizeof(extension_sig) + 3;

drivers/bluetooth/btusb.c

+140 −45
Original line number Diff line number Diff line
@@ -492,6 +492,8 @@ struct btusb_data { 
	__u8 cmdreq;



	unsigned int sco_num;

	unsigned int air_mode;

	bool usb_alt6_packet_flow;

	int isoc_altsetting;

	int suspend_count;
@@ -983,6 +985,42 @@ static void btusb_isoc_complete(struct urb *urb) 
	}

}



static inline void __fill_isoc_descriptor_msbc(struct urb *urb, int len,

					       int mtu, struct btusb_data *data)

{

	int i, offset = 0;

	unsigned int interval;



	BT_DBG("len %d mtu %d", len, mtu);



	/* For mSBC ALT 6 setting the host will send the packet at continuous

	 * flow. As per core spec 5, vol 4, part B, table 2.1. For ALT setting

	 * 6 the HCI PACKET INTERVAL should be 7.5ms for every usb packets.

	 * To maintain the rate we send 63bytes of usb packets alternatively for

	 * 7ms and 8ms to maintain the rate as 7.5ms.

	 */

	if (data->usb_alt6_packet_flow) {

		interval = 7;

		data->usb_alt6_packet_flow = false;

	} else {

		interval = 6;

		data->usb_alt6_packet_flow = true;

	}



	for (i = 0; i < interval; i++) {

		urb->iso_frame_desc[i].offset = offset;

		urb->iso_frame_desc[i].length = offset;

	}



	if (len && i < BTUSB_MAX_ISOC_FRAMES) {

		urb->iso_frame_desc[i].offset = offset;

		urb->iso_frame_desc[i].length = len;

		i++;

	}



	urb->number_of_packets = i;

}



static inline void __fill_isoc_descriptor(struct urb *urb, int len, int mtu)

{

	int i, offset = 0;
@@ -1386,9 +1424,13 @@ static struct urb *alloc_isoc_urb(struct hci_dev *hdev, struct sk_buff *skb) 


	urb->transfer_flags  = URB_ISO_ASAP;



	if (data->isoc_altsetting == 6)

		__fill_isoc_descriptor_msbc(urb, skb->len,

					    le16_to_cpu(data->isoc_tx_ep->wMaxPacketSize),

					    data);

	else

		__fill_isoc_descriptor(urb, skb->len,

				       le16_to_cpu(data->isoc_tx_ep->wMaxPacketSize));



	skb->dev = (void *)hdev;



	return urb;
@@ -1484,6 +1526,7 @@ static void btusb_notify(struct hci_dev *hdev, unsigned int evt) 


	if (hci_conn_num(hdev, SCO_LINK) != data->sco_num) {

		data->sco_num = hci_conn_num(hdev, SCO_LINK);

		data->air_mode = evt;

		schedule_work(&data->work);

	}

}
@@ -1531,33 +1574,11 @@ static inline int __set_isoc_interface(struct hci_dev *hdev, int altsetting) 
	return 0;

}



static void btusb_work(struct work_struct *work)

static int btusb_switch_alt_setting(struct hci_dev *hdev, int new_alts)

{

	struct btusb_data *data = container_of(work, struct btusb_data, work);

	struct hci_dev *hdev = data->hdev;

	int new_alts;

	struct btusb_data *data = hci_get_drvdata(hdev);

	int err;



	if (data->sco_num > 0) {

		if (!test_bit(BTUSB_DID_ISO_RESUME, &data->flags)) {

			err = usb_autopm_get_interface(data->isoc ? data->isoc : data->intf);

			if (err < 0) {

				clear_bit(BTUSB_ISOC_RUNNING, &data->flags);

				usb_kill_anchored_urbs(&data->isoc_anchor);

				return;

			}



			set_bit(BTUSB_DID_ISO_RESUME, &data->flags);

		}



		if (hdev->voice_setting & 0x0020) {

			static const int alts[3] = { 2, 4, 5 };



			new_alts = alts[data->sco_num - 1];

		} else {

			new_alts = data->sco_num;

		}



	if (data->isoc_altsetting != new_alts) {

		unsigned long flags;
@@ -1578,8 +1599,9 @@ static void btusb_work(struct work_struct *work) 
		data->sco_skb = NULL;

		spin_unlock_irqrestore(&data->rxlock, flags);



			if (__set_isoc_interface(hdev, new_alts) < 0)

				return;

		err = __set_isoc_interface(hdev, new_alts);

		if (err < 0)

			return err;

	}



	if (!test_and_set_bit(BTUSB_ISOC_RUNNING, &data->flags)) {
@@ -1588,6 +1610,69 @@ static void btusb_work(struct work_struct *work) 
		else

			btusb_submit_isoc_urb(hdev, GFP_KERNEL);

	}



	return 0;

}



static struct usb_host_interface *btusb_find_altsetting(struct btusb_data *data,

							int alt)

{

	struct usb_interface *intf = data->isoc;

	int i;



	BT_DBG("Looking for Alt no :%d", alt);



	if (!intf)

		return NULL;



	for (i = 0; i < intf->num_altsetting; i++) {

		if (intf->altsetting[i].desc.bAlternateSetting == alt)

			return &intf->altsetting[i];

	}



	return NULL;

}



static void btusb_work(struct work_struct *work)

{

	struct btusb_data *data = container_of(work, struct btusb_data, work);

	struct hci_dev *hdev = data->hdev;

	int new_alts = 0;

	int err;



	if (data->sco_num > 0) {

		if (!test_bit(BTUSB_DID_ISO_RESUME, &data->flags)) {

			err = usb_autopm_get_interface(data->isoc ? data->isoc : data->intf);

			if (err < 0) {

				clear_bit(BTUSB_ISOC_RUNNING, &data->flags);

				usb_kill_anchored_urbs(&data->isoc_anchor);

				return;

			}



			set_bit(BTUSB_DID_ISO_RESUME, &data->flags);

		}



		if (data->air_mode == HCI_NOTIFY_ENABLE_SCO_CVSD) {

			if (hdev->voice_setting & 0x0020) {

				static const int alts[3] = { 2, 4, 5 };



				new_alts = alts[data->sco_num - 1];

			} else {

				new_alts = data->sco_num;

			}

		} else if (data->air_mode == HCI_NOTIFY_ENABLE_SCO_TRANSP) {



			data->usb_alt6_packet_flow = true;



			/* Check if Alt 6 is supported for Transparent audio */

			if (btusb_find_altsetting(data, 6))

				new_alts = 6;

			else

				bt_dev_err(hdev, "Device does not support ALT setting 6");

		}



		if (btusb_switch_alt_setting(hdev, new_alts) < 0)

			bt_dev_err(hdev, "set USB alt:(%d) failed!", new_alts);

	} else {

		clear_bit(BTUSB_ISOC_RUNNING, &data->flags);

		usb_kill_anchored_urbs(&data->isoc_anchor);
@@ -2252,7 +2337,7 @@ static int btusb_setup_intel_new(struct hci_dev *hdev) 
	if (ver.fw_variant == 0x23) {

		clear_bit(BTUSB_BOOTLOADER, &data->flags);

		btintel_check_bdaddr(hdev);

		return 0;

		goto finish;

	}



	/* If the device is not in bootloader mode, then the only possible
@@ -2452,6 +2537,23 @@ done: 
	 */

	btintel_load_ddc_config(hdev, fwname);



	/* Read the Intel version information after loading the FW  */

	err = btintel_read_version(hdev, &ver);

	if (err)

		return err;



	btintel_version_info(hdev, &ver);



finish:

	/* All Intel controllers that support the Microsoft vendor

	 * extension are using 0xFC1E for VsMsftOpCode.

	 */

	switch (ver.hw_variant) {

	case 0x12:	/* ThP */

		hci_set_msft_opcode(hdev, 0xFC1E);

		break;

	}



	/* Set the event mask for Intel specific vendor events. This enables

	 * a few extra events that are useful during general operation. It

	 * does not enable any debugging related events.
@@ -2461,13 +2563,6 @@ done: 
	 */

	btintel_set_event_mask(hdev, false);



	/* Read the Intel version information after loading the FW  */

	err = btintel_read_version(hdev, &ver);

	if (err)

		return err;



	btintel_version_info(hdev, &ver);



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE