From patchwork Mon Jun 6 07:16:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AceLan Kao X-Patchwork-Id: 1639141 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=byXDkdvE; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LGlD2436Sz9s2R for ; Mon, 6 Jun 2022 17:16:50 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1ny6yh-0008R3-Bf; Mon, 06 Jun 2022 07:16:43 +0000 Received: from mail-pl1-f170.google.com ([209.85.214.170]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1ny6yf-0008Oh-3J for kernel-team@lists.ubuntu.com; Mon, 06 Jun 2022 07:16:41 +0000 Received: by mail-pl1-f170.google.com with SMTP id q18so11431912pln.12 for ; Mon, 06 Jun 2022 00:16:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8rdG7m2HPX9zl/yZEbNi9QsH/bzGv2ys7cjxU0ZPH9M=; b=byXDkdvE2On4X+kzGeNz2ZJrarsTNrUaRMcdQhsdg3B3OCi4F8wxX8bQxbWNnaD7Re 398JGafyl4bgdrRzgDWhVWEBYvjLqUxwnSEAXjAiObLU+/BwLtIkRPMPsbwGqzw3iHB7 pGndKn8M9Ugmu6reAr4k+3hVNdIjE7+ZNMb9T/QjhBkDdMONHTG1h2xZZ0PgHAhrzOdJ C2UO52SnsFW60ewjk3RdVjRCXX1h8G483OGqHJUuJ3o5j4KgFegsllFqJeG46CKi5U+i C4evgCoObhYjMu3bJYcRI8RUgtqJAMIh+HQE90JjD6MscsNjRrLLpkr9bU3c/TqEESce V4vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=8rdG7m2HPX9zl/yZEbNi9QsH/bzGv2ys7cjxU0ZPH9M=; b=t5l9m3MvMDvDw0NLlClKt31dwpEv3Ps+wW4PwFvrTIKcuKeCaJtJ/p198WpuuaD1r/ LeZiVfQXRVd6ZBk3JALZ9mXNmfC0KS9LnRkFixRhavm5cM4W8L9ap4r5lT9jwPnbihtv aKeFEIEJU+zjeSCkJqQhc7GnJNVPkZH7DHaUCHdYKYao+z3YIA95Dxo7gWVjX9bAS7en Ca3g9xw3P87veT1R16aq3TPgTFXj5tvlfgLtRKo0OhYS9vUikDT21gSeEoQfHNvDH9QT RrvqvXH+RD0jeMz3o6tBWBeWPh+FX06758AtFAqZBuVNNjHMRK5X+ruoCzME8+8AWXFk 9v3g== X-Gm-Message-State: AOAM531HlC39HIDo4HB9ubtTqdhlyJIM1h21ZXCw8YBuu6iOsMto5Wvs wSuAgeSTTOlr6jd9LJfgc9Z/Bklr/pE= X-Google-Smtp-Source: ABdhPJwdS7uPgdkvFPu6p6+yQJOlno2sa5SCTnrcgGu1u3PKmOCvVs4M0uTieqcs/vGzUjtwZJ60Pg== X-Received: by 2002:a17:90b:2c0b:b0:1e3:25d3:e770 with SMTP id rv11-20020a17090b2c0b00b001e325d3e770mr38183605pjb.101.1654499798575; Mon, 06 Jun 2022 00:16:38 -0700 (PDT) Received: from localhost (220-135-95-34.hinet-ip.hinet.net. [220.135.95.34]) by smtp.gmail.com with ESMTPSA id q16-20020a170902dad000b0015e8d4eb1c6sm9924116plx.16.2022.06.06.00.16.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jun 2022 00:16:37 -0700 (PDT) From: AceLan Kao To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/3][SRU][Focal] Bluetooth: btusb: Add flag to define wideband speech capability Date: Mon, 6 Jun 2022 15:16:29 +0800 Message-Id: <20220606071631.3065428-2-acelan.kao@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220606071631.3065428-1-acelan.kao@canonical.com> References: <20220606071631.3065428-1-acelan.kao@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.214.170; envelope-from=acelan@gmail.com; helo=mail-pl1-f170.google.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Alain Michaud BugLink: https://bugs.launchpad.net/bugs/1976613 This change adds a new flag to define a controller's wideband speech capability. This is required since no reliable over HCI mechanism exists to query the controller and driver's compatibility with wideband speech. Signed-off-by: Alain Michaud Signed-off-by: Marcel Holtmann (cherry picked from commit 3e4e3f73b9f4944ebd8100dbe107f2325aa79c6d) Signed-off-by: Chia-Lin Kao (AceLan) --- drivers/bluetooth/btusb.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 6257d46d35955..06d55747393ff 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -58,6 +58,7 @@ static struct usb_driver btusb_driver; #define BTUSB_IFNUM_2 0x80000 #define BTUSB_CW6622 0x100000 #define BTUSB_MEDIATEK 0x200000 +#define BTUSB_WIDEBAND_SPEECH 0x400000 static const struct usb_device_id btusb_table[] = { /* Generic Bluetooth USB device */ @@ -333,15 +334,21 @@ static const struct usb_device_id blacklist_table[] = { { USB_DEVICE(0x1286, 0x204e), .driver_info = BTUSB_MARVELL }, /* Intel Bluetooth devices */ - { USB_DEVICE(0x8087, 0x0025), .driver_info = BTUSB_INTEL_NEW }, - { USB_DEVICE(0x8087, 0x0026), .driver_info = BTUSB_INTEL_NEW }, - { USB_DEVICE(0x8087, 0x0029), .driver_info = BTUSB_INTEL_NEW }, + { USB_DEVICE(0x8087, 0x0025), .driver_info = BTUSB_INTEL_NEW | + BTUSB_WIDEBAND_SPEECH }, + { USB_DEVICE(0x8087, 0x0026), .driver_info = BTUSB_INTEL_NEW | + BTUSB_WIDEBAND_SPEECH }, + { USB_DEVICE(0x8087, 0x0029), .driver_info = BTUSB_INTEL_NEW | + BTUSB_WIDEBAND_SPEECH }, { USB_DEVICE(0x8087, 0x07da), .driver_info = BTUSB_CSR }, { USB_DEVICE(0x8087, 0x07dc), .driver_info = BTUSB_INTEL }, { USB_DEVICE(0x8087, 0x0a2a), .driver_info = BTUSB_INTEL }, - { USB_DEVICE(0x8087, 0x0a2b), .driver_info = BTUSB_INTEL_NEW }, - { USB_DEVICE(0x8087, 0x0aa7), .driver_info = BTUSB_INTEL }, - { USB_DEVICE(0x8087, 0x0aaa), .driver_info = BTUSB_INTEL_NEW }, + { USB_DEVICE(0x8087, 0x0a2b), .driver_info = BTUSB_INTEL_NEW | + BTUSB_WIDEBAND_SPEECH }, + { USB_DEVICE(0x8087, 0x0aa7), .driver_info = BTUSB_INTEL | + BTUSB_WIDEBAND_SPEECH }, + { USB_DEVICE(0x8087, 0x0aaa), .driver_info = BTUSB_INTEL_NEW | + BTUSB_WIDEBAND_SPEECH }, /* Other Intel Bluetooth devices */ { USB_VENDOR_AND_INTERFACE_INFO(0x8087, 0xe0, 0x01, 0x01),