Commit 5148371a 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-12-11

Here's another set of Bluetooth & 802.15.4 patches for the 4.5 kernel:

 - 6LoWPAN debugfs support
 - New 802.15.4 driver for ADF7242 MAC IEEE802154
 - Initial code for 6LoWPAN Generic Header Compression (GHC) support
 - Refactor Bluetooth LE scan & advertising behind dedicated workqueue
 - Cleanups to Bluetooth H:5 HCI driver
 - Support for Toshiba Broadcom based Bluetooth controllers
 - Use continuous scanning when establishing Bluetooth LE connections

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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7e074af2 7302b9d9

Documentation/devicetree/bindings/net/ieee802154/adf7242.txt

0 → 100644
+18 −0
Original line number Diff line number Diff line 
* ADF7242 IEEE 802.15.4 *



Required properties:

  - compatible:		should be "adi,adf7242"

  - spi-max-frequency:	maximal bus speed (12.5 MHz)

  - reg:		the chipselect index

  - interrupts:		the interrupt generated by the device via pin IRQ1.

			IRQ_TYPE_LEVEL_HIGH (4) or IRQ_TYPE_EDGE_FALLING (1)



Example:



	adf7242@0 {

		compatible = "adi,adf7242";

		spi-max-frequency = <10000000>;

		reg = <0>;

		interrupts = <98 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-parent = <&gpio3>;

	};

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -371,6 +371,15 @@ ADDRESS SPACE LAYOUT RANDOMIZATION (ASLR) 
M:	Jiri Kosina <jikos@kernel.org>

S:	Maintained



ADF7242 IEEE 802.15.4 RADIO DRIVER

M:	Michael Hennerich <michael.hennerich@analog.com>

W:	https://wiki.analog.com/ADF7242

W:	http://ez.analog.com/community/linux-device-drivers

L:	linux-wpan@vger.kernel.org

S:	Supported

F:	drivers/net/ieee802154/adf7242.c

F:	Documentation/devicetree/bindings/net/ieee802154/adf7242.txt



ADM1025 HARDWARE MONITOR DRIVER

M:	Jean Delvare <jdelvare@suse.com>

L:	lm-sensors@lm-sensors.org

drivers/bluetooth/btintel.c

+80 −49
Original line number Diff line number Diff line
@@ -73,6 +73,48 @@ int btintel_check_bdaddr(struct hci_dev *hdev) 
}

EXPORT_SYMBOL_GPL(btintel_check_bdaddr);



int btintel_enter_mfg(struct hci_dev *hdev)

{

	const u8 param[] = { 0x01, 0x00 };

	struct sk_buff *skb;



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

	if (IS_ERR(skb)) {

		bt_dev_err(hdev, "Entering manufacturer mode failed (%ld)",

			   PTR_ERR(skb));

		return PTR_ERR(skb);

	}

	kfree_skb(skb);



	return 0;

}

EXPORT_SYMBOL_GPL(btintel_enter_mfg);



int btintel_exit_mfg(struct hci_dev *hdev, bool reset, bool patched)

{

	u8 param[] = { 0x00, 0x00 };

	struct sk_buff *skb;



	/* The 2nd command parameter specifies the manufacturing exit method:

	 * 0x00: Just disable the manufacturing mode (0x00).

	 * 0x01: Disable manufacturing mode and reset with patches deactivated.

	 * 0x02: Disable manufacturing mode and reset with patches activated.

	 */

	if (reset)

		param[1] |= patched ? 0x02 : 0x01;



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

	if (IS_ERR(skb)) {

		bt_dev_err(hdev, "Exiting manufacturer mode failed (%ld)",

			   PTR_ERR(skb));

		return PTR_ERR(skb);

	}

	kfree_skb(skb);



	return 0;

}

EXPORT_SYMBOL_GPL(btintel_exit_mfg);



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

{

	struct sk_buff *skb;
@@ -126,37 +168,19 @@ 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;

	int err, ret;



	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;

	err = btintel_enter_mfg(hdev);

	if (err)

		return err;



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

	ret = btintel_set_diag(hdev, enable);



	err = btintel_exit_mfg(hdev, false, false);

	if (err)

		return err;



	return ret;

}

EXPORT_SYMBOL_GPL(btintel_set_diag_mfg);
@@ -309,39 +333,46 @@ 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;

	int err, ret;



	param[0] = 0x01;

	param[1] = 0x00;

	err = btintel_enter_mfg(hdev);

	if (err)

		return err;



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

	ret = btintel_set_event_mask(hdev, debug);



	err = btintel_set_event_mask(hdev, debug);

	err = btintel_exit_mfg(hdev, false, false);

	if (err)

		return err;



	param[0] = 0x00;

	param[1] = 0x00;

	return ret;

}

EXPORT_SYMBOL_GPL(btintel_set_event_mask_mfg);



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

int btintel_read_version(struct hci_dev *hdev, struct intel_version *ver)

{

	struct sk_buff *skb;



	skb = __hci_cmd_sync(hdev, 0xfc05, 0, NULL, HCI_CMD_TIMEOUT);

	if (IS_ERR(skb)) {

		err = PTR_ERR(skb);

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

		       hdev->name, err);

		bt_dev_err(hdev, "Reading Intel version information failed (%ld)",

			   PTR_ERR(skb));

		return PTR_ERR(skb);

	}



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

		bt_dev_err(hdev, "Intel version event size mismatch");

		kfree_skb(skb);

		return -EILSEQ;

	}



	return err;

	memcpy(ver, skb->data, sizeof(*ver));



	kfree_skb(skb);



	return 0;

}

EXPORT_SYMBOL_GPL(btintel_set_event_mask_mfg);

EXPORT_SYMBOL_GPL(btintel_read_version);



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

drivers/bluetooth/btintel.h

+19 −0
Original line number Diff line number Diff line
@@ -72,6 +72,8 @@ struct intel_secure_send_result { 
#if IS_ENABLED(CONFIG_BT_INTEL)



int btintel_check_bdaddr(struct hci_dev *hdev);

int btintel_enter_mfg(struct hci_dev *hdev);

int btintel_exit_mfg(struct hci_dev *hdev, bool reset, bool patched);

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);
@@ -83,6 +85,7 @@ int btintel_secure_send(struct hci_dev *hdev, u8 fragment_type, u32 plen, 
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);

int btintel_read_version(struct hci_dev *hdev, struct intel_version *ver);



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

				   u16 opcode_write);
@@ -94,6 +97,16 @@ static inline int btintel_check_bdaddr(struct hci_dev *hdev) 
	return -EOPNOTSUPP;

}



static inline int btintel_enter_mfg(struct hci_dev *hdev)

{

	return -EOPNOTSUPP;

}



static inline int btintel_exit_mfg(struct hci_dev *hdev, bool reset, bool patched)

{

	return -EOPNOTSUPP;

}



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

{

	return -EOPNOTSUPP;
@@ -140,6 +153,12 @@ static inline int btintel_set_event_mask_mfg(struct hci_dev *hdev, bool debug) 
	return -EOPNOTSUPP;

}



static inline int btintel_read_version(struct hci_dev *hdev,

				       struct intel_version *ver)

{

	return -EOPNOTSUPP;

}



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

						 u16 opcode_read,

						 u16 opcode_write)

drivers/bluetooth/btusb.c

+41 −97
Original line number Diff line number Diff line
@@ -153,6 +153,10 @@ static const struct usb_device_id btusb_table[] = { 
	{ USB_VENDOR_AND_INTERFACE_INFO(0x13d3, 0xff, 0x01, 0x01),

	  .driver_info = BTUSB_BCM_PATCHRAM },



	/* Toshiba Corp - Broadcom based */

	{ USB_VENDOR_AND_INTERFACE_INFO(0x0930, 0xff, 0x01, 0x01),

	  .driver_info = BTUSB_BCM_PATCHRAM },



	/* Intel Bluetooth USB Bootloader (RAM module) */

	{ USB_DEVICE(0x8087, 0x0a5a),

	  .driver_info = BTUSB_INTEL_BOOT | BTUSB_BROKEN_ISOC },
@@ -1642,13 +1646,8 @@ static int btusb_setup_intel(struct hci_dev *hdev) 
	struct sk_buff *skb;

	const struct firmware *fw;

	const u8 *fw_ptr;

	int disable_patch;

	struct intel_version *ver;



	const u8 mfg_enable[] = { 0x01, 0x00 };

	const u8 mfg_disable[] = { 0x00, 0x00 };

	const u8 mfg_reset_deactivate[] = { 0x00, 0x01 };

	const u8 mfg_reset_activate[] = { 0x00, 0x02 };

	int disable_patch, err;

	struct intel_version ver;



	BT_DBG("%s", hdev->name);
@@ -1674,35 +1673,22 @@ static int btusb_setup_intel(struct hci_dev *hdev) 
	 * The returned information are hardware variant and revision plus

	 * firmware variant, revision and build number.

	 */

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

	if (IS_ERR(skb)) {

		BT_ERR("%s reading Intel fw version command failed (%ld)",

		       hdev->name, PTR_ERR(skb));

		return PTR_ERR(skb);

	}



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

		BT_ERR("%s Intel version event length mismatch", hdev->name);

		kfree_skb(skb);

		return -EIO;

	}



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

	err = btintel_read_version(hdev, &ver);

	if (err)

		return err;



	BT_INFO("%s: read Intel version: %02x%02x%02x%02x%02x%02x%02x%02x%02x",

		hdev->name, ver->hw_platform, ver->hw_variant,

		ver->hw_revision, ver->fw_variant,  ver->fw_revision,

		ver->fw_build_num, ver->fw_build_ww, ver->fw_build_yy,

		ver->fw_patch_num);

		hdev->name, ver.hw_platform, ver.hw_variant, ver.hw_revision,

		ver.fw_variant,  ver.fw_revision, ver.fw_build_num,

		ver.fw_build_ww, ver.fw_build_yy, ver.fw_patch_num);



	/* fw_patch_num indicates the version of patch the device currently

	 * have. If there is no patch data in the device, it is always 0x00.

	 * So, if it is other than 0x00, no need to patch the device again.

	 */

	if (ver->fw_patch_num) {

	if (ver.fw_patch_num) {

		BT_INFO("%s: Intel device is already patched. patch num: %02x",

			hdev->name, ver->fw_patch_num);

		kfree_skb(skb);

			hdev->name, ver.fw_patch_num);

		goto complete;

	}
@@ -1712,31 +1698,21 @@ static int btusb_setup_intel(struct hci_dev *hdev) 
	 * If no patch file is found, allow the device to operate without

	 * a patch.

	 */

	fw = btusb_setup_intel_get_fw(hdev, ver);

	if (!fw) {

		kfree_skb(skb);

	fw = btusb_setup_intel_get_fw(hdev, &ver);

	if (!fw)

		goto complete;

	}

	fw_ptr = fw->data;



	kfree_skb(skb);



	/* This Intel specific command enables the manufacturer mode of the

	 * controller.

	 *

	/* Enable the manufacturer mode of the controller.

	 * Only while this mode is enabled, the driver can download the

	 * firmware patch data and configuration parameters.

	 */

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

	if (IS_ERR(skb)) {

		BT_ERR("%s entering Intel manufacturer mode failed (%ld)",

		       hdev->name, PTR_ERR(skb));

	err = btintel_enter_mfg(hdev);

	if (err) {

		release_firmware(fw);

		return PTR_ERR(skb);

		return err;

	}



	kfree_skb(skb);



	disable_patch = 1;



	/* The firmware data file consists of list of Intel specific HCI
@@ -1776,14 +1752,9 @@ static int btusb_setup_intel(struct hci_dev *hdev) 
	/* Patching completed successfully and disable the manufacturer mode

	 * with reset and activate the downloaded firmware patches.

	 */

	skb = __hci_cmd_sync(hdev, 0xfc11, sizeof(mfg_reset_activate),

			     mfg_reset_activate, HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		BT_ERR("%s exiting Intel manufacturer mode failed (%ld)",

		       hdev->name, PTR_ERR(skb));

		return PTR_ERR(skb);

	}

	kfree_skb(skb);

	err = btintel_exit_mfg(hdev, true, true);

	if (err)

		return err;



	BT_INFO("%s: Intel Bluetooth firmware patch completed and activated",

		hdev->name);
@@ -1792,14 +1763,9 @@ static int btusb_setup_intel(struct hci_dev *hdev) 


exit_mfg_disable:

	/* Disable the manufacturer mode without reset */

	skb = __hci_cmd_sync(hdev, 0xfc11, sizeof(mfg_disable), mfg_disable,

			     HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		BT_ERR("%s exiting Intel manufacturer mode failed (%ld)",

		       hdev->name, PTR_ERR(skb));

		return PTR_ERR(skb);

	}

	kfree_skb(skb);

	err = btintel_exit_mfg(hdev, false, false);

	if (err)

		return err;



	BT_INFO("%s: Intel Bluetooth firmware patch completed", hdev->name);
@@ -1811,14 +1777,9 @@ exit_mfg_deactivate: 
	/* Patching failed. Disable the manufacturer mode with reset and

	 * deactivate the downloaded firmware patches.

	 */

	skb = __hci_cmd_sync(hdev, 0xfc11, sizeof(mfg_reset_deactivate),

			     mfg_reset_deactivate, HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		BT_ERR("%s exiting Intel manufacturer mode failed (%ld)",

		       hdev->name, PTR_ERR(skb));

		return PTR_ERR(skb);

	}

	kfree_skb(skb);

	err = btintel_exit_mfg(hdev, true, false);

	if (err)

		return err;



	BT_INFO("%s: Intel Bluetooth firmware patch completed and deactivated",

		hdev->name);
@@ -2005,7 +1966,7 @@ static int btusb_setup_intel_new(struct hci_dev *hdev) 
					  0x00, 0x08, 0x04, 0x00 };

	struct btusb_data *data = hci_get_drvdata(hdev);

	struct sk_buff *skb;

	struct intel_version *ver;

	struct intel_version ver;

	struct intel_boot_params *params;

	const struct firmware *fw;

	const u8 *fw_ptr;
@@ -2023,28 +1984,16 @@ static int btusb_setup_intel_new(struct hci_dev *hdev) 
	 * is in bootloader mode or if it already has operational firmware

	 * loaded.

	 */

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

	if (IS_ERR(skb)) {

		BT_ERR("%s: Reading Intel version information failed (%ld)",

		       hdev->name, PTR_ERR(skb));

		return PTR_ERR(skb);

	}



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

		BT_ERR("%s: Intel version event size mismatch", hdev->name);

		kfree_skb(skb);

		return -EILSEQ;

	}



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

	err = btintel_read_version(hdev, &ver);

	if (err)

		return err;



	/* The hardware platform number has a fixed value of 0x37 and

	 * for now only accept this single value.

	 */

	if (ver->hw_platform != 0x37) {

	if (ver.hw_platform != 0x37) {

		BT_ERR("%s: Unsupported Intel hardware platform (%u)",

		       hdev->name, ver->hw_platform);

		kfree_skb(skb);

		       hdev->name, ver.hw_platform);

		return -EINVAL;

	}
@@ -2053,14 +2002,13 @@ static int btusb_setup_intel_new(struct hci_dev *hdev) 
	 * put in place to ensure correct forward compatibility options

	 * when newer hardware variants come along.

	 */

	if (ver->hw_variant != 0x0b) {

	if (ver.hw_variant != 0x0b) {

		BT_ERR("%s: Unsupported Intel hardware variant (%u)",

		       hdev->name, ver->hw_variant);

		kfree_skb(skb);

		       hdev->name, ver.hw_variant);

		return -EINVAL;

	}



	btintel_version_info(hdev, ver);

	btintel_version_info(hdev, &ver);



	/* The firmware variant determines if the device is in bootloader

	 * mode or is running operational firmware. The value 0x06 identifies
@@ -2075,8 +2023,7 @@ static int btusb_setup_intel_new(struct hci_dev *hdev) 
	 * It is not possible to use the Secure Boot Parameters in this

	 * case since that command is only available in bootloader mode.

	 */

	if (ver->fw_variant == 0x23) {

		kfree_skb(skb);

	if (ver.fw_variant == 0x23) {

		clear_bit(BTUSB_BOOTLOADER, &data->flags);

		btintel_check_bdaddr(hdev);

		return 0;
@@ -2085,15 +2032,12 @@ static int btusb_setup_intel_new(struct hci_dev *hdev) 
	/* If the device is not in bootloader mode, then the only possible

	 * choice is to return an error and abort the device initialization.

	 */

	if (ver->fw_variant != 0x06) {

	if (ver.fw_variant != 0x06) {

		BT_ERR("%s: Unsupported Intel firmware variant (%u)",

		       hdev->name, ver->fw_variant);

		kfree_skb(skb);

		       hdev->name, ver.fw_variant);

		return -ENODEV;

	}



	kfree_skb(skb);



	/* Read the secure boot parameters to identify the operating

	 * details of the bootloader.

	 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE