Commit d0f1c248 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'for-net-next-2021-10-01' of... 

Merge tag 'for-net-next-2021-10-01' 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 MediaTek MT7922 and MT7921
 - Enable support for AOSP extention in Qualcomm WCN399x and Realtek
   8822C/8852A.
 - Add initial support for link quality and audio/codec offload.
 - Rework of sockets sendmsg to avoid locking issues.
 - Add vhci suspend/resume emulation.

====================

Link: https://lore.kernel.org/r/20211001230850.3635543-1-luiz.dentz@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 49ed8dde 4539ca67

drivers/bluetooth/btintel.c

+201 −38
Original line number Diff line number Diff line
@@ -1037,8 +1037,9 @@ static bool btintel_firmware_version(struct hci_dev *hdev, 


			params = (void *)(fw_ptr + sizeof(*cmd));



			bt_dev_info(hdev, "Boot Address: 0x%x",

				    le32_to_cpu(params->boot_addr));

			*boot_addr = le32_to_cpu(params->boot_addr);



			bt_dev_info(hdev, "Boot Address: 0x%x", *boot_addr);



			bt_dev_info(hdev, "Firmware Version: %u-%u.%u",

				    params->fw_build_num, params->fw_build_ww,
@@ -1071,9 +1072,6 @@ int btintel_download_firmware(struct hci_dev *hdev, 
		/* Skip version checking */

		break;

	default:

		/* Skip reading firmware file version in bootloader mode */

		if (ver->fw_variant == 0x06)

			break;



		/* Skip download if firmware has the same version */

		if (btintel_firmware_version(hdev, ver->fw_build_num,
@@ -1114,8 +1112,6 @@ static int btintel_download_fw_tlv(struct hci_dev *hdev, 
	int err;

	u32 css_header_ver;



	/* Skip reading firmware file version in bootloader mode */

	if (ver->img_type != 0x01) {

	/* Skip download if firmware has the same version */

	if (btintel_firmware_version(hdev, ver->min_fw_build_nn,

				     ver->min_fw_build_cw,
@@ -1127,7 +1123,6 @@ static int btintel_download_fw_tlv(struct hci_dev *hdev, 
		 */

		return -EALREADY;

	}

	}



	/* The firmware variant determines if the device is in bootloader

	 * mode or is running operational firmware. The value 0x01 identifies
@@ -1285,12 +1280,16 @@ static int btintel_read_debug_features(struct hci_dev *hdev, 
static int btintel_set_debug_features(struct hci_dev *hdev,

			       const struct intel_debug_features *features)

{

	u8 mask[11] = { 0x0a, 0x92, 0x02, 0x07, 0x00, 0x00, 0x00, 0x00,

	u8 mask[11] = { 0x0a, 0x92, 0x02, 0x7f, 0x00, 0x00, 0x00, 0x00,

			0x00, 0x00, 0x00 };

	u8 period[5] = { 0x04, 0x91, 0x02, 0x05, 0x00 };

	u8 trace_enable = 0x02;

	struct sk_buff *skb;



	if (!features)

	if (!features) {

		bt_dev_warn(hdev, "Debug features not read");

		return -EINVAL;

	}



	if (!(features->page1[0] & 0x3f)) {

		bt_dev_info(hdev, "Telemetry exception format not supported");
@@ -1303,11 +1302,95 @@ static int btintel_set_debug_features(struct hci_dev *hdev, 
			   PTR_ERR(skb));

		return PTR_ERR(skb);

	}

	kfree_skb(skb);



	skb = __hci_cmd_sync(hdev, 0xfc8b, 5, period, HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		bt_dev_err(hdev, "Setting periodicity for link statistics traces failed (%ld)",

			   PTR_ERR(skb));

		return PTR_ERR(skb);

	}

	kfree_skb(skb);



	skb = __hci_cmd_sync(hdev, 0xfca1, 1, &trace_enable, HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		bt_dev_err(hdev, "Enable tracing of link statistics events failed (%ld)",

			   PTR_ERR(skb));

		return PTR_ERR(skb);

	}

	kfree_skb(skb);



	bt_dev_info(hdev, "set debug features: trace_enable 0x%02x mask 0x%02x",

		    trace_enable, mask[3]);



	return 0;

}



static int btintel_reset_debug_features(struct hci_dev *hdev,

				 const struct intel_debug_features *features)

{

	u8 mask[11] = { 0x0a, 0x92, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,

			0x00, 0x00, 0x00 };

	u8 trace_enable = 0x00;

	struct sk_buff *skb;



	if (!features) {

		bt_dev_warn(hdev, "Debug features not read");

		return -EINVAL;

	}



	if (!(features->page1[0] & 0x3f)) {

		bt_dev_info(hdev, "Telemetry exception format not supported");

		return 0;

	}



	/* Should stop the trace before writing ddc event mask. */

	skb = __hci_cmd_sync(hdev, 0xfca1, 1, &trace_enable, HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		bt_dev_err(hdev, "Stop tracing of link statistics events failed (%ld)",

			   PTR_ERR(skb));

		return PTR_ERR(skb);

	}

	kfree_skb(skb);



	skb = __hci_cmd_sync(hdev, 0xfc8b, 11, mask, HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		bt_dev_err(hdev, "Setting Intel telemetry ddc write event mask failed (%ld)",

			   PTR_ERR(skb));

		return PTR_ERR(skb);

	}

	kfree_skb(skb);



	bt_dev_info(hdev, "reset debug features: trace_enable 0x%02x mask 0x%02x",

		    trace_enable, mask[3]);



	return 0;

}



int btintel_set_quality_report(struct hci_dev *hdev, bool enable)

{

	struct intel_debug_features features;

	int err;



	bt_dev_dbg(hdev, "enable %d", enable);



	/* Read the Intel supported features and if new exception formats

	 * supported, need to load the additional DDC config to enable.

	 */

	err = btintel_read_debug_features(hdev, &features);

	if (err)

		return err;



	/* Set or reset the debug features. */

	if (enable)

		err = btintel_set_debug_features(hdev, &features);

	else

		err = btintel_reset_debug_features(hdev, &features);



	return err;

}

EXPORT_SYMBOL_GPL(btintel_set_quality_report);



static const struct firmware *btintel_legacy_rom_get_fw(struct hci_dev *hdev,

					       struct intel_version *ver)

{
@@ -1893,7 +1976,6 @@ static int btintel_bootloader_setup(struct hci_dev *hdev, 
	u32 boot_param;

	char ddcname[64];

	int err;

	struct intel_debug_features features;



	BT_DBG("%s", hdev->name);
@@ -1934,14 +2016,7 @@ static int btintel_bootloader_setup(struct hci_dev *hdev, 
		btintel_load_ddc_config(hdev, ddcname);

	}



	/* Read the Intel supported features and if new exception formats

	 * supported, need to load the additional DDC config to enable.

	 */

	err = btintel_read_debug_features(hdev, &features);

	if (!err) {

		/* Set DDC mask for available debug features */

		btintel_set_debug_features(hdev, &features);

	}

	hci_dev_clear_flag(hdev, HCI_QUALITY_REPORT);



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

	err = btintel_read_version(hdev, &new_ver);
@@ -2083,13 +2158,102 @@ static int btintel_prepare_fw_download_tlv(struct hci_dev *hdev, 
	return err;

}



static int btintel_get_codec_config_data(struct hci_dev *hdev,

					 __u8 link, struct bt_codec *codec,

					 __u8 *ven_len, __u8 **ven_data)

{

	int err = 0;



	if (!ven_data || !ven_len)

		return -EINVAL;



	*ven_len = 0;

	*ven_data = NULL;



	if (link != ESCO_LINK) {

		bt_dev_err(hdev, "Invalid link type(%u)", link);

		return -EINVAL;

	}



	*ven_data = kmalloc(sizeof(__u8), GFP_KERNEL);

	if (!*ven_data) {

		err = -ENOMEM;

		goto error;

	}



	/* supports only CVSD and mSBC offload codecs */

	switch (codec->id) {

	case 0x02:

		**ven_data = 0x00;

		break;

	case 0x05:

		**ven_data = 0x01;

		break;

	default:

		err = -EINVAL;

		bt_dev_err(hdev, "Invalid codec id(%u)", codec->id);

		goto error;

	}

	/* codec and its capabilities are pre-defined to ids

	 * preset id = 0x00 represents CVSD codec with sampling rate 8K

	 * preset id = 0x01 represents mSBC codec with sampling rate 16K

	 */

	*ven_len = sizeof(__u8);

	return err;



error:

	kfree(*ven_data);

	*ven_data = NULL;

	return err;

}



static int btintel_get_data_path_id(struct hci_dev *hdev, __u8 *data_path_id)

{

	/* Intel uses 1 as data path id for all the usecases */

	*data_path_id = 1;

	return 0;

}



static int btintel_configure_offload(struct hci_dev *hdev)

{

	struct sk_buff *skb;

	int err = 0;

	struct intel_offload_use_cases *use_cases;



	skb = __hci_cmd_sync(hdev, 0xfc86, 0, NULL, HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		bt_dev_err(hdev, "Reading offload use cases failed (%ld)",

			   PTR_ERR(skb));

		return PTR_ERR(skb);

	}



	if (skb->len < sizeof(*use_cases)) {

		err = -EIO;

		goto error;

	}



	use_cases = (void *)skb->data;



	if (use_cases->status) {

		err = -bt_to_errno(skb->data[0]);

		goto error;

	}



	if (use_cases->preset[0] & 0x03) {

		hdev->get_data_path_id = btintel_get_data_path_id;

		hdev->get_codec_config_data = btintel_get_codec_config_data;

	}

error:

	kfree_skb(skb);

	return err;

}



static int btintel_bootloader_setup_tlv(struct hci_dev *hdev,

					struct intel_version_tlv *ver)

{

	u32 boot_param;

	char ddcname[64];

	int err;

	struct intel_debug_features features;

	struct intel_version_tlv new_ver;



	bt_dev_dbg(hdev, "");
@@ -2125,14 +2289,10 @@ static int btintel_bootloader_setup_tlv(struct hci_dev *hdev, 
	 */

	btintel_load_ddc_config(hdev, ddcname);



	/* Read the Intel supported features and if new exception formats

	 * supported, need to load the additional DDC config to enable.

	 */

	err = btintel_read_debug_features(hdev, &features);

	if (!err) {

		/* Set DDC mask for available debug features */

		btintel_set_debug_features(hdev, &features);

	}

	/* Read supported use cases and set callbacks to fetch datapath id */

	btintel_configure_offload(hdev);



	hci_dev_clear_flag(hdev, HCI_QUALITY_REPORT);



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

	err = btintel_read_version_tlv(hdev, &new_ver);
@@ -2232,6 +2392,9 @@ static int btintel_setup_combined(struct hci_dev *hdev) 
	set_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &hdev->quirks);

	set_bit(HCI_QUIRK_NON_PERSISTENT_DIAG, &hdev->quirks);



	/* Set up the quality report callback for Intel devices */

	hdev->set_quality_report = btintel_set_quality_report;



	/* For Legacy device, check the HW platform value and size */

	if (skb->len == sizeof(ver) && skb->data[1] == 0x37) {

		bt_dev_dbg(hdev, "Read the legacy Intel version information");

drivers/bluetooth/btintel.h

+11 −0
Original line number Diff line number Diff line
@@ -132,6 +132,11 @@ struct intel_debug_features { 
	__u8    page1[16];

} __packed;



struct intel_offload_use_cases {

	__u8	status;

	__u8	preset[8];

} __packed;



#define INTEL_HW_PLATFORM(cnvx_bt)	((u8)(((cnvx_bt) & 0x0000ff00) >> 8))

#define INTEL_HW_VARIANT(cnvx_bt)	((u8)(((cnvx_bt) & 0x003f0000) >> 16))

#define INTEL_CNVX_TOP_TYPE(cnvx_top)	((cnvx_top) & 0x00000fff)
@@ -204,6 +209,7 @@ int btintel_configure_setup(struct hci_dev *hdev); 
void btintel_bootup(struct hci_dev *hdev, const void *ptr, unsigned int len);

void btintel_secure_send_result(struct hci_dev *hdev,

				const void *ptr, unsigned int len);

int btintel_set_quality_report(struct hci_dev *hdev, bool enable);

#else



static inline int btintel_check_bdaddr(struct hci_dev *hdev)
@@ -294,4 +300,9 @@ static inline void btintel_secure_send_result(struct hci_dev *hdev, 
				const void *ptr, unsigned int len)

{

}



static inline int btintel_set_quality_report(struct hci_dev *hdev, bool enable)

{

	return -ENODEV;

}

#endif

drivers/bluetooth/btmrvl_main.c

+3 −3
Original line number Diff line number Diff line
@@ -587,12 +587,12 @@ static int btmrvl_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr) 
	return 0;

}



static bool btmrvl_prevent_wake(struct hci_dev *hdev)

static bool btmrvl_wakeup(struct hci_dev *hdev)

{

	struct btmrvl_private *priv = hci_get_drvdata(hdev);

	struct btmrvl_sdio_card *card = priv->btmrvl_dev.card;



	return !device_may_wakeup(&card->func->dev);

	return device_may_wakeup(&card->func->dev);

}



/*
@@ -696,7 +696,7 @@ int btmrvl_register_hdev(struct btmrvl_private *priv) 
	hdev->send  = btmrvl_send_frame;

	hdev->setup = btmrvl_setup;

	hdev->set_bdaddr = btmrvl_set_bdaddr;

	hdev->prevent_wake = btmrvl_prevent_wake;

	hdev->wakeup = btmrvl_wakeup;

	SET_HCIDEV_DEV(hdev, &card->func->dev);



	hdev->dev_type = priv->btmrvl_dev.dev_type;

drivers/bluetooth/btmtkuart.c

+8 −5
Original line number Diff line number Diff line
@@ -158,8 +158,10 @@ static int mtk_hci_wmt_sync(struct hci_dev *hdev, 
	int err;



	hlen = sizeof(*hdr) + wmt_params->dlen;

	if (hlen > 255)

		return -EINVAL;

	if (hlen > 255) {

		err = -EINVAL;

		goto err_free_skb;

	}



	hdr = (struct mtk_wmt_hdr *)&wc;

	hdr->dir = 1;
@@ -173,7 +175,7 @@ static int mtk_hci_wmt_sync(struct hci_dev *hdev, 
	err = __hci_cmd_send(hdev, 0xfc6f, hlen, &wc);

	if (err < 0) {

		clear_bit(BTMTKUART_TX_WAIT_VND_EVT, &bdev->tx_state);

		return err;

		goto err_free_skb;

	}



	/* The vendor specific WMT commands are all answered by a vendor
@@ -190,13 +192,14 @@ static int mtk_hci_wmt_sync(struct hci_dev *hdev, 
	if (err == -EINTR) {

		bt_dev_err(hdev, "Execution of wmt command interrupted");

		clear_bit(BTMTKUART_TX_WAIT_VND_EVT, &bdev->tx_state);

		return err;

		goto err_free_skb;

	}



	if (err) {

		bt_dev_err(hdev, "Execution of wmt command timed out");

		clear_bit(BTMTKUART_TX_WAIT_VND_EVT, &bdev->tx_state);

		return -ETIMEDOUT;

		err = -ETIMEDOUT;

		goto err_free_skb;

	}



	/* Parse and handle the return WMT event */

drivers/bluetooth/btrsi.c

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <net/bluetooth/hci_core.h>

#include <asm/unaligned.h>

#include <net/rsi_91x.h>

#include <net/genetlink.h>



#define RSI_DMA_ALIGN	8

#define RSI_FRAME_DESC_SIZE	16