Commit d2fcd013 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth 



Johan Hedberg says:

====================
pull request: bluetooth 2018-05-07

Here are a few more Bluetooth fixes for the 4.17 kernel, all for the
btusb driver. Two relate to the needs_reset_resume table, and one is a
revert of a patch for Atheros 1525/QCA6174 which caused a regression for
some people.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2ba5622f 596b07a9

drivers/bluetooth/btusb.c

+15 −4
Original line number Diff line number Diff line
@@ -231,6 +231,7 @@ static const struct usb_device_id blacklist_table[] = { 
	{ USB_DEVICE(0x0930, 0x0227), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0b05, 0x17d0), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x0036), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x311d), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x311e), .driver_info = BTUSB_ATH3012 },
@@ -263,7 +264,6 @@ static const struct usb_device_id blacklist_table[] = { 
	{ USB_DEVICE(0x0489, 0xe03c), .driver_info = BTUSB_ATH3012 },



	/* QCA ROME chipset */

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

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

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

	{ USB_DEVICE(0x0cf3, 0xe010), .driver_info = BTUSB_QCA_ROME },
@@ -399,6 +399,13 @@ static const struct dmi_system_id btusb_needs_reset_resume_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 3060"),

		},

	},

	{

		/* Dell XPS 9360 (QCA ROME device 0cf3:e300) */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),

			DMI_MATCH(DMI_PRODUCT_NAME, "XPS 13 9360"),

		},

	},

	{}

};
@@ -2852,6 +2859,12 @@ static int btusb_config_oob_wake(struct hci_dev *hdev) 
}

#endif



static void btusb_check_needs_reset_resume(struct usb_interface *intf)

{

	if (dmi_check_system(btusb_needs_reset_resume_table))

		interface_to_usbdev(intf)->quirks |= USB_QUIRK_RESET_RESUME;

}



static int btusb_probe(struct usb_interface *intf,

		       const struct usb_device_id *id)

{
@@ -2974,9 +2987,6 @@ static int btusb_probe(struct usb_interface *intf, 
	hdev->send   = btusb_send_frame;

	hdev->notify = btusb_notify;



	if (dmi_check_system(btusb_needs_reset_resume_table))

		interface_to_usbdev(intf)->quirks |= USB_QUIRK_RESET_RESUME;



#ifdef CONFIG_PM

	err = btusb_config_oob_wake(hdev);

	if (err)
@@ -3064,6 +3074,7 @@ static int btusb_probe(struct usb_interface *intf, 
		data->setup_on_usb = btusb_setup_qca;

		hdev->set_bdaddr = btusb_set_bdaddr_ath3012;

		set_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &hdev->quirks);

		btusb_check_needs_reset_resume(intf);

	}



#ifdef CONFIG_BT_HCIBTUSB_RTL

CRA Git | Maintained and supported by SUSTech CRA and CCSE