Commit a72c9512 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-10-22

Here's probably the last bluetooth-next pull request for 4.4. Among
several other changes it contains the rest of the fixes & cleanups from
the Bluetooth UnplugFest (that didn't need to be hurried to 4.3).

 - Refactoring & cleanups to 6lowpan code
 - New USB ids for two Atheros controllers and BCM43142A0 from Broadcom
 - Fix (quirk) for broken Broadcom BCM2045 controllers
 - Support for latest Apple controllers
 - Improvements to the vendor diagnostic message support

Please let me know if there are any issues pulling. Thanks.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 379a80a1 13972adc

drivers/bluetooth/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ config BT_HCIBCM203X 


config BT_HCIBPA10X

	tristate "HCI BPA10x USB driver"

	depends on USB

	depends on USB && BT_HCIUART

	select BT_HCIUART_H4

	help

	  Bluetooth HCI BPA10x USB driver.

drivers/bluetooth/ath3k.c

+4 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ static const struct usb_device_id ath3k_table[] = { 
	{ USB_DEVICE(0x04CA, 0x300f) },

	{ USB_DEVICE(0x04CA, 0x3010) },

	{ USB_DEVICE(0x0930, 0x0219) },

	{ USB_DEVICE(0x0930, 0x021c) },

	{ USB_DEVICE(0x0930, 0x0220) },

	{ USB_DEVICE(0x0930, 0x0227) },

	{ USB_DEVICE(0x0b05, 0x17d0) },
@@ -104,6 +105,7 @@ static const struct usb_device_id ath3k_table[] = { 
	{ USB_DEVICE(0x0CF3, 0x311F) },

	{ USB_DEVICE(0x0cf3, 0x3121) },

	{ USB_DEVICE(0x0CF3, 0x817a) },

	{ USB_DEVICE(0x0CF3, 0x817b) },

	{ USB_DEVICE(0x0cf3, 0xe003) },

	{ USB_DEVICE(0x0CF3, 0xE004) },

	{ USB_DEVICE(0x0CF3, 0xE005) },
@@ -153,6 +155,7 @@ static const struct usb_device_id ath3k_blist_tbl[] = { 
	{ USB_DEVICE(0x04ca, 0x300f), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3010), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0930, 0x021c), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0930, 0x0227), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0b05, 0x17d0), .driver_info = BTUSB_ATH3012 },
@@ -164,6 +167,7 @@ static const struct usb_device_id ath3k_blist_tbl[] = { 
	{ USB_DEVICE(0x0cf3, 0x311F), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x3121), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0CF3, 0x817a), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0CF3, 0x817b), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0xe005), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0xe006), .driver_info = BTUSB_ATH3012 },

drivers/bluetooth/btbcm.c

+13 −4
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ int btbcm_initialize(struct hci_dev *hdev, char *fw_name, size_t len) 
	}



	BT_INFO("%s: %s (%3.3u.%3.3u.%3.3u) build %4.4u", hdev->name,

		hw_name ? : "BCM", (subver & 0x7000) >> 13,

		hw_name ? : "BCM", (subver & 0xe000) >> 13,

		(subver & 0x1f00) >> 8, (subver & 0x00ff), rev & 0x0fff);



	return 0;
@@ -353,7 +353,7 @@ int btbcm_finalize(struct hci_dev *hdev) 
	kfree_skb(skb);



	BT_INFO("%s: BCM (%3.3u.%3.3u.%3.3u) build %4.4u", hdev->name,

		(subver & 0x7000) >> 13, (subver & 0x1f00) >> 8,

		(subver & 0xe000) >> 13, (subver & 0x1f00) >> 8,

		(subver & 0x00ff), rev & 0x0fff);



	btbcm_check_bdaddr(hdev);
@@ -461,7 +461,7 @@ int btbcm_setup_patchram(struct hci_dev *hdev) 
	}



	BT_INFO("%s: %s (%3.3u.%3.3u.%3.3u) build %4.4u", hdev->name,

		hw_name ? : "BCM", (subver & 0x7000) >> 13,

		hw_name ? : "BCM", (subver & 0xe000) >> 13,

		(subver & 0x1f00) >> 8, (subver & 0x00ff), rev & 0x0fff);



	err = request_firmware(&fw, fw_name, &hdev->dev);
@@ -490,7 +490,7 @@ int btbcm_setup_patchram(struct hci_dev *hdev) 
	kfree_skb(skb);



	BT_INFO("%s: %s (%3.3u.%3.3u.%3.3u) build %4.4u", hdev->name,

		hw_name ? : "BCM", (subver & 0x7000) >> 13,

		hw_name ? : "BCM", (subver & 0xe000) >> 13,

		(subver & 0x1f00) >> 8, (subver & 0x00ff), rev & 0x0fff);



	/* Read Local Name */
@@ -527,6 +527,15 @@ int btbcm_setup_apple(struct hci_dev *hdev) 
		kfree_skb(skb);

	}



	/* Read USB Product Info */

	skb = btbcm_read_usb_product(hdev);

	if (!IS_ERR(skb)) {

		BT_INFO("%s: BCM: product %4.4x:%4.4x", hdev->name,

			get_unaligned_le16(skb->data + 1),

			get_unaligned_le16(skb->data + 3));

		kfree_skb(skb);

	}



	/* Read Local Name */

	skb = btbcm_read_local_name(hdev);

	if (!IS_ERR(skb)) {

drivers/bluetooth/btintel.c

+127 −0
Original line number Diff line number Diff line
@@ -91,6 +91,75 @@ int btintel_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr) 
}

EXPORT_SYMBOL_GPL(btintel_set_bdaddr);



int btintel_set_diag(struct hci_dev *hdev, bool enable)

{

	struct sk_buff *skb;

	u8 param[3];

	int err;



	if (enable) {

		param[0] = 0x03;

		param[1] = 0x03;

		param[2] = 0x03;

	} else {

		param[0] = 0x00;

		param[1] = 0x00;

		param[2] = 0x00;

	}



	skb = __hci_cmd_sync(hdev, 0xfc43, 3, param, HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		err = PTR_ERR(skb);

		if (err == -ENODATA)

			goto done;

		BT_ERR("%s: Changing Intel diagnostic mode failed (%d)",

		       hdev->name, err);

		return err;

	}

	kfree_skb(skb);



done:

	btintel_set_event_mask(hdev, enable);

	return 0;

}

EXPORT_SYMBOL_GPL(btintel_set_diag);



int btintel_set_diag_mfg(struct hci_dev *hdev, bool enable)

{

	struct sk_buff *skb;

	u8 param[2];

	int err;



	param[0] = 0x01;

	param[1] = 0x00;



	skb = __hci_cmd_sync(hdev, 0xfc11, 2, param, HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		err = PTR_ERR(skb);

		BT_ERR("%s: Entering Intel manufacturer mode failed (%d)",

		       hdev->name, err);

		return PTR_ERR(skb);

	}

	kfree_skb(skb);



	err = btintel_set_diag(hdev, enable);



	param[0] = 0x00;

	param[1] = 0x00;



	skb = __hci_cmd_sync(hdev, 0xfc11, 2, param, HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		err = PTR_ERR(skb);

		BT_ERR("%s: Leaving Intel manufacturer mode failed (%d)",

		       hdev->name, err);

		return PTR_ERR(skb);

	}

	kfree_skb(skb);



	return err;

}

EXPORT_SYMBOL_GPL(btintel_set_diag_mfg);



void btintel_hw_error(struct hci_dev *hdev, u8 code)

{

	struct sk_buff *skb;
@@ -216,6 +285,64 @@ int btintel_load_ddc_config(struct hci_dev *hdev, const char *ddc_name) 
}

EXPORT_SYMBOL_GPL(btintel_load_ddc_config);



int btintel_set_event_mask(struct hci_dev *hdev, bool debug)

{

	u8 mask[8] = { 0x87, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };

	struct sk_buff *skb;

	int err;



	if (debug)

		mask[1] |= 0x62;



	skb = __hci_cmd_sync(hdev, 0xfc52, 8, mask, HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		err = PTR_ERR(skb);

		BT_ERR("%s: Setting Intel event mask failed (%d)",

		       hdev->name, err);

		return err;

	}

	kfree_skb(skb);



	return 0;

}

EXPORT_SYMBOL_GPL(btintel_set_event_mask);



int btintel_set_event_mask_mfg(struct hci_dev *hdev, bool debug)

{

	struct sk_buff *skb;

	u8 param[2];

	int err;



	param[0] = 0x01;

	param[1] = 0x00;



	skb = __hci_cmd_sync(hdev, 0xfc11, 2, param, HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		err = PTR_ERR(skb);

		BT_ERR("%s: Entering Intel manufacturer mode failed (%d)",

		       hdev->name, err);

		return PTR_ERR(skb);

	}

	kfree_skb(skb);



	err = btintel_set_event_mask(hdev, debug);



	param[0] = 0x00;

	param[1] = 0x00;



	skb = __hci_cmd_sync(hdev, 0xfc11, 2, param, HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		err = PTR_ERR(skb);

		BT_ERR("%s: Leaving Intel manufacturer mode failed (%d)",

		       hdev->name, err);

		return PTR_ERR(skb);

	}

	kfree_skb(skb);



	return err;

}

EXPORT_SYMBOL_GPL(btintel_set_event_mask_mfg);



/* ------- REGMAP IBT SUPPORT ------- */



#define IBT_REG_MODE_8BIT  0x00

drivers/bluetooth/btintel.h

+24 −0
Original line number Diff line number Diff line
@@ -73,12 +73,16 @@ struct intel_secure_send_result { 


int btintel_check_bdaddr(struct hci_dev *hdev);

int btintel_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr);

int btintel_set_diag(struct hci_dev *hdev, bool enable);

int btintel_set_diag_mfg(struct hci_dev *hdev, bool enable);

void btintel_hw_error(struct hci_dev *hdev, u8 code);



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

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

			const void *param);

int btintel_load_ddc_config(struct hci_dev *hdev, const char *ddc_name);

int btintel_set_event_mask(struct hci_dev *hdev, bool debug);

int btintel_set_event_mask_mfg(struct hci_dev *hdev, bool debug);



struct regmap *btintel_regmap_init(struct hci_dev *hdev, u16 opcode_read,

				   u16 opcode_write);
@@ -95,6 +99,16 @@ static inline int btintel_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdadd 
	return -EOPNOTSUPP;

}



static inline int btintel_set_diag(struct hci_dev *hdev, bool enable)

{

	return -EOPNOTSUPP;

}



static inline int btintel_set_diag_mfg(struct hci_dev *hdev, bool enable)

{

	return -EOPNOTSUPP;

}



static inline void btintel_hw_error(struct hci_dev *hdev, u8 code)

{

}
@@ -116,6 +130,16 @@ static inline int btintel_load_ddc_config(struct hci_dev *hdev, 
	return -EOPNOTSUPP;

}



static inline int btintel_set_event_mask(struct hci_dev *hdev, bool debug)

{

	return -EOPNOTSUPP;

}



static inline int btintel_set_event_mask_mfg(struct hci_dev *hdev, bool debug)

{

	return -EOPNOTSUPP;

}



static inline struct regmap *btintel_regmap_init(struct hci_dev *hdev,

						 u16 opcode_read,

						 u16 opcode_write)

CRA Git | Maintained and supported by SUSTech CRA and CCSE