Commit 5f04ed74 authored by Jakub Kicinski's avatar Jakub Kicinski
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 2019-11-24

Here's one last bluetooth-next pull request for the 5.5 kernel:

 - Fix BDADDR_PROPERTY & INVALID_BDADDR quirk handling
 - Added support for BCM4334B0 and BCM4335A0 controllers
 - A few other smaller fixes related to locking and memory leaks
====================

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
parents dc83ef22 a4f95f31

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

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ Required properties: 
   * "brcm,bcm43438-bt"

   * "brcm,bcm4345c5"

   * "brcm,bcm43540-bt"

   * "brcm,bcm4335a0"



Optional properties:

drivers/bluetooth/btbcm.c

+10 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#define BDADDR_BCM43430A0 (&(bdaddr_t) {{0xac, 0x1f, 0x12, 0xa0, 0x43, 0x43}})

#define BDADDR_BCM4324B3 (&(bdaddr_t) {{0x00, 0x00, 0x00, 0xb3, 0x24, 0x43}})

#define BDADDR_BCM4330B1 (&(bdaddr_t) {{0x00, 0x00, 0x00, 0xb1, 0x30, 0x43}})

#define BDADDR_BCM4334B0 (&(bdaddr_t) {{0x00, 0x00, 0x00, 0xb0, 0x34, 0x43}})

#define BDADDR_BCM4345C5 (&(bdaddr_t) {{0xac, 0x1f, 0x00, 0xc5, 0x45, 0x43}})

#define BDADDR_BCM43341B (&(bdaddr_t) {{0xac, 0x1f, 0x00, 0x1b, 0x34, 0x43}})
@@ -74,6 +75,7 @@ int btbcm_check_bdaddr(struct hci_dev *hdev) 
	    !bacmp(&bda->bdaddr, BDADDR_BCM2076B1) ||

	    !bacmp(&bda->bdaddr, BDADDR_BCM4324B3) ||

	    !bacmp(&bda->bdaddr, BDADDR_BCM4330B1) ||

	    !bacmp(&bda->bdaddr, BDADDR_BCM4334B0) ||

	    !bacmp(&bda->bdaddr, BDADDR_BCM4345C5) ||

	    !bacmp(&bda->bdaddr, BDADDR_BCM43430A0) ||

	    !bacmp(&bda->bdaddr, BDADDR_BCM43341B)) {
@@ -326,6 +328,7 @@ struct bcm_subver_table { 


static const struct bcm_subver_table bcm_uart_subver_table[] = {

	{ 0x4103, "BCM4330B1"	},	/* 002.001.003 */

	{ 0x410d, "BCM4334B0"	},	/* 002.001.013 */

	{ 0x410e, "BCM43341B0"	},	/* 002.001.014 */

	{ 0x4204, "BCM2076B1"	},	/* 002.002.004 */

	{ 0x4406, "BCM4324B3"	},	/* 002.004.006 */
@@ -339,6 +342,7 @@ static const struct bcm_subver_table bcm_uart_subver_table[] = { 
	{ 0x220e, "BCM20702A1"  },	/* 001.002.014 */

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

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

	{ 0x4106, "BCM4335A0"	},	/* 002.001.006 */

	{ }

};
@@ -440,6 +444,12 @@ int btbcm_finalize(struct hci_dev *hdev) 


	set_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks);



	/* Some devices ship with the controller default address.

	 * Allow the bootloader to set a valid address through the

	 * device tree.

	 */

	set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks);



	return 0;

}

EXPORT_SYMBOL_GPL(btbcm_finalize);

drivers/bluetooth/btusb.c

+2 −1
Original line number Diff line number Diff line
@@ -1200,7 +1200,7 @@ static int btusb_open(struct hci_dev *hdev) 
	if (data->setup_on_usb) {

		err = data->setup_on_usb(hdev);

		if (err < 0)

			return err;

			goto setup_fail;

	}



	data->intf->needs_remote_wakeup = 1;
@@ -1239,6 +1239,7 @@ done: 


failed:

	clear_bit(BTUSB_INTR_RUNNING, &data->flags);

setup_fail:

	usb_autopm_put_interface(data->intf);

	return err;

}

drivers/bluetooth/hci_bcm.c

+1 −0
Original line number Diff line number Diff line
@@ -1425,6 +1425,7 @@ static const struct of_device_id bcm_bluetooth_of_match[] = { 
	{ .compatible = "brcm,bcm4330-bt" },

	{ .compatible = "brcm,bcm43438-bt" },

	{ .compatible = "brcm,bcm43540-bt" },

	{ .compatible = "brcm,bcm4335a0" },

	{ },

};

MODULE_DEVICE_TABLE(of, bcm_bluetooth_of_match);

net/bluetooth/hci_conn.c

+3 −1
Original line number Diff line number Diff line
@@ -1176,8 +1176,10 @@ struct hci_conn *hci_connect_le_scan(struct hci_dev *hdev, bdaddr_t *dst, 
	if (!conn)

		return ERR_PTR(-ENOMEM);



	if (hci_explicit_conn_params_set(hdev, dst, dst_type) < 0)

	if (hci_explicit_conn_params_set(hdev, dst, dst_type) < 0) {

		hci_conn_del(conn);

		return ERR_PTR(-EBUSY);

	}



	conn->state = BT_CONNECT;

	set_bit(HCI_CONN_SCANNING, &conn->flags);

CRA Git | Maintained and supported by SUSTech CRA and CCSE