@@ -58,6 +58,7 @@ static struct usb_driver btusb_driver;
#define BTUSB_CW6622 0x100000
#define BTUSB_MEDIATEK 0x200000
#define BTUSB_WIDEBAND_SPEECH 0x400000
+#define BTUSB_MSFT_VND_EXT 0x800000
static const struct usb_device_id btusb_table[] = {
/* Generic Bluetooth USB device */
@@ -335,7 +336,8 @@ static const struct usb_device_id blacklist_table[] = {
/* Intel Bluetooth devices */
{ USB_DEVICE(0x8087, 0x0025), .driver_info = BTUSB_INTEL_NEW |
- BTUSB_WIDEBAND_SPEECH },
+ BTUSB_WIDEBAND_SPEECH |
+ BTUSB_MSFT_VND_EXT },
{ USB_DEVICE(0x8087, 0x0026), .driver_info = BTUSB_INTEL_NEW |
BTUSB_WIDEBAND_SPEECH },
{ USB_DEVICE(0x8087, 0x0029), .driver_info = BTUSB_INTEL_NEW |
@@ -348,7 +350,8 @@ static const struct usb_device_id blacklist_table[] = {
{ USB_DEVICE(0x8087, 0x0aa7), .driver_info = BTUSB_INTEL |
BTUSB_WIDEBAND_SPEECH },
{ USB_DEVICE(0x8087, 0x0aaa), .driver_info = BTUSB_INTEL_NEW |
- BTUSB_WIDEBAND_SPEECH },
+ BTUSB_WIDEBAND_SPEECH |
+ BTUSB_MSFT_VND_EXT },
/* Other Intel Bluetooth devices */
{ USB_VENDOR_AND_INTERFACE_INFO(0x8087, 0xe0, 0x01, 0x01),
@@ -3734,6 +3737,11 @@ static int btusb_probe(struct usb_interface *intf,
hdev->send = btusb_send_frame;
hdev->notify = btusb_notify;
+ hdev->msft_vnd_ext_opcode = HCI_OP_NOP;
+ hdev->msft_vnd_ext_features = 0;
+ hdev->msft_vnd_ext_evt_prefix_len = 0;
+ hdev->msft_vnd_ext_evt_prefix = NULL;
+
#ifdef CONFIG_PM
err = btusb_config_oob_wake(hdev);
if (err)
@@ -3800,6 +3808,12 @@ static int btusb_probe(struct usb_interface *intf,
set_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks);
set_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &hdev->quirks);
set_bit(HCI_QUIRK_NON_PERSISTENT_DIAG, &hdev->quirks);
+
+ if (id->driver_info & BTUSB_MSFT_VND_EXT &&
+ (id->idProduct == 0x0025 || id->idProduct == 0x0aaa)) {
+ hdev->msft_vnd_ext_opcode =
+ hci_opcode_pack(HCI_VND_DEBUG_CMD_OGF, 0x001E);
+ }
}
if (id->driver_info & BTUSB_MARVELL)
@@ -38,6 +38,8 @@
#define HCI_MAX_CSB_DATA_SIZE 252
+#define HCI_VND_DEBUG_CMD_OGF 0x3f
+
/* HCI dev events */
#define HCI_DEV_REG 1
#define HCI_DEV_UNREG 2
@@ -315,6 +315,10 @@ struct hci_dev {
__u8 ssp_debug_mode;
__u8 hw_error_code;
__u32 clock;
+ __u16 msft_vnd_ext_opcode;
+ __u64 msft_vnd_ext_features;
+ __u8 msft_vnd_ext_evt_prefix_len;
+ void *msft_vnd_ext_evt_prefix;
__u16 devid_source;
__u16 devid_vendor;
This adds a bit mask of driver_info for Microsoft vendor extension and indicates the support for Intel 9460/9560 and 9160/9260. See https://docs.microsoft.com/en-us/windows-hardware/drivers/bluetooth/ microsoft-defined-bluetooth-hci-commands-and-events for more information about the extension. This was verified with Intel ThunderPeak BT controller where msft_vnd_ext_opcode is 0xFC1E. Signed-off-by: Miao-chen Chou <mcchou@chromium.org> --- Changes in v1: - Add a bit mask of driver_info for Microsoft vendor extension. - Indicates the support of Microsoft vendor extension for Intel 9460/9560 and 9160/9260. - Add fields to struct hci_dev to facilitate the support of Microsoft vendor extension. drivers/bluetooth/btusb.c | 18 ++++++++++++++++-- include/net/bluetooth/hci.h | 2 ++ include/net/bluetooth/hci_core.h | 4 ++++ 3 files changed, 22 insertions(+), 2 deletions(-)