Commit 828da432 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-06-04

Here's one last bluetooth-next pull request for the 4.18 kernel:

 - New USB device IDs for Realtek 8822BE and 8723DE
 - reset/resume fix for Dell Inspiron 5565
 - Fix HCI_UART_INIT_PENDING flag behavior
 - Fix patching behavior for some ATH3012 models
 - A few other minor cleanups & fixes

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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents bb38ccce 1cd2fabf

drivers/bluetooth/btmrvl_debugfs.c

+3 −52
Original line number Diff line number Diff line
@@ -35,15 +35,9 @@ static ssize_t btmrvl_hscfgcmd_write(struct file *file, 
			const char __user *ubuf, size_t count, loff_t *ppos)

{

	struct btmrvl_private *priv = file->private_data;

	char buf[16];

	long result, ret;



	memset(buf, 0, sizeof(buf));



	if (copy_from_user(&buf, ubuf, min_t(size_t, sizeof(buf) - 1, count)))

		return -EFAULT;



	ret = kstrtol(buf, 10, &result);

	ret = kstrtol_from_user(ubuf, count, 10, &result);

	if (ret)

		return ret;
@@ -81,15 +75,9 @@ static ssize_t btmrvl_pscmd_write(struct file *file, const char __user *ubuf, 
						size_t count, loff_t *ppos)

{

	struct btmrvl_private *priv = file->private_data;

	char buf[16];

	long result, ret;



	memset(buf, 0, sizeof(buf));



	if (copy_from_user(&buf, ubuf, min_t(size_t, sizeof(buf) - 1, count)))

		return -EFAULT;



	ret = kstrtol(buf, 10, &result);

	ret = kstrtol_from_user(ubuf, count, 10, &result);

	if (ret)

		return ret;
@@ -127,15 +115,9 @@ static ssize_t btmrvl_hscmd_write(struct file *file, const char __user *ubuf, 
						size_t count, loff_t *ppos)

{

	struct btmrvl_private *priv = file->private_data;

	char buf[16];

	long result, ret;



	memset(buf, 0, sizeof(buf));



	if (copy_from_user(&buf, ubuf, min_t(size_t, sizeof(buf) - 1, count)))

		return -EFAULT;



	ret = kstrtol(buf, 10, &result);

	ret = kstrtol_from_user(ubuf, count, 10, &result);

	if (ret)

		return ret;
@@ -167,35 +149,6 @@ static const struct file_operations btmrvl_hscmd_fops = { 
	.llseek = default_llseek,

};



static ssize_t btmrvl_fwdump_write(struct file *file, const char __user *ubuf,

				   size_t count, loff_t *ppos)

{

	struct btmrvl_private *priv = file->private_data;

	char buf[16];

	bool result;



	memset(buf, 0, sizeof(buf));



	if (copy_from_user(&buf, ubuf, min_t(size_t, sizeof(buf) - 1, count)))

		return -EFAULT;



	if (strtobool(buf, &result))

		return -EINVAL;



	if (!result)

		return -EINVAL;



	btmrvl_firmware_dump(priv);



	return count;

}



static const struct file_operations btmrvl_fwdump_fops = {

	.write	= btmrvl_fwdump_write,

	.open	= simple_open,

	.llseek = default_llseek,

};



void btmrvl_debugfs_init(struct hci_dev *hdev)

{

	struct btmrvl_private *priv = hci_get_drvdata(hdev);
@@ -226,8 +179,6 @@ void btmrvl_debugfs_init(struct hci_dev *hdev) 
			    priv, &btmrvl_hscmd_fops);

	debugfs_create_file("hscfgcmd", 0644, dbg->config_dir,

			    priv, &btmrvl_hscfgcmd_fops);

	debugfs_create_file("fw_dump", 0200, dbg->config_dir,

			    priv, &btmrvl_fwdump_fops);



	dbg->status_dir = debugfs_create_dir("status", hdev->debugfs);

	debugfs_create_u8("curpsmode", 0444, dbg->status_dir,

drivers/bluetooth/btmrvl_drv.h

+0 −2
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ struct btmrvl_private { 
				u8 *payload, u16 nb);

	int (*hw_wakeup_firmware)(struct btmrvl_private *priv);

	int (*hw_process_int_status)(struct btmrvl_private *priv);

	void (*firmware_dump)(struct btmrvl_private *priv);

	spinlock_t driver_lock;		/* spinlock used by driver */

#ifdef CONFIG_DEBUG_FS

	void *debugfs_data;
@@ -183,7 +182,6 @@ int btmrvl_send_hscfg_cmd(struct btmrvl_private *priv); 
int btmrvl_enable_ps(struct btmrvl_private *priv);

int btmrvl_prepare_command(struct btmrvl_private *priv);

int btmrvl_enable_hs(struct btmrvl_private *priv);

void btmrvl_firmware_dump(struct btmrvl_private *priv);



#ifdef CONFIG_DEBUG_FS

void btmrvl_debugfs_init(struct hci_dev *hdev);

drivers/bluetooth/btmrvl_main.c

+0 −6
Original line number Diff line number Diff line
@@ -358,12 +358,6 @@ int btmrvl_prepare_command(struct btmrvl_private *priv) 
	return ret;

}



void btmrvl_firmware_dump(struct btmrvl_private *priv)

{

	if (priv->firmware_dump)

		priv->firmware_dump(priv);

}



static int btmrvl_tx_pkt(struct btmrvl_private *priv, struct sk_buff *skb)

{

	int ret = 0;

drivers/bluetooth/btmrvl_sdio.c

+8 −3
Original line number Diff line number Diff line
@@ -1311,9 +1311,11 @@ rdwr_status btmrvl_sdio_rdwr_firmware(struct btmrvl_private *priv, 
}



/* This function dump sdio register and memory data */

static void btmrvl_sdio_dump_firmware(struct btmrvl_private *priv)

static void btmrvl_sdio_coredump(struct device *dev)

{

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

	struct sdio_func *func = dev_to_sdio_func(dev);

	struct btmrvl_sdio_card *card;

	struct btmrvl_private *priv;

	int ret = 0;

	unsigned int reg, reg_start, reg_end;

	enum rdwr_status stat;
@@ -1321,6 +1323,9 @@ static void btmrvl_sdio_dump_firmware(struct btmrvl_private *priv) 
	u8 dump_num = 0, idx, i, read_reg, doneflag = 0;

	u32 memory_size, fw_dump_len = 0;



	card = sdio_get_drvdata(func);

	priv = card->priv;



	/* dump sdio register first */

	btmrvl_sdio_dump_regs(priv);
@@ -1547,7 +1552,6 @@ static int btmrvl_sdio_probe(struct sdio_func *func, 
	priv->hw_host_to_card = btmrvl_sdio_host_to_card;

	priv->hw_wakeup_firmware = btmrvl_sdio_wakeup_fw;

	priv->hw_process_int_status = btmrvl_sdio_process_int_status;

	priv->firmware_dump = btmrvl_sdio_dump_firmware;



	if (btmrvl_register_hdev(priv)) {

		BT_ERR("Register hdev failed!");
@@ -1717,6 +1721,7 @@ static struct sdio_driver bt_mrvl_sdio = { 
	.remove		= btmrvl_sdio_remove,

	.drv = {

		.owner = THIS_MODULE,

		.coredump = btmrvl_sdio_coredump,

		.pm = &btmrvl_sdio_pm_ops,

	}

};

drivers/bluetooth/btusb.c

+36 −7
Original line number Diff line number Diff line
@@ -373,6 +373,9 @@ static const struct usb_device_id blacklist_table[] = { 
	/* Additional Realtek 8723BU Bluetooth devices */

	{ USB_DEVICE(0x7392, 0xa611), .driver_info = BTUSB_REALTEK },



	/* Additional Realtek 8723DE Bluetooth devices */

	{ USB_DEVICE(0x2ff8, 0xb011), .driver_info = BTUSB_REALTEK },



	/* Additional Realtek 8821AE Bluetooth devices */

	{ USB_DEVICE(0x0b05, 0x17dc), .driver_info = BTUSB_REALTEK },

	{ USB_DEVICE(0x13d3, 0x3414), .driver_info = BTUSB_REALTEK },
@@ -381,6 +384,7 @@ static const struct usb_device_id blacklist_table[] = { 
	{ USB_DEVICE(0x13d3, 0x3462), .driver_info = BTUSB_REALTEK },



	/* Additional Realtek 8822BE Bluetooth devices */

	{ USB_DEVICE(0x13d3, 0x3526), .driver_info = BTUSB_REALTEK },

	{ USB_DEVICE(0x0b05, 0x185c), .driver_info = BTUSB_REALTEK },



	/* Silicon Wave based devices */
@@ -408,6 +412,13 @@ static const struct dmi_system_id btusb_needs_reset_resume_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "XPS 13 9360"),

		},

	},

	{

		/* Dell Inspiron 5565 (QCA ROME device 0cf3:e009) */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),

			DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 5565"),

		},

	},

	{}

};
@@ -2499,11 +2510,9 @@ static const struct qca_device_info qca_devices_table[] = { 
	{ 0x00000302, 28, 4, 18 }, /* Rome 3.2 */

};



static int btusb_qca_send_vendor_req(struct hci_dev *hdev, u8 request,

static int btusb_qca_send_vendor_req(struct usb_device *udev, u8 request,

				     void *data, u16 size)

{

	struct btusb_data *btdata = hci_get_drvdata(hdev);

	struct usb_device *udev = btdata->udev;

	int pipe, err;

	u8 *buf;
@@ -2518,7 +2527,7 @@ static int btusb_qca_send_vendor_req(struct hci_dev *hdev, u8 request, 
	err = usb_control_msg(udev, pipe, request, USB_TYPE_VENDOR | USB_DIR_IN,

			      0, 0, buf, size, USB_CTRL_SET_TIMEOUT);

	if (err < 0) {

		bt_dev_err(hdev, "Failed to access otp area (%d)", err);

		dev_err(&udev->dev, "Failed to access otp area (%d)", err);

		goto done;

	}
@@ -2668,20 +2677,38 @@ static int btusb_setup_qca_load_nvm(struct hci_dev *hdev, 
	return err;

}



/* identify the ROM version and check whether patches are needed */

static bool btusb_qca_need_patch(struct usb_device *udev)

{

	struct qca_version ver;



	if (btusb_qca_send_vendor_req(udev, QCA_GET_TARGET_VERSION, &ver,

				      sizeof(ver)) < 0)

		return false;

	/* only low ROM versions need patches */

	return !(le32_to_cpu(ver.rom_version) & ~0xffffU);

}



static int btusb_setup_qca(struct hci_dev *hdev)

{

	struct btusb_data *btdata = hci_get_drvdata(hdev);

	struct usb_device *udev = btdata->udev;

	const struct qca_device_info *info = NULL;

	struct qca_version ver;

	u32 ver_rom;

	u8 status;

	int i, err;



	err = btusb_qca_send_vendor_req(hdev, QCA_GET_TARGET_VERSION, &ver,

	err = btusb_qca_send_vendor_req(udev, QCA_GET_TARGET_VERSION, &ver,

					sizeof(ver));

	if (err < 0)

		return err;



	ver_rom = le32_to_cpu(ver.rom_version);

	/* Don't care about high ROM versions */

	if (ver_rom & ~0xffffU)

		return 0;



	for (i = 0; i < ARRAY_SIZE(qca_devices_table); i++) {

		if (ver_rom == qca_devices_table[i].rom_version)

			info = &qca_devices_table[i];
@@ -2691,7 +2718,7 @@ static int btusb_setup_qca(struct hci_dev *hdev) 
		return -ENODEV;

	}



	err = btusb_qca_send_vendor_req(hdev, QCA_CHECK_STATUS, &status,

	err = btusb_qca_send_vendor_req(udev, QCA_CHECK_STATUS, &status,

					sizeof(status));

	if (err < 0)

		return err;
@@ -2905,7 +2932,8 @@ static int btusb_probe(struct usb_interface *intf, 
		/* Old firmware would otherwise let ath3k driver load

		 * patch and sysconfig files

		 */

		if (le16_to_cpu(udev->descriptor.bcdDevice) <= 0x0001)

		if (le16_to_cpu(udev->descriptor.bcdDevice) <= 0x0001 &&

		    !btusb_qca_need_patch(udev))

			return -ENODEV;

	}
@@ -3067,6 +3095,7 @@ static int btusb_probe(struct usb_interface *intf, 
	}



	if (id->driver_info & BTUSB_ATH3012) {

		data->setup_on_usb = btusb_setup_qca;

		hdev->set_bdaddr = btusb_set_bdaddr_ath3012;

		set_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &hdev->quirks);

		set_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks);

CRA Git | Maintained and supported by SUSTech CRA and CCSE