Commit bfdc8dbd 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-06-18

Here's the final bluetooth-next pull request for 4.2.

 - Cleanups & fixes to 802.15.4 code and related drivers
 - Fix btusb driver memory leak
 - New USB IDs for Atheros controllers
 - Support for BCM4324B3 UART based Broadcom controller
 - Fix for Bluetooth encryption key size handling
 - Broadcom controller initialization fixes
 - Support for Intel controller DDC parameters
 - Support for multiple Bluetooth LE advertising instances
 - Fix for HCI user channel cleanup path

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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4cd6b475 952497b1

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -1875,6 +1875,14 @@ W: http://www.attotech.com 
S:	Supported

F:	drivers/scsi/esas2r



ATUSB IEEE 802.15.4 RADIO DRIVER

M:	Stefan Schmidt <stefan@osg.samsung.com>

L:	linux-wpan@vger.kernel.org

S:	Maintained

F:	drivers/net/ieee802154/atusb.c

F:	drivers/net/ieee802154/atusb.h

F:	drivers/net/ieee802154/at86rf230.h



AUDIT SUBSYSTEM

M:	Paul Moore <paul@paul-moore.com>

M:	Eric Paris <eparis@redhat.com>

drivers/bluetooth/ath3k.c

+6 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ static const struct usb_device_id ath3k_table[] = { 
	{ USB_DEVICE(0x0489, 0xe057) },

	{ USB_DEVICE(0x0489, 0xe056) },

	{ USB_DEVICE(0x0489, 0xe05f) },

	{ USB_DEVICE(0x0489, 0xe076) },

	{ USB_DEVICE(0x0489, 0xe078) },

	{ USB_DEVICE(0x04c5, 0x1330) },

	{ USB_DEVICE(0x04CA, 0x3004) },
@@ -88,6 +89,7 @@ static const struct usb_device_id ath3k_table[] = { 
	{ USB_DEVICE(0x04CA, 0x3007) },

	{ USB_DEVICE(0x04CA, 0x3008) },

	{ USB_DEVICE(0x04CA, 0x300b) },

	{ USB_DEVICE(0x04CA, 0x300d) },

	{ USB_DEVICE(0x04CA, 0x300f) },

	{ USB_DEVICE(0x04CA, 0x3010) },

	{ USB_DEVICE(0x0930, 0x0219) },
@@ -113,6 +115,7 @@ static const struct usb_device_id ath3k_table[] = { 
	{ USB_DEVICE(0x13d3, 0x3408) },

	{ USB_DEVICE(0x13d3, 0x3423) },

	{ USB_DEVICE(0x13d3, 0x3432) },

	{ USB_DEVICE(0x13d3, 0x3474) },



	/* Atheros AR5BBU12 with sflash firmware */

	{ USB_DEVICE(0x0489, 0xE02C) },
@@ -137,6 +140,7 @@ static const struct usb_device_id ath3k_blist_tbl[] = { 
	{ USB_DEVICE(0x0489, 0xe056), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe05f), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe076), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe078), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04c5, 0x1330), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },
@@ -145,6 +149,7 @@ static const struct usb_device_id ath3k_blist_tbl[] = { 
	{ USB_DEVICE(0x04ca, 0x3007), .driver_info = BTUSB_ATH3012 },

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

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

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

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

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

	{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },
@@ -170,6 +175,7 @@ static const struct usb_device_id ath3k_blist_tbl[] = { 
	{ USB_DEVICE(0x13d3, 0x3408), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3423), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3432), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3474), .driver_info = BTUSB_ATH3012 },



	/* Atheros AR5BBU22 with sflash firmware */

	{ USB_DEVICE(0x0489, 0xE036), .driver_info = BTUSB_ATH3012 },

drivers/bluetooth/bt3c_cs.c

+1 −2
Original line number Diff line number Diff line
@@ -202,9 +202,8 @@ static void bt3c_write_wakeup(struct bt3c_info *info) 
		/* Send frame */

		len = bt3c_write(iobase, 256, skb->data, skb->len);



		if (len != skb->len) {

		if (len != skb->len)

			BT_ERR("Very strange");

		}



		kfree_skb(skb);

drivers/bluetooth/btbcm.c

+116 −16
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#define VERSION "0.1"



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

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



int btbcm_check_bdaddr(struct hci_dev *hdev)

{
@@ -56,10 +57,18 @@ int btbcm_check_bdaddr(struct hci_dev *hdev) 


	bda = (struct hci_rp_read_bd_addr *)skb->data;



	/* The address 00:20:70:02:A0:00 indicates a BCM20702A0 controller

	/* Check if the address indicates a controller with either an

	 * invalid or default address. In both cases the device needs

	 * to be marked as not having a valid address.

	 *

	 * The address 00:20:70:02:A0:00 indicates a BCM20702A0 controller

	 * with no configured address.

	 *

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

	 * with waiting for configuration state.

	 */

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

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

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

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

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

		set_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks);
@@ -89,21 +98,14 @@ int btbcm_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr) 
}

EXPORT_SYMBOL_GPL(btbcm_set_bdaddr);



int btbcm_patchram(struct hci_dev *hdev, const char *firmware)

int btbcm_patchram(struct hci_dev *hdev, const struct firmware *fw)

{

	const struct hci_command_hdr *cmd;

	const struct firmware *fw;

	const u8 *fw_ptr;

	size_t fw_size;

	struct sk_buff *skb;

	u16 opcode;

	int err;



	err = request_firmware(&fw, firmware, &hdev->dev);

	if (err < 0) {

		BT_INFO("%s: BCM: Patch %s not found", hdev->name, firmware);

		return err;

	}

	int err = 0;



	/* Start Download */

	skb = __hci_cmd_sync(hdev, 0xfc2e, 0, NULL, HCI_INIT_TIMEOUT);
@@ -129,8 +131,7 @@ int btbcm_patchram(struct hci_dev *hdev, const char *firmware) 
		fw_size -= sizeof(*cmd);



		if (fw_size < cmd->plen) {

			BT_ERR("%s: BCM: Patch %s is corrupted", hdev->name,

			       firmware);

			BT_ERR("%s: BCM: Patch is corrupted", hdev->name);

			err = -EINVAL;

			goto done;

		}
@@ -156,7 +157,6 @@ int btbcm_patchram(struct hci_dev *hdev, const char *firmware) 
	msleep(250);



done:

	release_firmware(fw);

	return err;

}

EXPORT_SYMBOL(btbcm_patchram);
@@ -242,9 +242,101 @@ static const struct { 
	const char *name;

} bcm_uart_subver_table[] = {

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

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

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

	{ }

};



int btbcm_initialize(struct hci_dev *hdev, char *fw_name, size_t len)

{

	u16 subver, rev;

	const char *hw_name = NULL;

	struct sk_buff *skb;

	struct hci_rp_read_local_version *ver;

	int i, err;



	/* Reset */

	err = btbcm_reset(hdev);

	if (err)

		return err;



	/* Read Local Version Info */

	skb = btbcm_read_local_version(hdev);

	if (IS_ERR(skb))

		return PTR_ERR(skb);



	ver = (struct hci_rp_read_local_version *)skb->data;

	rev = le16_to_cpu(ver->hci_rev);

	subver = le16_to_cpu(ver->lmp_subver);

	kfree_skb(skb);



	/* Read Verbose Config Version Info */

	skb = btbcm_read_verbose_config(hdev);

	if (IS_ERR(skb))

		return PTR_ERR(skb);



	BT_INFO("%s: BCM: chip id %u", hdev->name, skb->data[1]);

	kfree_skb(skb);



	switch ((rev & 0xf000) >> 12) {

	case 0:

	case 1:

	case 3:

		for (i = 0; bcm_uart_subver_table[i].name; i++) {

			if (subver == bcm_uart_subver_table[i].subver) {

				hw_name = bcm_uart_subver_table[i].name;

				break;

			}

		}



		snprintf(fw_name, len, "brcm/%s.hcd", hw_name ? : "BCM");

		break;

	default:

		return 0;

	}



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

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

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



	return 0;

}

EXPORT_SYMBOL_GPL(btbcm_initialize);



int btbcm_finalize(struct hci_dev *hdev)

{

	struct sk_buff *skb;

	struct hci_rp_read_local_version *ver;

	u16 subver, rev;

	int err;



	/* Reset */

	err = btbcm_reset(hdev);

	if (err)

		return err;



	/* Read Local Version Info */

	skb = btbcm_read_local_version(hdev);

	if (IS_ERR(skb))

		return PTR_ERR(skb);



	ver = (struct hci_rp_read_local_version *)skb->data;

	rev = le16_to_cpu(ver->hci_rev);

	subver = le16_to_cpu(ver->lmp_subver);

	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 & 0x00ff), rev & 0x0fff);



	btbcm_check_bdaddr(hdev);



	set_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks);



	return 0;

}

EXPORT_SYMBOL_GPL(btbcm_finalize);



static const struct {

	u16 subver;

	const char *name;
@@ -265,6 +357,7 @@ static const struct { 
int btbcm_setup_patchram(struct hci_dev *hdev)

{

	char fw_name[64];

	const struct firmware *fw;

	u16 subver, rev, pid, vid;

	const char *hw_name = NULL;

	struct sk_buff *skb;
@@ -296,6 +389,7 @@ int btbcm_setup_patchram(struct hci_dev *hdev) 


	switch ((rev & 0xf000) >> 12) {

	case 0:

	case 3:

		for (i = 0; bcm_uart_subver_table[i].name; i++) {

			if (subver == bcm_uart_subver_table[i].subver) {

				hw_name = bcm_uart_subver_table[i].name;
@@ -335,9 +429,15 @@ int btbcm_setup_patchram(struct hci_dev *hdev) 
		hw_name ? : "BCM", (subver & 0x7000) >> 13,

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



	err = btbcm_patchram(hdev, fw_name);

	if (err == -ENOENT)

	err = request_firmware(&fw, fw_name, &hdev->dev);

	if (err < 0) {

		BT_INFO("%s: BCM: Patch %s not found", hdev->name, fw_name);

		return 0;

	}



	btbcm_patchram(hdev, fw);



	release_firmware(fw);



	/* Reset */

	err = btbcm_reset(hdev);

drivers/bluetooth/btbcm.h

+59 −2
Original line number Diff line number Diff line
@@ -21,15 +21,61 @@ 
 *

 */



#define BCM_UART_CLOCK_48MHZ	0x01

#define BCM_UART_CLOCK_24MHZ	0x02



struct bcm_update_uart_baud_rate {

	__le16 zero;

	__le32 baud_rate;

} __packed;



struct bcm_write_uart_clock_setting {

	__u8 type;

} __packed;



struct bcm_set_sleep_mode {

	__u8 sleep_mode;

	__u8 idle_host;

	__u8 idle_dev;

	__u8 bt_wake_active;

	__u8 host_wake_active;

	__u8 allow_host_sleep;

	__u8 combine_modes;

	__u8 tristate_control;

	__u8 usb_auto_sleep;

	__u8 usb_resume_timeout;

	__u8 pulsed_host_wake;

	__u8 break_to_host;

} __packed;



struct bcm_set_pcm_int_params {

	__u8 routing;

	__u8 rate;

	__u8 frame_sync;

	__u8 sync_mode;

	__u8 clock_mode;

} __packed;



struct bcm_set_pcm_format_params {

	__u8 lsb_first;

	__u8 fill_value;

	__u8 fill_method;

	__u8 fill_num;

	__u8 right_justify;

} __packed;



#if IS_ENABLED(CONFIG_BT_BCM)



int btbcm_check_bdaddr(struct hci_dev *hdev);

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

int btbcm_patchram(struct hci_dev *hdev, const char *firmware);

int btbcm_patchram(struct hci_dev *hdev, const struct firmware *fw);



int btbcm_setup_patchram(struct hci_dev *hdev);

int btbcm_setup_apple(struct hci_dev *hdev);



int btbcm_initialize(struct hci_dev *hdev, char *fw_name, size_t len);

int btbcm_finalize(struct hci_dev *hdev);



#else



static inline int btbcm_check_bdaddr(struct hci_dev *hdev)
@@ -42,7 +88,7 @@ static inline int btbcm_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr) 
	return -EOPNOTSUPP;

}



static inline int btbcm_patchram(struct hci_dev *hdev, const char *firmware)

static inline int btbcm_patchram(struct hci_dev *hdev, const struct firmware *fw)

{

	return -EOPNOTSUPP;

}
@@ -57,4 +103,15 @@ static inline int btbcm_setup_apple(struct hci_dev *hdev) 
	return 0;

}



static inline int btbcm_initialize(struct hci_dev *hdev, char *fw_name,

				   size_t len)

{

	return 0;

}



static inline int btbcm_finalize(struct hci_dev *hdev)

{

	return 0;

}



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE