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

Commit 00538ba9 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 2018-09-30

Here's the first bluetooth-next pull request for the 4.20 kernel.

 - Fixes & cleanups to hci_qca driver
 - NULL dereference fix to debugfs
 - Improved L2CAP Connection-oriented Channel MTU & MPS handling
 - Added support for USB-based RTL8822C controller
 - Added device ID for BCM4335C0 UART-based controller
 - Various other smaller cleanups & fixes

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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 258b6d14 30d65e08

drivers/bluetooth/ath3k.c

+6 −5
Original line number Diff line number Diff line
@@ -203,10 +203,11 @@ static const struct usb_device_id ath3k_blist_tbl[] = { 
	{ }	/* Terminating entry */

};



static inline void ath3k_log_failed_loading(int err, int len, int size)

static inline void ath3k_log_failed_loading(int err, int len, int size,

					    int count)

{

	BT_ERR("Error in firmware loading err = %d, len = %d, size = %d",

			err, len, size);

	BT_ERR("Firmware loading err = %d, len = %d, size = %d, count = %d",

	       err, len, size, count);

}



#define USB_REQ_DFU_DNLOAD	1
@@ -257,7 +258,7 @@ static int ath3k_load_firmware(struct usb_device *udev, 
					&len, 3000);



		if (err || (len != size)) {

			ath3k_log_failed_loading(err, len, size);

			ath3k_log_failed_loading(err, len, size, count);

			goto error;

		}
@@ -356,7 +357,7 @@ static int ath3k_load_fwfile(struct usb_device *udev, 
		err = usb_bulk_msg(udev, pipe, send_buf, size,

					&len, 3000);

		if (err || (len != size)) {

			ath3k_log_failed_loading(err, len, size);

			ath3k_log_failed_loading(err, len, size, count);

			kfree(send_buf);

			return err;

		}

drivers/bluetooth/bt3c_cs.c

+6 −3
Original line number Diff line number Diff line
@@ -448,7 +448,7 @@ static int bt3c_load_firmware(struct bt3c_info *info, 
{

	char *ptr = (char *) firmware;

	char b[9];

	unsigned int iobase, tmp;

	unsigned int iobase, tmp, tn;

	unsigned long size, addr, fcs;

	int i, err = 0;
@@ -490,7 +490,9 @@ static int bt3c_load_firmware(struct bt3c_info *info, 
		memset(b, 0, sizeof(b));

		for (tmp = 0, i = 0; i < size; i++) {

			memcpy(b, ptr + (i * 2) + 2, 2);

			tmp += simple_strtol(b, NULL, 16);

			if (kstrtouint(b, 16, &tn))

				return -EINVAL;

			tmp += tn;

		}



		if (((tmp + fcs) & 0xff) != 0xff) {
@@ -505,7 +507,8 @@ static int bt3c_load_firmware(struct bt3c_info *info, 
			memset(b, 0, sizeof(b));

			for (i = 0; i < (size - 4) / 2; i++) {

				memcpy(b, ptr + (i * 4) + 12, 4);

				tmp = simple_strtoul(b, NULL, 16);

				if (kstrtouint(b, 16, &tmp))

					return -EINVAL;

				bt3c_put(iobase, tmp);

			}

		}

drivers/bluetooth/btbcm.c

+1 −0
Original line number Diff line number Diff line
@@ -324,6 +324,7 @@ static const struct bcm_subver_table bcm_uart_subver_table[] = { 
	{ 0x4103, "BCM4330B1"	},	/* 002.001.003 */

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

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

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

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

	{ 0x2122, "BCM4343A0"	},	/* 001.001.034 */

	{ 0x2209, "BCM43430A1"  },	/* 001.002.009 */

drivers/bluetooth/btrsi.c

+12 −1
Original line number Diff line number Diff line
@@ -21,8 +21,9 @@ 
#include <net/rsi_91x.h>

#include <net/genetlink.h>



#define RSI_HEADROOM_FOR_BT_HAL	16

#define RSI_DMA_ALIGN	8

#define RSI_FRAME_DESC_SIZE	16

#define RSI_HEADROOM_FOR_BT_HAL	(RSI_FRAME_DESC_SIZE + RSI_DMA_ALIGN)



struct rsi_hci_adapter {

	void *priv;
@@ -70,6 +71,16 @@ static int rsi_hci_send_pkt(struct hci_dev *hdev, struct sk_buff *skb) 
		bt_cb(new_skb)->pkt_type = hci_skb_pkt_type(skb);

		kfree_skb(skb);

		skb = new_skb;

		if (!IS_ALIGNED((unsigned long)skb->data, RSI_DMA_ALIGN)) {

			u8 *skb_data = skb->data;

			int skb_len = skb->len;



			skb_push(skb, RSI_DMA_ALIGN);

			skb_pull(skb, PTR_ALIGN(skb->data,

						RSI_DMA_ALIGN) - skb->data);

			memmove(skb->data, skb_data, skb_len);

			skb_trim(skb, skb_len);

		}

	}



	return h_adapter->proto_ops->coex_send_pkt(h_adapter->priv, skb,

drivers/bluetooth/btrtl.c

+9 −1
Original line number Diff line number Diff line
@@ -138,6 +138,13 @@ static const struct id_table ic_id_table[] = { 
	  .fw_name  = "rtl_bt/rtl8761a_fw.bin",

	  .cfg_name = "rtl_bt/rtl8761a_config" },



	/* 8822C with USB interface */

	{ IC_INFO(RTL_ROM_LMP_8822B, 0xc),

	  .config_needed = false,

	  .has_rom_version = true,

	  .fw_name  = "rtl_bt/rtl8822cu_fw.bin",

	  .cfg_name = "rtl_bt/rtl8822cu_config" },



	/* 8822B */

	{ IC_INFO(RTL_ROM_LMP_8822B, 0xb),

	  .config_needed = true,
@@ -206,7 +213,7 @@ static int rtlbt_parse_firmware(struct hci_dev *hdev, 
				struct btrtl_device_info *btrtl_dev,

				unsigned char **_buf)

{

	const u8 extension_sig[] = { 0x51, 0x04, 0xfd, 0x77 };

	static const u8 extension_sig[] = { 0x51, 0x04, 0xfd, 0x77 };

	struct rtl_epatch_header *epatch_info;

	unsigned char *buf;

	int i, len;
@@ -228,6 +235,7 @@ static int rtlbt_parse_firmware(struct hci_dev *hdev, 
		{ RTL_ROM_LMP_8822B, 8 },

		{ RTL_ROM_LMP_8723B, 9 },	/* 8723D */

		{ RTL_ROM_LMP_8821A, 10 },	/* 8821C */

		{ RTL_ROM_LMP_8822B, 13 },	/* 8822C */

	};



	min_size = sizeof(struct rtl_epatch_header) + sizeof(extension_sig) + 3;