Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59c1cecc 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 2017-11-01

Here's one more bluetooth-next pull request for the 4.15 kernel.

 - New NFA344A device entry for btusb drvier
 - Fix race conditions in hci_ldisc
 - Fix for isochronous interface assignments in btusb driver
 - A few other smaller fixes & improvements

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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1969db47 0338b1b3

drivers/bluetooth/bpa10x.c

+6 −9
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ static void bpa10x_rx_complete(struct urb *urb) 
						bpa10x_recv_pkts,

						ARRAY_SIZE(bpa10x_recv_pkts));

		if (IS_ERR(data->rx_skb[idx])) {

			BT_ERR("%s corrupted event packet", hdev->name);

			bt_dev_err(hdev, "corrupted event packet");

			hdev->stat.err_rx++;

			data->rx_skb[idx] = NULL;

		}
@@ -127,8 +127,7 @@ static void bpa10x_rx_complete(struct urb *urb) 


	err = usb_submit_urb(urb, GFP_ATOMIC);

	if (err < 0) {

		BT_ERR("%s urb %p failed to resubmit (%d)",

						hdev->name, urb, -err);

		bt_dev_err(hdev, "urb %p failed to resubmit (%d)", urb, -err);

		usb_unanchor_urb(urb);

	}

}
@@ -164,8 +163,7 @@ static inline int bpa10x_submit_intr_urb(struct hci_dev *hdev) 


	err = usb_submit_urb(urb, GFP_KERNEL);

	if (err < 0) {

		BT_ERR("%s urb %p submission failed (%d)",

						hdev->name, urb, -err);

		bt_dev_err(hdev, "urb %p submission failed (%d)", urb, -err);

		usb_unanchor_urb(urb);

	}
@@ -205,8 +203,7 @@ static inline int bpa10x_submit_bulk_urb(struct hci_dev *hdev) 


	err = usb_submit_urb(urb, GFP_KERNEL);

	if (err < 0) {

		BT_ERR("%s urb %p submission failed (%d)",

						hdev->name, urb, -err);

		bt_dev_err(hdev, "urb %p submission failed (%d)", urb, -err);

		usb_unanchor_urb(urb);

	}
@@ -272,7 +269,7 @@ static int bpa10x_setup(struct hci_dev *hdev) 
	if (IS_ERR(skb))

		return PTR_ERR(skb);



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

	bt_dev_info(hdev, "%s", (char *)(skb->data + 1));



	hci_set_fw_info(hdev, "%s", skb->data + 1);
@@ -348,7 +345,7 @@ static int bpa10x_send_frame(struct hci_dev *hdev, struct sk_buff *skb) 


	err = usb_submit_urb(urb, GFP_ATOMIC);

	if (err < 0) {

		BT_ERR("%s urb %p submission failed", hdev->name, urb);

		bt_dev_err(hdev, "urb %p submission failed", urb);

		kfree(urb->setup_packet);

		usb_unanchor_urb(urb);

	}

drivers/bluetooth/bt3c_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ static irqreturn_t bt3c_interrupt(int irq, void *dev_inst) 
		} else if ((stat & 0xff) != 0xff) {

			if (stat & 0x0020) {

				int status = bt3c_read(iobase, 0x7002) & 0x10;

				BT_INFO("%s: Antenna %s", info->hdev->name,

				bt_dev_info(info->hdev, "Antenna %s",

							status ? "out" : "in");

			}

			if (stat & 0x0001)

drivers/bluetooth/btbcm.c

+50 −53
Original line number Diff line number Diff line
@@ -45,13 +45,12 @@ int btbcm_check_bdaddr(struct hci_dev *hdev) 
			     HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		int err = PTR_ERR(skb);

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

		       hdev->name, err);

		bt_dev_err(hdev, "BCM: Reading device address failed (%d)", err);

		return err;

	}



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

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

		bt_dev_err(hdev, "BCM: Device address length mismatch");

		kfree_skb(skb);

		return -EIO;

	}
@@ -74,8 +73,8 @@ int btbcm_check_bdaddr(struct hci_dev *hdev) 
	if (!bacmp(&bda->bdaddr, BDADDR_BCM20702A0) ||

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

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

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

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

		bt_dev_info(hdev, "BCM: Using default device address (%pMR)",

			    &bda->bdaddr);

		set_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks);

	}
@@ -93,8 +92,7 @@ int btbcm_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr) 
	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);

		bt_dev_err(hdev, "BCM: Change address command failed (%d)", err);

		return err;

	}

	kfree_skb(skb);
@@ -116,8 +114,8 @@ int btbcm_patchram(struct hci_dev *hdev, const struct firmware *fw) 
	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);

		bt_dev_err(hdev, "BCM: Download Minidrv command failed (%d)",

			   err);

		goto done;

	}

	kfree_skb(skb);
@@ -136,7 +134,7 @@ int btbcm_patchram(struct hci_dev *hdev, const struct firmware *fw) 
		fw_size -= sizeof(*cmd);



		if (fw_size < cmd->plen) {

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

			bt_dev_err(hdev, "BCM: Patch is corrupted");

			err = -EINVAL;

			goto done;

		}
@@ -151,8 +149,8 @@ int btbcm_patchram(struct hci_dev *hdev, const struct firmware *fw) 
				     HCI_INIT_TIMEOUT);

		if (IS_ERR(skb)) {

			err = PTR_ERR(skb);

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

			       hdev->name, opcode, err);

			bt_dev_err(hdev, "BCM: Patch command %04x failed (%d)",

				   opcode, err);

			goto done;

		}

		kfree_skb(skb);
@@ -173,7 +171,7 @@ static int btbcm_reset(struct hci_dev *hdev) 
	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);

		bt_dev_err(hdev, "BCM: Reset failed (%d)", err);

		return err;

	}

	kfree_skb(skb);
@@ -191,13 +189,13 @@ static struct sk_buff *btbcm_read_local_name(struct hci_dev *hdev) 
	skb = __hci_cmd_sync(hdev, HCI_OP_READ_LOCAL_NAME, 0, NULL,

			     HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

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

		       hdev->name, PTR_ERR(skb));

		bt_dev_err(hdev, "BCM: Reading local name failed (%ld)",

			   PTR_ERR(skb));

		return skb;

	}



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

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

		bt_dev_err(hdev, "BCM: Local name length mismatch");

		kfree_skb(skb);

		return ERR_PTR(-EIO);

	}
@@ -212,13 +210,13 @@ static struct sk_buff *btbcm_read_local_version(struct hci_dev *hdev) 
	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));

		bt_dev_err(hdev, "BCM: Reading local version info failed (%ld)",

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

		bt_dev_err(hdev, "BCM: Local version length mismatch");

		kfree_skb(skb);

		return ERR_PTR(-EIO);

	}
@@ -232,13 +230,13 @@ static struct sk_buff *btbcm_read_verbose_config(struct hci_dev *hdev) 


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

		bt_dev_err(hdev, "BCM: Read verbose config info failed (%ld)",

			   PTR_ERR(skb));

		return skb;

	}



	if (skb->len != 7) {

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

		bt_dev_err(hdev, "BCM: Verbose config length mismatch");

		kfree_skb(skb);

		return ERR_PTR(-EIO);

	}
@@ -252,14 +250,13 @@ static struct sk_buff *btbcm_read_controller_features(struct hci_dev *hdev) 


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

	if (IS_ERR(skb)) {

		BT_ERR("%s: BCM: Read controller features failed (%ld)",

		       hdev->name, PTR_ERR(skb));

		bt_dev_err(hdev, "BCM: Read controller features failed (%ld)",

			   PTR_ERR(skb));

		return skb;

	}



	if (skb->len != 9) {

		BT_ERR("%s: BCM: Controller features length mismatch",

		       hdev->name);

		bt_dev_err(hdev, "BCM: Controller features length mismatch");

		kfree_skb(skb);

		return ERR_PTR(-EIO);

	}
@@ -273,13 +270,13 @@ static struct sk_buff *btbcm_read_usb_product(struct hci_dev *hdev) 


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

		bt_dev_err(hdev, "BCM: Read USB product info failed (%ld)",

			   PTR_ERR(skb));

		return skb;

	}



	if (skb->len != 5) {

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

		bt_dev_err(hdev, "BCM: USB product length mismatch");

		kfree_skb(skb);

		return ERR_PTR(-EIO);

	}
@@ -296,7 +293,7 @@ static int btbcm_read_info(struct hci_dev *hdev) 
	if (IS_ERR(skb))

		return PTR_ERR(skb);



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

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

	kfree_skb(skb);



	/* Read Controller Features */
@@ -304,7 +301,7 @@ static int btbcm_read_info(struct hci_dev *hdev) 
	if (IS_ERR(skb))

		return PTR_ERR(skb);



	BT_INFO("%s: BCM: features 0x%2.2x", hdev->name, skb->data[1]);

	bt_dev_info(hdev, "BCM: features 0x%2.2x", skb->data[1]);

	kfree_skb(skb);



	/* Read Local Name */
@@ -312,7 +309,7 @@ static int btbcm_read_info(struct hci_dev *hdev) 
	if (IS_ERR(skb))

		return PTR_ERR(skb);



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

	bt_dev_info(hdev, "%s", (char *)(skb->data + 1));

	kfree_skb(skb);



	return 0;
@@ -378,7 +375,7 @@ int btbcm_initialize(struct hci_dev *hdev, char *fw_name, size_t len) 
		return 0;

	}



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

	bt_dev_info(hdev, "%s (%3.3u.%3.3u.%3.3u) build %4.4u",

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

		    (subver & 0x1f00) >> 8, (subver & 0x00ff), rev & 0x0fff);
@@ -408,7 +405,7 @@ int btbcm_finalize(struct hci_dev *hdev) 
	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,

	bt_dev_info(hdev, "BCM (%3.3u.%3.3u.%3.3u) build %4.4u",

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

		    (subver & 0x00ff), rev & 0x0fff);
@@ -505,13 +502,13 @@ int btbcm_setup_patchram(struct hci_dev *hdev) 
		return 0;

	}



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

	bt_dev_info(hdev, "%s (%3.3u.%3.3u.%3.3u) build %4.4u",

		    hw_name ? : "BCM", (subver & 0xe000) >> 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);

		bt_dev_info(hdev, "BCM: Patch %s not found", fw_name);

		goto done;

	}
@@ -534,7 +531,7 @@ int btbcm_setup_patchram(struct hci_dev *hdev) 
	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,

	bt_dev_info(hdev, "%s (%3.3u.%3.3u.%3.3u) build %4.4u",

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

		    (subver & 0x1f00) >> 8, (subver & 0x00ff), rev & 0x0fff);
@@ -543,7 +540,7 @@ int btbcm_setup_patchram(struct hci_dev *hdev) 
	if (IS_ERR(skb))

		return PTR_ERR(skb);



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

	bt_dev_info(hdev, "%s", (char *)(skb->data + 1));

	kfree_skb(skb);



done:
@@ -568,7 +565,7 @@ int btbcm_setup_apple(struct hci_dev *hdev) 
	/* Read Verbose Config Version Info */

	skb = btbcm_read_verbose_config(hdev);

	if (!IS_ERR(skb)) {

		BT_INFO("%s: BCM: chip id %u build %4.4u", hdev->name,

		bt_dev_info(hdev, "BCM: chip id %u build %4.4u",

			    skb->data[1], get_unaligned_le16(skb->data + 5));

		kfree_skb(skb);

	}
@@ -576,7 +573,7 @@ int btbcm_setup_apple(struct hci_dev *hdev) 
	/* 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,

		bt_dev_info(hdev, "BCM: product %4.4x:%4.4x",

			    get_unaligned_le16(skb->data + 1),

			    get_unaligned_le16(skb->data + 3));

		kfree_skb(skb);
@@ -585,14 +582,14 @@ int btbcm_setup_apple(struct hci_dev *hdev) 
	/* Read Controller Features */

	skb = btbcm_read_controller_features(hdev);

	if (!IS_ERR(skb)) {

		BT_INFO("%s: BCM: features 0x%2.2x", hdev->name, skb->data[1]);

		bt_dev_info(hdev, "BCM: features 0x%2.2x", skb->data[1]);

		kfree_skb(skb);

	}



	/* Read Local Name */

	skb = btbcm_read_local_name(hdev);

	if (!IS_ERR(skb)) {

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

		bt_dev_info(hdev, "%s", (char *)(skb->data + 1));

		kfree_skb(skb);

	}

drivers/bluetooth/btintel.c

+21 −21
Original line number Diff line number Diff line
@@ -43,13 +43,13 @@ int btintel_check_bdaddr(struct hci_dev *hdev) 
			     HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		int err = PTR_ERR(skb);

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

		       hdev->name, err);

		bt_dev_err(hdev, "Reading Intel device address failed (%d)",

			   err);

		return err;

	}



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

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

		bt_dev_err(hdev, "Intel device address length mismatch");

		kfree_skb(skb);

		return -EIO;

	}
@@ -62,8 +62,8 @@ int btintel_check_bdaddr(struct hci_dev *hdev) 
	 * 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);

		bt_dev_err(hdev, "Found Intel default device address (%pMR)",

			   &bda->bdaddr);

		set_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks);

	}
@@ -123,8 +123,8 @@ int btintel_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr) 
	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);

		bt_dev_err(hdev, "Changing Intel device address failed (%d)",

			   err);

		return err;

	}

	kfree_skb(skb);
@@ -154,8 +154,8 @@ int btintel_set_diag(struct hci_dev *hdev, bool enable) 
		err = PTR_ERR(skb);

		if (err == -ENODATA)

			goto done;

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

		       hdev->name, err);

		bt_dev_err(hdev, "Changing Intel diagnostic mode failed (%d)",

			   err);

		return err;

	}

	kfree_skb(skb);
@@ -189,30 +189,30 @@ 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);

	bt_dev_err(hdev, "Hardware error 0x%2.2x", 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));

		bt_dev_err(hdev, "Reset after hardware error failed (%ld)",

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

		bt_dev_err(hdev, "Retrieving Intel exception info failed (%ld)",

			   PTR_ERR(skb));

		return;

	}



	if (skb->len != 13) {

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

		bt_dev_err(hdev, "Exception info size mismatch");

		kfree_skb(skb);

		return;

	}



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

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



	kfree_skb(skb);

}
@@ -233,9 +233,10 @@ void btintel_version_info(struct hci_dev *hdev, struct intel_version *ver) 
		return;

	}



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

	bt_dev_info(hdev, "%s revision %u.%u build %u week %u %u",

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

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

		    ver->fw_build_num, ver->fw_build_ww,

		    2000 + ver->fw_build_yy);

}

EXPORT_SYMBOL_GPL(btintel_version_info);
@@ -321,8 +322,7 @@ int btintel_set_event_mask(struct hci_dev *hdev, bool debug) 
	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);

		bt_dev_err(hdev, "Setting Intel event mask failed (%d)", err);

		return err;

	}

	kfree_skb(skb);

drivers/bluetooth/btqca.c

+3 −3
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ static int rome_download_firmware(struct hci_dev *hdev, 
	const struct firmware *fw;

	int ret;



	BT_INFO("%s: ROME Downloading %s", hdev->name, config->fwname);

	bt_dev_info(hdev, "ROME Downloading %s", config->fwname);



	ret = request_firmware(&fw, config->fwname, &hdev->dev);

	if (ret) {
@@ -351,7 +351,7 @@ int qca_uart_setup_rome(struct hci_dev *hdev, uint8_t baudrate) 
		return err;

	}



	BT_INFO("%s: ROME controller version 0x%08x", hdev->name, rome_ver);

	bt_dev_info(hdev, "ROME controller version 0x%08x", rome_ver);



	/* Download rampatch file */

	config.type = TLV_TYPE_PATCH;
@@ -380,7 +380,7 @@ int qca_uart_setup_rome(struct hci_dev *hdev, uint8_t baudrate) 
		return err;

	}



	BT_INFO("%s: ROME setup on UART is completed", hdev->name);

	bt_dev_info(hdev, "ROME setup on UART is completed");



	return 0;

}