From patchwork Wed Mar 25 07:03:35 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: 11457057 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 C70506CA for ; Wed, 25 Mar 2020 07:03:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9D8BF20B80 for ; Wed, 25 Mar 2020 07:03:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="X+6oGftg" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727380AbgCYHDx (ORCPT ); Wed, 25 Mar 2020 03:03:53 -0400 Received: from mail-pf1-f195.google.com ([209.85.210.195]:43521 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725815AbgCYHDo (ORCPT ); Wed, 25 Mar 2020 03:03:44 -0400 Received: by mail-pf1-f195.google.com with SMTP id f206so585958pfa.10 for ; Wed, 25 Mar 2020 00:03:43 -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=baRu5nsVbDxJSO3oJpwwpT6CsHgG9dJlSyie1x1BQxg=; b=X+6oGftgVS9JAs653mjzV4NYBb/WT5sFCMBMu0y+14I2F3DgVsomaBXkL1FET6FMCa 7JmnihsNxZAXKzxrm5PfIWHMXpOrnX2wLLwX5VQnpXH6RKp2TigiY47CsUXAVZ+QdRMf 3fos8ickYKt4OUGwh/oGGHrWFI+kpSn64Kfmg= 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=baRu5nsVbDxJSO3oJpwwpT6CsHgG9dJlSyie1x1BQxg=; b=ncN0JjRzJ04Bvz677XDZWM9XmFSnYu43uN/nKtlLhWSIPWxpwMpXHrDkwGw4qtm9kO Ays6rteRYlbQSvysSxVD4XDDOhjF8wJdbhubOCkFnqpioI0hInKkOXIvnsLJvdXbqxD5 +MMLCKiTbpK0CAtehyedbqagPLxCLDn0ZQ4HwNjyvQpWM3IGhH1aHZSi3pbqrkgEnVeW l48TNhONCd3Ol49meFB1MHRJSr8YujAgstaapISjw8gsouFHVJj0FoPHSeBbMJBsvPdh wAe99UjRw9L9EuI8Z8pSi2GhIiepKK3bceqsRCm8VmLfR0yJcM4LVAyNCfKAwlWJJZpJ 7JTQ== X-Gm-Message-State: ANhLgQ1Z9OTxTii9TnZ+ed9NbqiCMV571yINRy87RmL50gr4bsObn/i2 7sL0wGU3ItORxIVEtmk2WieT0gMpcbI= X-Google-Smtp-Source: ADFU+vuNT9INJ2iEvMa3zIO7zdhHTcpkfnNUr9luK/PfllzQPPC6EssZTNehgCDtbkATdvNjqh7yBQ== X-Received: by 2002:a63:a54:: with SMTP id z20mr1774834pgk.372.1585119822183; Wed, 25 Mar 2020 00:03:42 -0700 (PDT) Received: from mcchou0.mtv.corp.google.com ([2620:15c:202:201:b46:ac84:1014:9555]) by smtp.gmail.com with ESMTPSA id i34sm566240pgm.83.2020.03.25.00.03.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Mar 2020 00:03:41 -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 v2 1/2] Bluetooth: btusb: Indicate Microsoft vendor extension for Intel 9460/9560 and 9160/9260 Date: Wed, 25 Mar 2020 00:03:35 -0700 Message-Id: <20200325000332.v2.1.I0e975833a6789e8acc74be7756cd54afde6ba98c@changeid> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200325070336.1097-1-mcchou@chromium.org> References: <20200325070336.1097-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 v2: - Define struct msft_vnd_ext and add a field of this type to struct hci_dev to facilitate the support of Microsoft vendor extension. drivers/bluetooth/btusb.c | 14 ++++++++++++-- include/net/bluetooth/hci_core.h | 6 ++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 3bdec42c9612..4c49f394f174 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,8 @@ static int btusb_probe(struct usb_interface *intf, hdev->send = btusb_send_frame; hdev->notify = btusb_notify; + hdev->msft_ext.opcode = HCI_OP_NOP; + #ifdef CONFIG_PM err = btusb_config_oob_wake(hdev); if (err) @@ -3800,6 +3805,11 @@ 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_ext.opcode = 0xFC1E; + } } if (id->driver_info & BTUSB_MARVELL) diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index d4e28773d378..0ec3d9b41d81 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -244,6 +244,10 @@ struct amp_assoc { #define HCI_MAX_PAGES 3 +struct msft_vnd_ext { + __u16 opcode; +}; + struct hci_dev { struct list_head list; struct mutex lock; @@ -343,6 +347,8 @@ struct hci_dev { struct amp_assoc loc_assoc; + struct msft_vnd_ext msft_ext; + __u8 flow_ctl_mode; unsigned int auto_accept_delay;