From patchwork Mon Mar 23 07:28:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miao-chen Chou X-Patchwork-Id: 11452419 X-Patchwork-Delegate: marcel@holtmann.org Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3ECFB1392 for ; Mon, 23 Mar 2020 07:28:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1D77420732 for ; Mon, 23 Mar 2020 07:28:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="ODkKSuVJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727460AbgCWH2i (ORCPT ); Mon, 23 Mar 2020 03:28:38 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:38242 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727450AbgCWH2h (ORCPT ); Mon, 23 Mar 2020 03:28:37 -0400 Received: by mail-pg1-f195.google.com with SMTP id x7so6762101pgh.5 for ; Mon, 23 Mar 2020 00:28:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1WaFqY08yZDTNOOqFJJ4Ka9dG2R6CvdNBmfw+UsXwFw=; b=ODkKSuVJ6S52gPucNInkRRtmLi5CEwf3sUUvBlHuALvNerRafu3JZIPE//8XHMJcC+ Y0q0+nK9uhrEji65AzpxQv/UIT/ZXG0m+ynbKrKAl3Q5nyyj7MXmBArfQ/nAvEIsx/ea 24HV2oo0THO9Ki5w+CbrCEWerUT5NZLE1q9As= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1WaFqY08yZDTNOOqFJJ4Ka9dG2R6CvdNBmfw+UsXwFw=; b=A7cstqCWPJfPjyje1+53NWmBMuHpPyIZ4v1xVgoMpdO9vxtDJnl4RgCvaXGdu89mt8 MN1FMwRtOzT1GR3z3nU9SXbmLmLti/XLxhhUOBR+dIYSsD5D1a56UPw2Eke1GzFMncCl fewxabCtUbP/y5aajvFI+lMpxgYZHUtTApU8rD02/O93+ipAc2McghcDeTy6IViB7JX4 LJnxUVSx2EO820rDGrqLmFuY9LVKFEzPCL+vMP/t1x20GK3Z/XUa3NloP6pX84uzkvDO RAekN84isKMH3xqI1YCUsGCRtAiu/6uY+QmmGtr2tOsVVWefcB/f8tR1pp1pM/iHDzr6 qRdg== X-Gm-Message-State: ANhLgQ2mNXJgIgUJUY8tyimuiErlOZVYLrJAyvlR35lrvIbOaHn1ntr+ iadrZe+n3P632ZvwQq+zyBWkSfmgg+M= X-Google-Smtp-Source: ADFU+vuUDpsPfjd1HQWxTTC81WLH16iAkSLvmvkYp+NLO7JpHFuipUoXl00u8X8y9FJsnkBWcmeH0A== X-Received: by 2002:aa7:814c:: with SMTP id d12mr14344986pfn.70.1584948515681; Mon, 23 Mar 2020 00:28:35 -0700 (PDT) Received: from mcchou0.mtv.corp.google.com ([2620:15c:202:201:b46:ac84:1014:9555]) by smtp.gmail.com with ESMTPSA id z16sm12645399pfr.138.2020.03.23.00.28.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Mar 2020 00:28:34 -0700 (PDT) From: Miao-chen Chou To: Bluetooth Kernel Mailing List Cc: Luiz Augusto von Dentz , Marcel Holtmann , Alain Michaud , Miao-chen Chou , "David S. Miller" , Jakub Kicinski , Johan Hedberg , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v1 1/2] Bluetooth: btusb: Indicate Microsoft vendor extension for Intel 9460/9560 and 9160/9260 Date: Mon, 23 Mar 2020 00:28:23 -0700 Message-Id: <20200323002820.v1.1.I0e975833a6789e8acc74be7756cd54afde6ba98c@changeid> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200323072824.254495-1-mcchou@chromium.org> References: <20200323072824.254495-1-mcchou@chromium.org> MIME-Version: 1.0 Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org 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 --- 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(-) diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 3bdec42c9612..5eb27d1c4ac7 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -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) diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index 5f60e135aeb6..b85e95454367 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h @@ -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 diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index d4e28773d378..15daf3b2d4f0 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -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;