Commit 4a934eca authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

Merge tag 'for-net-next-2022-07-22' 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 IM Networks PID 0x3568
 - Add support for BCM4349B1
 - Add support for CYW55572
 - Add support for MT7922 VID/PID 0489/e0e2
 - Add support for Realtek RTL8852C
 - Initial support for Isochronous Channels/ISO sockets
 - Remove HCI_QUIRK_BROKEN_ERR_DATA_REPORTING quirk

* tag 'for-net-next-2022-07-22' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next: (58 commits)
  Bluetooth: btusb: Detect if an ACL packet is in fact an ISO packet
  Bluetooth: btusb: Add support for ISO packets
  Bluetooth: ISO: Add broadcast support
  Bluetooth: Add initial implementation of BIS connections
  Bluetooth: Add BTPROTO_ISO socket type
  Bluetooth: Add initial implementation of CIS connections
  Bluetooth: hci_core: Introduce hci_recv_event_data
  Bluetooth: Convert delayed discov_off to hci_sync
  Bluetooth: Remove update_scan hci_request dependancy
  Bluetooth: Remove dead code from hci_request.c
  Bluetooth: btrtl: Fix typo in comment
  Bluetooth: MGMT: Fix holding hci_conn reference while command is queued
  Bluetooth: mgmt: Fix using hci_conn_abort
  Bluetooth: Use bt_status to convert from errno
  Bluetooth: Add bt_status
  Bluetooth: hci_sync: Split hci_dev_open_sync
  Bluetooth: hci_sync: Refactor remove Adv Monitor
  Bluetooth: hci_sync: Refactor add Adv Monitor
  Bluetooth: hci_sync: Remove HCI_QUIRK_BROKEN_ERR_DATA_REPORTING
  Bluetooth: btusb: Remove HCI_QUIRK_BROKEN_ERR_DATA_REPORTING for fake CSR
  ...
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents b3fce974 14202eff

Documentation/devicetree/bindings/net/broadcom-bluetooth.yaml

+25 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ properties: 
      - brcm,bcm4345c5

      - brcm,bcm43540-bt

      - brcm,bcm4335a0

      - brcm,bcm4349-bt

      - infineon,cyw55572-bt



  shutdown-gpios:

    maxItems: 1
@@ -92,6 +94,13 @@ properties: 
       pcm-sync-mode: slave, master

       pcm-clock-mode: slave, master



  brcm,requires-autobaud-mode:

    type: boolean

    description:

      Set this property if autobaud mode is required. Autobaud mode is required

      if the device's initial baud rate in normal mode is not supported by the

      host or if the device requires autobaud mode startup before loading FW.



  interrupts:

    items:

      - description: Handle to the line HOST_WAKE used to wake
@@ -108,6 +117,22 @@ properties: 
required:

  - compatible



dependencies:

  brcm,requires-autobaud-mode: [ 'shutdown-gpios' ]



if:

  not:

    properties:

      compatible:

        contains:

          enum:

            - brcm,bcm20702a1

            - brcm,bcm4329-bt

            - brcm,bcm4330-bt

then:

  properties:

    reset-gpios: false



additionalProperties: false



examples:

drivers/bluetooth/btbcm.c

+25 −8
Original line number Diff line number Diff line
@@ -403,6 +403,13 @@ static int btbcm_read_info(struct hci_dev *hdev) 
	bt_dev_info(hdev, "BCM: chip id %u", skb->data[1]);

	kfree_skb(skb);



	return 0;

}



static int btbcm_print_controller_features(struct hci_dev *hdev)

{

	struct sk_buff *skb;



	/* Read Controller Features */

	skb = btbcm_read_controller_features(hdev);

	if (IS_ERR(skb))
@@ -454,6 +461,8 @@ static const struct bcm_subver_table bcm_uart_subver_table[] = { 
	{ 0x6606, "BCM4345C5"	},	/* 003.006.006 */

	{ 0x230f, "BCM4356A2"	},	/* 001.003.015 */

	{ 0x220e, "BCM20702A1"  },	/* 001.002.014 */

	{ 0x420d, "BCM4349B1"	},	/* 002.002.013 */

	{ 0x420e, "BCM4349B1"	},	/* 002.002.014 */

	{ 0x4217, "BCM4329B1"   },	/* 002.002.023 */

	{ 0x6106, "BCM4359C0"	},	/* 003.001.006 */

	{ 0x4106, "BCM4335A0"	},	/* 002.001.006 */
@@ -514,7 +523,7 @@ static const char *btbcm_get_board_name(struct device *dev) 
#endif

}



int btbcm_initialize(struct hci_dev *hdev, bool *fw_load_done)

int btbcm_initialize(struct hci_dev *hdev, bool *fw_load_done, bool use_autobaud_mode)

{

	u16 subver, rev, pid, vid;

	struct sk_buff *skb;
@@ -551,9 +560,16 @@ int btbcm_initialize(struct hci_dev *hdev, bool *fw_load_done) 
		if (err)

			return err;

	}



	if (!use_autobaud_mode) {

		err = btbcm_print_controller_features(hdev);

		if (err)

			return err;



		err = btbcm_print_local_name(hdev);

		if (err)

			return err;

	}



	bcm_subver_table = (hdev->bus == HCI_USB) ? bcm_usb_subver_table :

						    bcm_uart_subver_table;
@@ -636,13 +652,13 @@ int btbcm_initialize(struct hci_dev *hdev, bool *fw_load_done) 
}

EXPORT_SYMBOL_GPL(btbcm_initialize);



int btbcm_finalize(struct hci_dev *hdev, bool *fw_load_done)

int btbcm_finalize(struct hci_dev *hdev, bool *fw_load_done, bool use_autobaud_mode)

{

	int err;



	/* Re-initialize if necessary */

	if (*fw_load_done) {

		err = btbcm_initialize(hdev, fw_load_done);

		err = btbcm_initialize(hdev, fw_load_done, use_autobaud_mode);

		if (err)

			return err;

	}
@@ -658,15 +674,16 @@ EXPORT_SYMBOL_GPL(btbcm_finalize); 
int btbcm_setup_patchram(struct hci_dev *hdev)

{

	bool fw_load_done = false;

	bool use_autobaud_mode = false;

	int err;



	/* Initialize */

	err = btbcm_initialize(hdev, &fw_load_done);

	err = btbcm_initialize(hdev, &fw_load_done, use_autobaud_mode);

	if (err)

		return err;



	/* Re-initialize after loading Patch */

	return btbcm_finalize(hdev, &fw_load_done);

	return btbcm_finalize(hdev, &fw_load_done, use_autobaud_mode);

}

EXPORT_SYMBOL_GPL(btbcm_setup_patchram);

drivers/bluetooth/btbcm.h

+4 −4
Original line number Diff line number Diff line
@@ -62,8 +62,8 @@ int btbcm_write_pcm_int_params(struct hci_dev *hdev, 
int btbcm_setup_patchram(struct hci_dev *hdev);

int btbcm_setup_apple(struct hci_dev *hdev);



int btbcm_initialize(struct hci_dev *hdev, bool *fw_load_done);

int btbcm_finalize(struct hci_dev *hdev, bool *fw_load_done);

int btbcm_initialize(struct hci_dev *hdev, bool *fw_load_done, bool use_autobaud_mode);

int btbcm_finalize(struct hci_dev *hdev, bool *fw_load_done, bool use_autobaud_mode);



#else
@@ -104,12 +104,12 @@ static inline int btbcm_setup_apple(struct hci_dev *hdev) 
	return 0;

}



static inline int btbcm_initialize(struct hci_dev *hdev, bool *fw_load_done)

static inline int btbcm_initialize(struct hci_dev *hdev, bool *fw_load_done, bool use_autobaud_mode)

{

	return 0;

}



static inline int btbcm_finalize(struct hci_dev *hdev, bool *fw_load_done)

static inline int btbcm_finalize(struct hci_dev *hdev, bool *fw_load_done, bool use_autobaud_mode)

{

	return 0;

}

drivers/bluetooth/btmtksdio.c

+15 −0
Original line number Diff line number Diff line
@@ -1282,6 +1282,13 @@ static void btmtksdio_cmd_timeout(struct hci_dev *hdev) 
	hci_reset_dev(hdev);

}



static bool btmtksdio_sdio_inband_wakeup(struct hci_dev *hdev)

{

	struct btmtksdio_dev *bdev = hci_get_drvdata(hdev);



	return device_may_wakeup(bdev->dev);

}



static bool btmtksdio_sdio_wakeup(struct hci_dev *hdev)

{

	struct btmtksdio_dev *bdev = hci_get_drvdata(hdev);
@@ -1349,6 +1356,14 @@ static int btmtksdio_probe(struct sdio_func *func, 
	hdev->shutdown = btmtksdio_shutdown;

	hdev->send     = btmtksdio_send_frame;

	hdev->wakeup   = btmtksdio_sdio_wakeup;

	/*

	 * If SDIO controller supports wake on Bluetooth, sending a wakeon

	 * command is not necessary.

	 */

	if (device_can_wakeup(func->card->host->parent))

		hdev->wakeup = btmtksdio_sdio_inband_wakeup;

	else

		hdev->wakeup = btmtksdio_sdio_wakeup;

	hdev->set_bdaddr = btmtk_set_bdaddr;



	SET_HCIDEV_DEV(hdev, &func->dev);

drivers/bluetooth/btrtl.c

+1 −1
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ static int rtlbt_parse_firmware(struct hci_dev *hdev, 
	/* Loop from the end of the firmware parsing instructions, until

	 * we find an instruction that identifies the "project ID" for the

	 * hardware supported by this firwmare file.

	 * Once we have that, we double-check that that project_id is suitable

	 * Once we have that, we double-check that project_id is suitable

	 * for the hardware we are working with.

	 */

	while (fwptr >= btrtl_dev->fw_data + (sizeof(*epatch_info) + 3)) {