Commit 29a3060a authored by David S. Miller's avatar David S. Miller
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 2015-07-30

Here's a set of Bluetooth & 802.15.4 patches intended for the 4.3 kernel.

 - Cleanups & fixes to mac802154
 - Refactoring of Intel Bluetooth HCI driver
 - Various coding style fixes to Bluetooth HCI drivers
 - Support for Intel Lightning Peak Bluetooth devices
 - Generic class code in interface descriptor in btusb to match more HW
 - Refactoring of Bluetooth HS code together with a new config option
 - Support for BCM4330B1 Broadcom UART controller

Let me know if there are any issues pulling. Thanks.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8013d1d7 5857d1db

drivers/bluetooth/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ config BT_HCIUART_3WIRE 
config BT_HCIUART_INTEL

	bool "Intel protocol support"

	depends on BT_HCIUART

	select BT_HCIUART_H4

	select BT_INTEL

	help

	  The Intel protocol support enables Bluetooth HCI over serial

drivers/bluetooth/bfusb.c

+1 −1
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ static int bfusb_send_frame(struct hci_dev *hdev, struct sk_buff *skb) 
	case HCI_SCODATA_PKT:

		hdev->stat.sco_tx++;

		break;

	};

	}



	/* Prepend skb with frame type */

	memcpy(skb_push(skb, 1), &bt_cb(skb)->pkt_type, 1);

drivers/bluetooth/bt3c_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -427,7 +427,7 @@ static int bt3c_hci_send_frame(struct hci_dev *hdev, struct sk_buff *skb) 
	case HCI_SCODATA_PKT:

		hdev->stat.sco_tx++;

		break;

	};

	}



	/* Prepend skb with frame type */

	memcpy(skb_push(skb, 1), &bt_cb(skb)->pkt_type, 1);

drivers/bluetooth/btbcm.c

+7 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 


#define BDADDR_BCM20702A0 (&(bdaddr_t) {{0x00, 0xa0, 0x02, 0x70, 0x20, 0x00}})

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

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



int btbcm_check_bdaddr(struct hci_dev *hdev)

{
@@ -66,9 +67,13 @@ int btbcm_check_bdaddr(struct hci_dev *hdev) 
	 *

	 * The address 43:24:B3:00:00:00 indicates a BCM4324B3 controller

	 * with waiting for configuration state.

	 *

	 * The address 43:30:B1:00:00:00 indicates a BCM4330B1 controller

	 * with waiting for configuration state.

	 */

	if (!bacmp(&bda->bdaddr, BDADDR_BCM20702A0) ||

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

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

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

		BT_INFO("%s: BCM: Using default device address (%pMR)",

			hdev->name, &bda->bdaddr);

		set_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks);
@@ -241,6 +246,7 @@ static const struct { 
	u16 subver;

	const char *name;

} bcm_uart_subver_table[] = {

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

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

	{ 0x4406, "BCM4324B3"	},	/* 002.004.006 */

	{ 0x610c, "BCM4354"	},	/* 003.001.012 */

drivers/bluetooth/btintel.c

+80 −0
Original line number Diff line number Diff line
@@ -89,6 +89,86 @@ int btintel_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr) 
}

EXPORT_SYMBOL_GPL(btintel_set_bdaddr);



void btintel_hw_error(struct hci_dev *hdev, u8 code)

{

	struct sk_buff *skb;

	u8 type = 0x00;



	BT_ERR("%s: Hardware error 0x%2.2x", hdev->name, code);



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

	if (IS_ERR(skb)) {

		BT_ERR("%s: Reset after hardware error failed (%ld)",

		       hdev->name, PTR_ERR(skb));

		return;

	}

	kfree_skb(skb);



	skb = __hci_cmd_sync(hdev, 0xfc22, 1, &type, HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		BT_ERR("%s: Retrieving Intel exception info failed (%ld)",

		       hdev->name, PTR_ERR(skb));

		return;

	}



	if (skb->len != 13) {

		BT_ERR("%s: Exception info size mismatch", hdev->name);

		kfree_skb(skb);

		return;

	}



	BT_ERR("%s: Exception info %s", hdev->name, (char *)(skb->data + 1));



	kfree_skb(skb);

}

EXPORT_SYMBOL_GPL(btintel_hw_error);



void btintel_version_info(struct hci_dev *hdev, struct intel_version *ver)

{

	const char *variant;



	switch (ver->fw_variant) {

	case 0x06:

		variant = "Bootloader";

		break;

	case 0x23:

		variant = "Firmware";

		break;

	default:

		return;

	}



	BT_INFO("%s: %s revision %u.%u build %u week %u %u", hdev->name,

		variant, ver->fw_revision >> 4, ver->fw_revision & 0x0f,

		ver->fw_build_num, ver->fw_build_ww, 2000 + ver->fw_build_yy);

}

EXPORT_SYMBOL_GPL(btintel_version_info);



int btintel_secure_send(struct hci_dev *hdev, u8 fragment_type, u32 plen,

			const void *param)

{

	while (plen > 0) {

		struct sk_buff *skb;

		u8 cmd_param[253], fragment_len = (plen > 252) ? 252 : plen;



		cmd_param[0] = fragment_type;

		memcpy(cmd_param + 1, param, fragment_len);



		skb = __hci_cmd_sync(hdev, 0xfc09, fragment_len + 1,

				     cmd_param, HCI_INIT_TIMEOUT);

		if (IS_ERR(skb))

			return PTR_ERR(skb);



		kfree_skb(skb);



		plen -= fragment_len;

		param += fragment_len;

	}



	return 0;

}

EXPORT_SYMBOL_GPL(btintel_secure_send);



MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");

MODULE_DESCRIPTION("Bluetooth support for Intel devices ver " VERSION);

MODULE_VERSION(VERSION);

CRA Git | Maintained and supported by SUSTech CRA and CCSE