Commit 9f3248c9 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'for-net-next-2022-01-07' of... 

Merge tag 'for-net-next-2022-01-07' 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 Foxconn QCA 0xe0d0
 - Fix HCI init sequence on MacBook Air 8,1 and 8,2
 - Fix Intel firmware loading on legacy ROM devices

* tag 'for-net-next-2022-01-07' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next:
  Bluetooth: hci_sock: fix endian bug in hci_sock_setsockopt()
  Bluetooth: L2CAP: uninitialized variables in l2cap_sock_setsockopt()
  Bluetooth: btqca: sequential validation
  Bluetooth: btusb: Add support for Foxconn QCA 0xe0d0
  Bluetooth: btintel: Fix broken LED quirk for legacy ROM devices
  Bluetooth: hci_event: Rework hci_inquiry_result_with_rssi_evt
  Bluetooth: btbcm: disable read tx power for MacBook Air 8,1 and 8,2
  Bluetooth: hci_qca: Fix NULL vs IS_ERR_OR_NULL check in qca_serdev_probe
  Bluetooth: hci_bcm: Check for error irq
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents d5c8725c b9f9dbad

drivers/bluetooth/btbcm.c

+12 −0
Original line number Diff line number Diff line
@@ -363,6 +363,18 @@ static const struct dmi_system_id disable_broken_read_transmit_power[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro16,4"),

		},

	},

	{

		 .matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "Apple Inc."),

			DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir8,1"),

		},

	},

	{

		 .matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "Apple Inc."),

			DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir8,2"),

		},

	},

	{

		 .matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "Apple Inc."),

drivers/bluetooth/btintel.c

+11 −9
Original line number Diff line number Diff line
@@ -2355,8 +2355,15 @@ static int btintel_setup_combined(struct hci_dev *hdev) 
	 * As a workaround, send HCI Reset command first which will reset the

	 * number of completed commands and allow normal command processing

	 * from now on.

	 */

	if (btintel_test_flag(hdev, INTEL_BROKEN_INITIAL_NCMD)) {

	 *

	 * Regarding the INTEL_BROKEN_SHUTDOWN_LED flag, these devices maybe

	 * in the SW_RFKILL ON state as a workaround of fixing LED issue during

	 * the shutdown() procedure, and once the device is in SW_RFKILL ON

	 * state, the only way to exit out of it is sending the HCI_Reset

	 * command.

	 */

	if (btintel_test_flag(hdev, INTEL_BROKEN_INITIAL_NCMD) ||

	    btintel_test_flag(hdev, INTEL_BROKEN_SHUTDOWN_LED)) {

		skb = __hci_cmd_sync(hdev, HCI_OP_RESET, 0, NULL,

				     HCI_INIT_TIMEOUT);

		if (IS_ERR(skb)) {
@@ -2428,12 +2435,6 @@ static int btintel_setup_combined(struct hci_dev *hdev) 
				set_bit(HCI_QUIRK_WIDEBAND_SPEECH_SUPPORTED,

					&hdev->quirks);



			/* These devices have an issue with LED which doesn't

			 * go off immediately during shutdown. Set the flag

			 * here to send the LED OFF command during shutdown.

			 */

			btintel_set_flag(hdev, INTEL_BROKEN_LED);



			err = btintel_legacy_rom_setup(hdev, &ver);

			break;

		case 0x0b:      /* SfP */
@@ -2586,9 +2587,10 @@ static int btintel_shutdown_combined(struct hci_dev *hdev) 


	/* Some platforms have an issue with BT LED when the interface is

	 * down or BT radio is turned off, which takes 5 seconds to BT LED

	 * goes off. This command turns off the BT LED immediately.

	 * goes off. As a workaround, sends HCI_Intel_SW_RFKILL to put the

	 * device in the RFKILL ON state which turns off the BT LED immediately.

	 */

	if (btintel_test_flag(hdev, INTEL_BROKEN_LED)) {

	if (btintel_test_flag(hdev, INTEL_BROKEN_SHUTDOWN_LED)) {

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

		if (IS_ERR(skb)) {

			ret = PTR_ERR(skb);

drivers/bluetooth/btintel.h

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ enum { 
	INTEL_FIRMWARE_FAILED,

	INTEL_BOOTING,

	INTEL_BROKEN_INITIAL_NCMD,

	INTEL_BROKEN_LED,

	INTEL_BROKEN_SHUTDOWN_LED,

	INTEL_ROM_LEGACY,



	__INTEL_NUM_FLAGS,

drivers/bluetooth/btqca.c

+47 −0
Original line number Diff line number Diff line
@@ -142,6 +142,50 @@ static int qca_read_fw_build_info(struct hci_dev *hdev) 
	return err;

}



static int qca_send_patch_config_cmd(struct hci_dev *hdev)

{

	const u8 cmd[] = { EDL_PATCH_CONFIG_CMD, 0x01, 0, 0, 0 };

	struct sk_buff *skb;

	struct edl_event_hdr *edl;

	int err;



	bt_dev_dbg(hdev, "QCA Patch config");



	skb = __hci_cmd_sync_ev(hdev, EDL_PATCH_CMD_OPCODE, sizeof(cmd),

				cmd, HCI_EV_VENDOR, HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		err = PTR_ERR(skb);

		bt_dev_err(hdev, "Sending QCA Patch config failed (%d)", err);

		return err;

	}



	if (skb->len != 2) {

		bt_dev_err(hdev, "QCA Patch config cmd size mismatch len %d", skb->len);

		err = -EILSEQ;

		goto out;

	}



	edl = (struct edl_event_hdr *)(skb->data);

	if (!edl) {

		bt_dev_err(hdev, "QCA Patch config with no header");

		err = -EILSEQ;

		goto out;

	}



	if (edl->cresp != EDL_PATCH_CONFIG_RES_EVT || edl->rtype != EDL_PATCH_CONFIG_CMD) {

		bt_dev_err(hdev, "QCA Wrong packet received %d %d", edl->cresp,

			   edl->rtype);

		err = -EIO;

		goto out;

	}



	err = 0;



out:

	kfree_skb(skb);

	return err;

}



static int qca_send_reset(struct hci_dev *hdev)

{

	struct sk_buff *skb;
@@ -552,6 +596,9 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, 
	 */

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



	if (soc_type == QCA_WCN6750)

		qca_send_patch_config_cmd(hdev);



	/* Download rampatch file */

	config.type = TLV_TYPE_PATCH;

	if (qca_is_wcn399x(soc_type)) {

drivers/bluetooth/btqca.h

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#define EDL_PATCH_TLV_REQ_CMD		(0x1E)

#define EDL_GET_BUILD_INFO_CMD		(0x20)

#define EDL_NVM_ACCESS_SET_REQ_CMD	(0x01)

#define EDL_PATCH_CONFIG_CMD		(0x28)

#define MAX_SIZE_PER_TLV_SEGMENT	(243)

#define QCA_PRE_SHUTDOWN_CMD		(0xFC08)

#define QCA_DISABLE_LOGGING		(0xFC17)
@@ -24,6 +25,7 @@ 
#define EDL_CMD_EXE_STATUS_EVT		(0x00)

#define EDL_SET_BAUDRATE_RSP_EVT	(0x92)

#define EDL_NVM_ACCESS_CODE_EVT		(0x0B)

#define EDL_PATCH_CONFIG_RES_EVT	(0x00)

#define QCA_DISABLE_LOGGING_SUB_OP	(0x14)



#define EDL_TAG_ID_HCI			(17)