Commit c3d0dac6 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-04-09

We've had enough new patches during the past week (especially from
Marcel) that it'd be good to still get these queued for 4.1.

The majority of the changes are from Marcel with lots of cleanup &
refactoring patches for the HCI UART driver. Marcel also split out some
Broadcom & Intel vendor specific functionality into two new btintel &
btbcm modules.

In addition to the HCI driver changes there's the completion of our
local OOB data interface for pairing, added support for requesting
remote LE features when connecting, as well as a couple of minor fixes
for mac802154.

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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b52e6921 23310f6f

drivers/bluetooth/Kconfig

+41 −0
Original line number Diff line number Diff line
@@ -2,9 +2,17 @@ 
menu "Bluetooth device drivers"

	depends on BT



config BT_INTEL

	tristate



config BT_BCM

	tristate

	select FW_LOADER



config BT_HCIBTUSB

	tristate "HCI USB driver"

	depends on USB

	select BT_INTEL

	help

	  Bluetooth HCI USB driver.

	  This driver is required if you want to use Bluetooth devices with
@@ -13,6 +21,17 @@ config BT_HCIBTUSB 
	  Say Y here to compile support for Bluetooth USB devices into the

	  kernel or say M to compile it as module (btusb).



config BT_HCIBTUSB_BCM

	bool "Broadcom protocol support"

	depends on BT_HCIBTUSB

	select BT_BCM

	default y

	help

	  The Broadcom protocol support enables firmware and patchram

	  download support for Broadcom Bluetooth controllers.



	  Say Y here to compile support for Broadcom protocol.



config BT_HCIBTSDIO

	tristate "HCI SDIO driver"

	depends on MMC
@@ -62,6 +81,7 @@ config BT_HCIUART_BCSP 
config BT_HCIUART_ATH3K

	bool "Atheros AR300x serial support"

	depends on BT_HCIUART

	select BT_HCIUART_H4

	help

	  HCIATH3K (HCI Atheros AR300x) is a serial protocol for

	  communication between host and Atheros AR300x Bluetooth devices.
@@ -94,6 +114,27 @@ config BT_HCIUART_3WIRE 


	  Say Y here to compile support for Three-wire UART protocol.



config BT_HCIUART_INTEL

	bool "Intel protocol support"

	depends on BT_HCIUART

	select BT_INTEL

	help

	  The Intel protocol support enables Bluetooth HCI over serial

	  port interface for Intel Bluetooth controllers.



	  Say Y here to compile support for Intel protocol.



config BT_HCIUART_BCM

	bool "Broadcom protocol support"

	depends on BT_HCIUART

	select BT_HCIUART_H4

	select BT_BCM

	help

	  The Broadcom protocol support enables Bluetooth HCI over serial

	  port interface for Broadcom Bluetooth controllers.



	  Say Y here to compile support for Broadcom protocol.



config BT_HCIBCM203X

	tristate "HCI BCM203x USB driver"

	depends on USB

drivers/bluetooth/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -15,10 +15,12 @@ obj-$(CONFIG_BT_HCIBTUART) += btuart_cs.o 
obj-$(CONFIG_BT_HCIBTUSB)	+= btusb.o

obj-$(CONFIG_BT_HCIBTSDIO)	+= btsdio.o



obj-$(CONFIG_BT_INTEL)		+= btintel.o

obj-$(CONFIG_BT_ATH3K)		+= ath3k.o

obj-$(CONFIG_BT_MRVL)		+= btmrvl.o

obj-$(CONFIG_BT_MRVL_SDIO)	+= btmrvl_sdio.o

obj-$(CONFIG_BT_WILINK)		+= btwilink.o

obj-$(CONFIG_BT_BCM)		+= btbcm.o



btmrvl-y			:= btmrvl_main.o

btmrvl-$(CONFIG_DEBUG_FS)	+= btmrvl_debugfs.o
@@ -29,6 +31,8 @@ hci_uart-$(CONFIG_BT_HCIUART_BCSP) += hci_bcsp.o 
hci_uart-$(CONFIG_BT_HCIUART_LL)	+= hci_ll.o

hci_uart-$(CONFIG_BT_HCIUART_ATH3K)	+= hci_ath.o

hci_uart-$(CONFIG_BT_HCIUART_3WIRE)	+= hci_h5.o

hci_uart-$(CONFIG_BT_HCIUART_INTEL)	+= hci_intel.o

hci_uart-$(CONFIG_BT_HCIUART_BCM)	+= hci_bcm.o

hci_uart-objs				:= $(hci_uart-y)



ccflags-y += -D__CHECK_ENDIAN__

drivers/bluetooth/btbcm.c

0 → 100644
+387 −0
Original line number Diff line number Diff line 
/*

 *

 *  Bluetooth support for Broadcom devices

 *

 *  Copyright (C) 2015  Intel Corporation

 *

 *

 *  This program is free software; you can redistribute it and/or modify

 *  it under the terms of the GNU General Public License as published by

 *  the Free Software Foundation; either version 2 of the License, or

 *  (at your option) any later version.

 *

 *  This program is distributed in the hope that it will be useful,

 *  but WITHOUT ANY WARRANTY; without even the implied warranty of

 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *  GNU General Public License for more details.

 *

 *  You should have received a copy of the GNU General Public License

 *  along with this program; if not, write to the Free Software

 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 *

 */



#include <linux/module.h>

#include <linux/firmware.h>

#include <asm/unaligned.h>



#include <net/bluetooth/bluetooth.h>

#include <net/bluetooth/hci_core.h>



#include "btbcm.h"



#define VERSION "0.1"



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



int btbcm_check_bdaddr(struct hci_dev *hdev)

{

	struct hci_rp_read_bd_addr *bda;

	struct sk_buff *skb;



	skb = __hci_cmd_sync(hdev, HCI_OP_READ_BD_ADDR, 0, NULL,

			     HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		int err = PTR_ERR(skb);

		BT_ERR("%s: BCM: Reading device address failed (%d)",

		       hdev->name, err);

		return err;

	}



	if (skb->len != sizeof(*bda)) {

		BT_ERR("%s: BCM: Device address length mismatch", hdev->name);

		kfree_skb(skb);

		return -EIO;

	}



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

	if (bda->status) {

		BT_ERR("%s: BCM: Device address result failed (%02x)",

		       hdev->name, bda->status);

		kfree_skb(skb);

		return -bt_to_errno(bda->status);

	}



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

	 * with no configured address.

	 */

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

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

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

		set_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks);

	}



	kfree_skb(skb);



	return 0;

}

EXPORT_SYMBOL_GPL(btbcm_check_bdaddr);



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

{

	struct sk_buff *skb;

	int err;



	skb = __hci_cmd_sync(hdev, 0xfc01, 6, bdaddr, HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		err = PTR_ERR(skb);

		BT_ERR("%s: BCM: Change address command failed (%d)",

		       hdev->name, err);

		return err;

	}

	kfree_skb(skb);



	return 0;

}

EXPORT_SYMBOL_GPL(btbcm_set_bdaddr);



static int btbcm_reset(struct hci_dev *hdev)

{

	struct sk_buff *skb;



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

	if (IS_ERR(skb)) {

		int err = PTR_ERR(skb);

		BT_ERR("%s: BCM: Reset failed (%d)", hdev->name, err);

		return err;

	}

	kfree_skb(skb);



	return 0;

}



static struct sk_buff *btbcm_read_local_version(struct hci_dev *hdev)

{

	struct sk_buff *skb;



	skb = __hci_cmd_sync(hdev, HCI_OP_READ_LOCAL_VERSION, 0, NULL,

			     HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		BT_ERR("%s: BCM: Reading local version info failed (%ld)",

		       hdev->name, PTR_ERR(skb));

		return skb;

	}



	if (skb->len != sizeof(struct hci_rp_read_local_version)) {

		BT_ERR("%s: BCM: Local version length mismatch", hdev->name);

		kfree_skb(skb);

		return ERR_PTR(-EIO);

	}



	return skb;

}



static struct sk_buff *btbcm_read_verbose_config(struct hci_dev *hdev)

{

	struct sk_buff *skb;



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

	if (IS_ERR(skb)) {

		BT_ERR("%s: BCM: Read verbose config info failed (%ld)",

		       hdev->name, PTR_ERR(skb));

		return skb;

	}



	if (skb->len != 7) {

		BT_ERR("%s: BCM: Verbose config length mismatch", hdev->name);

		kfree_skb(skb);

		return ERR_PTR(-EIO);

	}



	return skb;

}



static struct sk_buff *btbcm_read_usb_product(struct hci_dev *hdev)

{

	struct sk_buff *skb;



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

	if (IS_ERR(skb)) {

		BT_ERR("%s: BCM: Read USB product info failed (%ld)",

		       hdev->name, PTR_ERR(skb));

		return skb;

	}



	if (skb->len != 5) {

		BT_ERR("%s: BCM: USB product length mismatch", hdev->name);

		kfree_skb(skb);

		return ERR_PTR(-EIO);

	}



	return skb;

}



static const struct {

	u16 subver;

	const char *name;

} bcm_uart_subver_table[] = {

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

	{ }

};



static const struct {

	u16 subver;

	const char *name;

} bcm_usb_subver_table[] = {

	{ 0x210b, "BCM43142A0"	},	/* 001.001.011 */

	{ 0x2112, "BCM4314A0"	},	/* 001.001.018 */

	{ 0x2118, "BCM20702A0"	},	/* 001.001.024 */

	{ 0x2126, "BCM4335A0"	},	/* 001.001.038 */

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

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

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

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

	{ 0x6109, "BCM4335C0"	},	/* 003.001.009 */

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

	{ }

};



int btbcm_setup_patchram(struct hci_dev *hdev)

{

	const struct hci_command_hdr *cmd;

	const struct firmware *fw;

	const u8 *fw_ptr;

	size_t fw_size;

	char fw_name[64];

	u16 opcode, subver, rev, pid, vid;

	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:

		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, sizeof(fw_name), "brcm/%s.hcd",

			 hw_name ? : "BCM");

		break;

	case 1:

	case 2:

		/* Read USB Product Info */

		skb = btbcm_read_usb_product(hdev);

		if (IS_ERR(skb))

			return PTR_ERR(skb);



		vid = get_unaligned_le16(skb->data + 1);

		pid = get_unaligned_le16(skb->data + 3);

		kfree_skb(skb);



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

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

				hw_name = bcm_usb_subver_table[i].name;

				break;

			}

		}



		snprintf(fw_name, sizeof(fw_name), "brcm/%s-%4.4x-%4.4x.hcd",

			 hw_name ? : "BCM", vid, pid);

		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);



	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;

	}



	/* Start Download */

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

	if (IS_ERR(skb)) {

		err = PTR_ERR(skb);

		BT_ERR("%s: BCM: Download Minidrv command failed (%d)",

		       hdev->name, err);

		goto reset;

	}

	kfree_skb(skb);



	/* 50 msec delay after Download Minidrv completes */

	msleep(50);



	fw_ptr = fw->data;

	fw_size = fw->size;



	while (fw_size >= sizeof(*cmd)) {

		const u8 *cmd_param;



		cmd = (struct hci_command_hdr *)fw_ptr;

		fw_ptr += sizeof(*cmd);

		fw_size -= sizeof(*cmd);



		if (fw_size < cmd->plen) {

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

			       fw_name);

			err = -EINVAL;

			goto reset;

		}



		cmd_param = fw_ptr;

		fw_ptr += cmd->plen;

		fw_size -= cmd->plen;



		opcode = le16_to_cpu(cmd->opcode);



		skb = __hci_cmd_sync(hdev, opcode, cmd->plen, cmd_param,

				     HCI_INIT_TIMEOUT);

		if (IS_ERR(skb)) {

			err = PTR_ERR(skb);

			BT_ERR("%s: BCM: patch command %04x failed (%d)",

			       hdev->name, opcode, err);

			goto reset;

		}

		kfree_skb(skb);

	}



	/* 250 msec delay after Launch Ram completes */

	msleep(250);



reset:

	/* Reset */

	err = btbcm_reset(hdev);

	if (err)

		goto done;



	/* Read Local Version Info */

	skb = btbcm_read_local_version(hdev);

	if (IS_ERR(skb)) {

		err = PTR_ERR(skb);

		goto done;

	}



	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: %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);



	btbcm_check_bdaddr(hdev);



	set_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks);



done:

	release_firmware(fw);



	return err;

}

EXPORT_SYMBOL_GPL(btbcm_setup_patchram);



int btbcm_setup_apple(struct hci_dev *hdev)

{

	struct sk_buff *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 build %4.4u", hdev->name, skb->data[1],

		get_unaligned_le16(skb->data + 5));

	kfree_skb(skb);



	set_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks);



	return 0;

}

EXPORT_SYMBOL_GPL(btbcm_setup_apple);



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

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

MODULE_VERSION(VERSION);

MODULE_LICENSE("GPL");

drivers/bluetooth/btbcm.h

0 → 100644
+54 −0
Original line number Diff line number Diff line 
/*

 *

 *  Bluetooth support for Broadcom devices

 *

 *  Copyright (C) 2015  Intel Corporation

 *

 *

 *  This program is free software; you can redistribute it and/or modify

 *  it under the terms of the GNU General Public License as published by

 *  the Free Software Foundation; either version 2 of the License, or

 *  (at your option) any later version.

 *

 *  This program is distributed in the hope that it will be useful,

 *  but WITHOUT ANY WARRANTY; without even the implied warranty of

 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *  GNU General Public License for more details.

 *

 *  You should have received a copy of the GNU General Public License

 *  along with this program; if not, write to the Free Software

 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 *

 */



#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_setup_patchram(struct hci_dev *hdev);

int btbcm_setup_apple(struct hci_dev *hdev);



#else



static inline int btbcm_check_bdaddr(struct hci_dev *hdev)

{

	return -EOPNOTSUPP;

}



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

{

	return -EOPNOTSUPP;

}



static inline int btbcm_setup_patchram(struct hci_dev *hdev)

{

	return 0;

}



static inline int btbcm_setup_apple(struct hci_dev *hdev)

{

	return 0;

}



#endif

drivers/bluetooth/btintel.c

0 → 100644
+101 −0
Original line number Diff line number Diff line 
/*

 *

 *  Bluetooth support for Intel devices

 *

 *  Copyright (C) 2015  Intel Corporation

 *

 *

 *  This program is free software; you can redistribute it and/or modify

 *  it under the terms of the GNU General Public License as published by

 *  the Free Software Foundation; either version 2 of the License, or

 *  (at your option) any later version.

 *

 *  This program is distributed in the hope that it will be useful,

 *  but WITHOUT ANY WARRANTY; without even the implied warranty of

 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *  GNU General Public License for more details.

 *

 *  You should have received a copy of the GNU General Public License

 *  along with this program; if not, write to the Free Software

 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 *

 */



#include <linux/module.h>



#include <net/bluetooth/bluetooth.h>

#include <net/bluetooth/hci_core.h>



#include "btintel.h"



#define VERSION "0.1"



#define BDADDR_INTEL (&(bdaddr_t) {{0x00, 0x8b, 0x9e, 0x19, 0x03, 0x00}})



int btintel_check_bdaddr(struct hci_dev *hdev)

{

	struct hci_rp_read_bd_addr *bda;

	struct sk_buff *skb;



	skb = __hci_cmd_sync(hdev, HCI_OP_READ_BD_ADDR, 0, NULL,

			     HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		int err = PTR_ERR(skb);

		BT_ERR("%s: Reading Intel device address failed (%d)",

		       hdev->name, err);

		return err;

	}



	if (skb->len != sizeof(*bda)) {

		BT_ERR("%s: Intel device address length mismatch", hdev->name);

		kfree_skb(skb);

		return -EIO;

	}



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

	if (bda->status) {

		BT_ERR("%s: Intel device address result failed (%02x)",

		       hdev->name, bda->status);

		kfree_skb(skb);

		return -bt_to_errno(bda->status);

	}



	/* For some Intel based controllers, the default Bluetooth device

	 * address 00:03:19:9E:8B:00 can be found. These controllers are

	 * fully operational, but have the danger of duplicate addresses

	 * and that in turn can cause problems with Bluetooth operation.

	 */

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

		BT_ERR("%s: Found Intel default device address (%pMR)",

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

		set_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks);

	}



	kfree_skb(skb);



	return 0;

}

EXPORT_SYMBOL_GPL(btintel_check_bdaddr);



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

{

	struct sk_buff *skb;

	int err;



	skb = __hci_cmd_sync(hdev, 0xfc31, 6, bdaddr, HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		err = PTR_ERR(skb);

		BT_ERR("%s: Changing Intel device address failed (%d)",

		       hdev->name, err);

		return err;

	}

	kfree_skb(skb);



	return 0;

}

EXPORT_SYMBOL_GPL(btintel_set_bdaddr);



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

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

MODULE_VERSION(VERSION);

MODULE_LICENSE("GPL");

CRA Git | Maintained and supported by SUSTech CRA and CCSE