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

Merge tag 'for-net-next-2023-10-23' of... 

Merge tag 'for-net-next-2023-10-23' 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 0bda:b85b for Fn-Link RTL8852BE
 - ISO: Many fixes for broadcast support
 - Mark bcm4378/bcm4387 as BROKEN_LE_CODED
 - Add support ITTIM PE50-M75C
 - Add RTW8852BE device 13d3:3570
 - Add support for QCA2066
 - Add support for Intel Misty Peak - 8087:0038

* tag 'for-net-next-2023-10-23' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next:
  Bluetooth: hci_sync: Fix Opcode prints in bt_dev_dbg/err
  Bluetooth: Fix double free in hci_conn_cleanup
  Bluetooth: btmtksdio: enable bluetooth wakeup in system suspend
  Bluetooth: btusb: Add 0bda:b85b for Fn-Link RTL8852BE
  Bluetooth: hci_bcm4377: Mark bcm4378/bcm4387 as BROKEN_LE_CODED
  Bluetooth: ISO: Copy BASE if service data matches EIR_BAA_SERVICE_UUID
  Bluetooth: Make handle of hci_conn be unique
  Bluetooth: btusb: Add date->evt_skb is NULL check
  Bluetooth: ISO: Fix bcast listener cleanup
  Bluetooth: msft: __hci_cmd_sync() doesn't return NULL
  Bluetooth: ISO: Match QoS adv handle with BIG handle
  Bluetooth: ISO: Allow binding a bcast listener to 0 bises
  Bluetooth: btusb: Add RTW8852BE device 13d3:3570 to device tables
  Bluetooth: qca: add support for QCA2066
  Bluetooth: ISO: Set CIS bit only for devices with CIS support
  Bluetooth: Add support for Intel Misty Peak - 8087:0038
  Bluetooth: Add support ITTIM PE50-M75C
  Bluetooth: ISO: Pass BIG encryption info through QoS
  Bluetooth: ISO: Fix BIS cleanup
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 4fb56e3e 53088689

drivers/bluetooth/btmtksdio.c

+38 −6
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ MODULE_DEVICE_TABLE(sdio, btmtksdio_table); 
#define BTMTKSDIO_FUNC_ENABLED		3

#define BTMTKSDIO_PATCH_ENABLED		4

#define BTMTKSDIO_HW_RESET_ACTIVE	5

#define BTMTKSDIO_BT_WAKE_ENABLED	6



struct mtkbtsdio_hdr {

	__le16	len;
@@ -554,7 +555,7 @@ static void btmtksdio_txrx_work(struct work_struct *work) 
	sdio_claim_host(bdev->func);



	/* Disable interrupt */

	sdio_writel(bdev->func, C_INT_EN_CLR, MTK_REG_CHLPCR, 0);

	sdio_writel(bdev->func, C_INT_EN_CLR, MTK_REG_CHLPCR, NULL);



	txrx_timeout = jiffies + 5 * HZ;
@@ -576,7 +577,7 @@ static void btmtksdio_txrx_work(struct work_struct *work) 
		if ((int_status & FW_MAILBOX_INT) &&

		    bdev->data->chipid == 0x7921) {

			sdio_writel(bdev->func, PH2DSM0R_DRIVER_OWN,

				    MTK_REG_PH2DSM0R, 0);

				    MTK_REG_PH2DSM0R, NULL);

		}



		if (int_status & FW_OWN_BACK_INT)
@@ -608,7 +609,7 @@ static void btmtksdio_txrx_work(struct work_struct *work) 
	} while (int_status || time_is_before_jiffies(txrx_timeout));



	/* Enable interrupt */

	sdio_writel(bdev->func, C_INT_EN_SET, MTK_REG_CHLPCR, 0);

	sdio_writel(bdev->func, C_INT_EN_SET, MTK_REG_CHLPCR, NULL);



	sdio_release_host(bdev->func);
@@ -620,8 +621,14 @@ static void btmtksdio_interrupt(struct sdio_func *func) 
{

	struct btmtksdio_dev *bdev = sdio_get_drvdata(func);



	if (test_bit(BTMTKSDIO_BT_WAKE_ENABLED, &bdev->tx_state)) {

		if (bdev->hdev->suspended)

			pm_wakeup_event(bdev->dev, 0);

		clear_bit(BTMTKSDIO_BT_WAKE_ENABLED, &bdev->tx_state);

	}



	/* Disable interrupt */

	sdio_writel(bdev->func, C_INT_EN_CLR, MTK_REG_CHLPCR, 0);

	sdio_writel(bdev->func, C_INT_EN_CLR, MTK_REG_CHLPCR, NULL);



	schedule_work(&bdev->txrx_work);

}
@@ -1454,6 +1461,23 @@ static int btmtksdio_runtime_suspend(struct device *dev) 
	return err;

}



static int btmtksdio_system_suspend(struct device *dev)

{

	struct sdio_func *func = dev_to_sdio_func(dev);

	struct btmtksdio_dev *bdev;



	bdev = sdio_get_drvdata(func);

	if (!bdev)

		return 0;



	if (!test_bit(BTMTKSDIO_FUNC_ENABLED, &bdev->tx_state))

		return 0;



	set_bit(BTMTKSDIO_BT_WAKE_ENABLED, &bdev->tx_state);



	return btmtksdio_runtime_suspend(dev);

}



static int btmtksdio_runtime_resume(struct device *dev)

{

	struct sdio_func *func = dev_to_sdio_func(dev);
@@ -1474,8 +1498,16 @@ static int btmtksdio_runtime_resume(struct device *dev) 
	return err;

}



static UNIVERSAL_DEV_PM_OPS(btmtksdio_pm_ops, btmtksdio_runtime_suspend,

			    btmtksdio_runtime_resume, NULL);

static int btmtksdio_system_resume(struct device *dev)

{

	return btmtksdio_runtime_resume(dev);

}



static const struct dev_pm_ops btmtksdio_pm_ops = {

	SYSTEM_SLEEP_PM_OPS(btmtksdio_system_suspend, btmtksdio_system_resume)

	RUNTIME_PM_OPS(btmtksdio_runtime_suspend, btmtksdio_runtime_resume, NULL)

};



#define BTMTKSDIO_PM_OPS (&btmtksdio_pm_ops)

#else	/* CONFIG_PM */

#define BTMTKSDIO_PM_OPS NULL

drivers/bluetooth/btqca.c

+68 −0
Original line number Diff line number Diff line
@@ -205,6 +205,44 @@ static int qca_send_reset(struct hci_dev *hdev) 
	return 0;

}



static int qca_read_fw_board_id(struct hci_dev *hdev, u16 *bid)

{

	u8 cmd;

	struct sk_buff *skb;

	struct edl_event_hdr *edl;

	int err = 0;



	cmd = EDL_GET_BID_REQ_CMD;

	skb = __hci_cmd_sync_ev(hdev, EDL_PATCH_CMD_OPCODE, EDL_PATCH_CMD_LEN,

				&cmd, 0, HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		err = PTR_ERR(skb);

		bt_dev_err(hdev, "Reading QCA board ID failed (%d)", err);

		return err;

	}



	edl = skb_pull_data(skb, sizeof(*edl));

	if (!edl) {

		bt_dev_err(hdev, "QCA read board ID with no header");

		err = -EILSEQ;

		goto out;

	}



	if (edl->cresp != EDL_CMD_REQ_RES_EVT ||

	    edl->rtype != EDL_GET_BID_REQ_CMD) {

		bt_dev_err(hdev, "QCA Wrong packet: %d %d", edl->cresp, edl->rtype);

		err = -EIO;

		goto out;

	}



	*bid = (edl->data[1] << 8) + edl->data[2];

	bt_dev_dbg(hdev, "%s: bid = %x", __func__, *bid);



out:

	kfree_skb(skb);

	return err;

}



int qca_send_pre_shutdown_cmd(struct hci_dev *hdev)

{

	struct sk_buff *skb;
@@ -574,6 +612,23 @@ int qca_set_bdaddr_rome(struct hci_dev *hdev, const bdaddr_t *bdaddr) 
}

EXPORT_SYMBOL_GPL(qca_set_bdaddr_rome);



static void qca_generate_hsp_nvm_name(char *fwname, size_t max_size,

		struct qca_btsoc_version ver, u8 rom_ver, u16 bid)

{

	const char *variant;



	/* hsp gf chip */

	if ((le32_to_cpu(ver.soc_id) & QCA_HSP_GF_SOC_MASK) == QCA_HSP_GF_SOC_ID)

		variant = "g";

	else

		variant = "";



	if (bid == 0x0)

		snprintf(fwname, max_size, "qca/hpnv%02x%s.bin", rom_ver, variant);

	else

		snprintf(fwname, max_size, "qca/hpnv%02x%s.%x", rom_ver, variant, bid);

}



int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,

		   enum qca_btsoc_type soc_type, struct qca_btsoc_version ver,

		   const char *firmware_name)
@@ -582,6 +637,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, 
	int err;

	u8 rom_ver = 0;

	u32 soc_ver;

	u16 boardid = 0;



	bt_dev_dbg(hdev, "QCA setup on UART");
@@ -615,6 +671,10 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, 
		snprintf(config.fwname, sizeof(config.fwname),

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

		break;

	case QCA_QCA2066:

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

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

		break;

	case QCA_QCA6390:

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

			 "qca/htbtfw%02x.tlv", rom_ver);
@@ -649,6 +709,9 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, 
	/* Give the controller some time to get ready to receive the NVM */

	msleep(10);



	if (soc_type == QCA_QCA2066)

		qca_read_fw_board_id(hdev, &boardid);



	/* Download NVM configuration */

	config.type = TLV_TYPE_NVM;

	if (firmware_name) {
@@ -671,6 +734,10 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, 
			snprintf(config.fwname, sizeof(config.fwname),

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

			break;

		case QCA_QCA2066:

			qca_generate_hsp_nvm_name(config.fwname,

				sizeof(config.fwname), ver, rom_ver, boardid);

			break;

		case QCA_QCA6390:

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

				 "qca/htnv%02x.bin", rom_ver);
@@ -702,6 +769,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, 


	switch (soc_type) {

	case QCA_WCN3991:

	case QCA_QCA2066:

	case QCA_QCA6390:

	case QCA_WCN6750:

	case QCA_WCN6855:

drivers/bluetooth/btqca.h

+4 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#define EDL_PATCH_VER_REQ_CMD		(0x19)

#define EDL_PATCH_TLV_REQ_CMD		(0x1E)

#define EDL_GET_BUILD_INFO_CMD		(0x20)

#define EDL_GET_BID_REQ_CMD			(0x23)

#define EDL_NVM_ACCESS_SET_REQ_CMD	(0x01)

#define EDL_PATCH_CONFIG_CMD		(0x28)

#define MAX_SIZE_PER_TLV_SEGMENT	(243)
@@ -47,7 +48,8 @@ 
	((le32_to_cpu(soc_id) << 16) | (le16_to_cpu(rom_ver)))



#define QCA_FW_BUILD_VER_LEN		255



#define QCA_HSP_GF_SOC_ID			0x1200

#define QCA_HSP_GF_SOC_MASK			0x0000ff00



enum qca_baudrate {

	QCA_BAUDRATE_115200 	= 0,
@@ -146,6 +148,7 @@ enum qca_btsoc_type { 
	QCA_WCN3990,

	QCA_WCN3998,

	QCA_WCN3991,

	QCA_QCA2066,

	QCA_QCA6390,

	QCA_WCN6750,

	QCA_WCN6855,

drivers/bluetooth/btusb.c

+11 −0
Original line number Diff line number Diff line
@@ -477,6 +477,7 @@ static const struct usb_device_id quirks_table[] = { 
	{ USB_DEVICE(0x8087, 0x0033), .driver_info = BTUSB_INTEL_COMBINED },

	{ USB_DEVICE(0x8087, 0x0035), .driver_info = BTUSB_INTEL_COMBINED },

	{ USB_DEVICE(0x8087, 0x0036), .driver_info = BTUSB_INTEL_COMBINED },

	{ USB_DEVICE(0x8087, 0x0038), .driver_info = BTUSB_INTEL_COMBINED },

	{ USB_DEVICE(0x8087, 0x07da), .driver_info = BTUSB_CSR },

	{ USB_DEVICE(0x8087, 0x07dc), .driver_info = BTUSB_INTEL_COMBINED |

						     BTUSB_INTEL_NO_WBS_SUPPORT |
@@ -543,6 +544,10 @@ static const struct usb_device_id quirks_table[] = { 
						     BTUSB_WIDEBAND_SPEECH },

	{ USB_DEVICE(0x0bda, 0x887b), .driver_info = BTUSB_REALTEK |

						     BTUSB_WIDEBAND_SPEECH },

	{ USB_DEVICE(0x0bda, 0xb85b), .driver_info = BTUSB_REALTEK |

						     BTUSB_WIDEBAND_SPEECH },

	{ USB_DEVICE(0x13d3, 0x3570), .driver_info = BTUSB_REALTEK |

						     BTUSB_WIDEBAND_SPEECH },

	{ USB_DEVICE(0x13d3, 0x3571), .driver_info = BTUSB_REALTEK |

						     BTUSB_WIDEBAND_SPEECH },
@@ -644,6 +649,9 @@ static const struct usb_device_id quirks_table[] = { 
	{ USB_DEVICE(0x04ca, 0x3804), .driver_info = BTUSB_MEDIATEK |

						     BTUSB_WIDEBAND_SPEECH |

						     BTUSB_VALID_LE_STATES },

	{ USB_DEVICE(0x35f5, 0x7922), .driver_info = BTUSB_MEDIATEK |

						     BTUSB_WIDEBAND_SPEECH |

						     BTUSB_VALID_LE_STATES },



	/* Additional Realtek 8723AE Bluetooth devices */

	{ USB_DEVICE(0x0930, 0x021d), .driver_info = BTUSB_REALTEK },
@@ -2818,6 +2826,9 @@ static int btusb_mtk_hci_wmt_sync(struct hci_dev *hdev, 
		goto err_free_wc;

	}



	if (data->evt_skb == NULL)

		goto err_free_wc;



	/* Parse and handle the return WMT event */

	wmt_evt = (struct btmtk_hci_wmt_evt *)data->evt_skb->data;

	if (wmt_evt->whdr.op != hdr->op) {

drivers/bluetooth/hci_bcm4377.c

+5 −0
Original line number Diff line number Diff line
@@ -512,6 +512,7 @@ struct bcm4377_hw { 
	unsigned long disable_aspm : 1;

	unsigned long broken_ext_scan : 1;

	unsigned long broken_mws_transport_config : 1;

	unsigned long broken_le_coded : 1;



	int (*send_calibration)(struct bcm4377_data *bcm4377);

	int (*send_ptb)(struct bcm4377_data *bcm4377,
@@ -2372,6 +2373,8 @@ static int bcm4377_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
		set_bit(HCI_QUIRK_BROKEN_MWS_TRANSPORT_CONFIG, &hdev->quirks);

	if (bcm4377->hw->broken_ext_scan)

		set_bit(HCI_QUIRK_BROKEN_EXT_SCAN, &hdev->quirks);

	if (bcm4377->hw->broken_le_coded)

		set_bit(HCI_QUIRK_BROKEN_LE_CODED, &hdev->quirks);



	pci_set_drvdata(pdev, bcm4377);

	hci_set_drvdata(hdev, bcm4377);
@@ -2461,6 +2464,7 @@ static const struct bcm4377_hw bcm4377_hw_variants[] = { 
		.bar0_core2_window2 = 0x18107000,

		.has_bar0_core2_window2 = true,

		.broken_mws_transport_config = true,

		.broken_le_coded = true,

		.send_calibration = bcm4378_send_calibration,

		.send_ptb = bcm4378_send_ptb,

	},
@@ -2474,6 +2478,7 @@ static const struct bcm4377_hw bcm4377_hw_variants[] = { 
		.has_bar0_core2_window2 = true,

		.clear_pciecfg_subsystem_ctrl_bit19 = true,

		.broken_mws_transport_config = true,

		.broken_le_coded = true,

		.send_calibration = bcm4387_send_calibration,

		.send_ptb = bcm4378_send_ptb,

	},