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

Commit 0ba3deb3 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 2016-07-13

Here's our main bluetooth-next pull request for the 4.8 kernel:

 - Fixes and cleanups in 802.15.4 and 6LoWPAN code
 - Fix out of bounds issue in btmrvl driver
 - Fixes to Bluetooth socket recvmsg return values
 - Use crypto_cipher_encrypt_one() instead of crypto_skcipher
 - Cleanup of Bluetooth connection sysfs interface
 - New Authentication failure reson code for Disconnected mgmt event
 - New USB IDs for Atheros, Qualcomm and Intel Bluetooth controllers

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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6e076537 87510973

drivers/bluetooth/ath3k.c

+2 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ static const struct usb_device_id ath3k_table[] = { 
	{ USB_DEVICE(0x13d3, 0x3472) },

	{ USB_DEVICE(0x13d3, 0x3474) },

	{ USB_DEVICE(0x13d3, 0x3487) },

	{ USB_DEVICE(0x13d3, 0x3490) },



	/* Atheros AR5BBU12 with sflash firmware */

	{ USB_DEVICE(0x0489, 0xE02C) },
@@ -190,6 +191,7 @@ static const struct usb_device_id ath3k_blist_tbl[] = { 
	{ USB_DEVICE(0x13d3, 0x3472), .driver_info = BTUSB_ATH3012 },

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

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

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



	/* Atheros AR5BBU22 with sflash firmware */

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

drivers/bluetooth/btmrvl_main.c

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb) 
			if (event->length > 3 && event->data[3])

				priv->btmrvl_dev.dev_type = HCI_AMP;

			else

				priv->btmrvl_dev.dev_type = HCI_BREDR;

				priv->btmrvl_dev.dev_type = HCI_PRIMARY;



			BT_DBG("dev_type: %d", priv->btmrvl_dev.dev_type);

		} else if (priv->btmrvl_dev.sendcmdflag &&

drivers/bluetooth/btmrvl_sdio.c

+7 −7
Original line number Diff line number Diff line
@@ -1071,7 +1071,6 @@ static int btmrvl_sdio_host_to_card(struct btmrvl_private *priv, 
{

	struct btmrvl_sdio_card *card = priv->btmrvl_dev.card;

	int ret = 0;

	int buf_block_len;

	int blksz;

	int i = 0;

	u8 *buf = NULL;
@@ -1083,9 +1082,13 @@ static int btmrvl_sdio_host_to_card(struct btmrvl_private *priv, 
		return -EINVAL;

	}



	blksz = DIV_ROUND_UP(nb, SDIO_BLOCK_SIZE) * SDIO_BLOCK_SIZE;



	buf = payload;

	if ((unsigned long) payload & (BTSDIO_DMA_ALIGN - 1)) {

		tmpbufsz = ALIGN_SZ(nb, BTSDIO_DMA_ALIGN);

	if ((unsigned long) payload & (BTSDIO_DMA_ALIGN - 1) ||

	    nb < blksz) {

		tmpbufsz = ALIGN_SZ(blksz, BTSDIO_DMA_ALIGN) +

			   BTSDIO_DMA_ALIGN;

		tmpbuf = kzalloc(tmpbufsz, GFP_KERNEL);

		if (!tmpbuf)

			return -ENOMEM;
@@ -1093,15 +1096,12 @@ static int btmrvl_sdio_host_to_card(struct btmrvl_private *priv, 
		memcpy(buf, payload, nb);

	}



	blksz = SDIO_BLOCK_SIZE;

	buf_block_len = DIV_ROUND_UP(nb, blksz);



	sdio_claim_host(card->func);



	do {

		/* Transfer data to card */

		ret = sdio_writesb(card->func, card->ioport, buf,

				   buf_block_len * blksz);

				   blksz);

		if (ret < 0) {

			i++;

			BT_ERR("i=%d writesb failed: %d", i, ret);

drivers/bluetooth/btsdio.c

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ static int btsdio_probe(struct sdio_func *func, 
	if (id->class == SDIO_CLASS_BT_AMP)

		hdev->dev_type = HCI_AMP;

	else

		hdev->dev_type = HCI_BREDR;

		hdev->dev_type = HCI_PRIMARY;



	data->hdev = hdev;

drivers/bluetooth/btusb.c

+13 −5
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ static const struct usb_device_id blacklist_table[] = { 
	{ USB_DEVICE(0x13d3, 0x3472), .driver_info = BTUSB_ATH3012 },

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

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

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



	/* Atheros AR5BBU12 with sflash firmware */

	{ USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },
@@ -249,6 +250,7 @@ static const struct usb_device_id blacklist_table[] = { 
	{ USB_DEVICE(0x0cf3, 0xe007), .driver_info = BTUSB_QCA_ROME },

	{ USB_DEVICE(0x0cf3, 0xe300), .driver_info = BTUSB_QCA_ROME },

	{ USB_DEVICE(0x0cf3, 0xe360), .driver_info = BTUSB_QCA_ROME },

	{ USB_DEVICE(0x0489, 0xe092), .driver_info = BTUSB_QCA_ROME },



	/* Broadcom BCM2035 */

	{ USB_DEVICE(0x0a5c, 0x2009), .driver_info = BTUSB_BCM92035 },
@@ -314,6 +316,7 @@ static const struct usb_device_id blacklist_table[] = { 
	{ USB_DEVICE(0x8087, 0x07dc), .driver_info = BTUSB_INTEL },

	{ USB_DEVICE(0x8087, 0x0a2a), .driver_info = BTUSB_INTEL },

	{ USB_DEVICE(0x8087, 0x0a2b), .driver_info = BTUSB_INTEL_NEW },

	{ USB_DEVICE(0x8087, 0x0aa7), .driver_info = BTUSB_INTEL },



	/* Other Intel Bluetooth devices */

	{ USB_VENDOR_AND_INTERFACE_INFO(0x8087, 0xe0, 0x01, 0x01),
@@ -2103,10 +2106,14 @@ static int btusb_setup_intel_new(struct hci_dev *hdev) 
	/* With this Intel bootloader only the hardware variant and device

	 * revision information are used to select the right firmware.

	 *

	 * Currently this bootloader support is limited to hardware variant

	 * iBT 3.0 (LnP/SfP) which is identified by the value 11 (0x0b).

	 * The firmware filename is ibt-<hw_variant>-<dev_revid>.sfi.

	 *

	 * Currently the supported hardware variants are:

	 *   11 (0x0b) for iBT3.0 (LnP/SfP)

	 *   12 (0x0c) for iBT3.5 (WsP)

	 */

	snprintf(fwname, sizeof(fwname), "intel/ibt-11-%u.sfi",

	snprintf(fwname, sizeof(fwname), "intel/ibt-%u-%u.sfi",

		 le16_to_cpu(ver.hw_variant),

		 le16_to_cpu(params->dev_revid));



	err = request_firmware(&fw, fwname, &hdev->dev);
@@ -2122,7 +2129,8 @@ static int btusb_setup_intel_new(struct hci_dev *hdev) 
	/* Save the DDC file name for later use to apply once the firmware

	 * downloading is done.

	 */

	snprintf(fwname, sizeof(fwname), "intel/ibt-11-%u.ddc",

	snprintf(fwname, sizeof(fwname), "intel/ibt-%u-%u.ddc",

		 le16_to_cpu(ver.hw_variant),

		 le16_to_cpu(params->dev_revid));



	kfree_skb(skb);
@@ -2825,7 +2833,7 @@ static int btusb_probe(struct usb_interface *intf, 
	if (id->driver_info & BTUSB_AMP)

		hdev->dev_type = HCI_AMP;

	else

		hdev->dev_type = HCI_BREDR;

		hdev->dev_type = HCI_PRIMARY;



	data->hdev = hdev;