From patchwork Wed Sep 6 19:16:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1830520 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Rgsb75Nmkz1yhc for ; Thu, 7 Sep 2023 05:17:55 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1qdy21-0007Iw-B6; Wed, 06 Sep 2023 19:17:41 +0000 Received: from mail-oa1-f48.google.com ([209.85.160.48]) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1qdy1x-0007IR-Mj for kernel-team@lists.ubuntu.com; Wed, 06 Sep 2023 19:17:37 +0000 Received: by mail-oa1-f48.google.com with SMTP id 586e51a60fabf-1d544a4a2f2so62791fac.3 for ; Wed, 06 Sep 2023 12:17:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1694027856; x=1694632656; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eC87Ky3b3Ws5F5dSsq0XL5AG1/yeJajL3ukWgXwJweg=; b=mAxvXnDg+HerzCHSFvTAM2O7aRG6wDuTbhNVfgv1ldKPeBFYYwrUmUTun+jbVbLF23 8Nrt607ZLtz4OdXoFIyMNXIQpsV0JisvpS4LpJdxzABS+ynYjJDvKfz168fowQjj+tEi dBFfUJmhELbO4j5WVJx7fESUoHYJbPYKf//IbI8Q1QVPDI8wiybVuoJvAdRIIQlJ0f2v KeI7O3QzPx3XbWyKh+SDTAJFp+mNJdN4RLJJxLjs+gUFocsp4jc/M+9GYYbDdRFwuQxs BNmGBShq1hF5cuRki53NtBw7wFrEniyaWYwu1v9243R83wcY1vDF8ZHy4JPb/xwhlkHY K1Fg== X-Gm-Message-State: AOJu0Yxy4JUjyIB5x0Wsna5njxVQYI7NaZqIp6e85M4y3xUacSpD85yY qErImPJwGoVgKTwv5CYEDGFK6tvZjRc= X-Google-Smtp-Source: AGHT+IEqFrYHsS6MYsKaIcptuukt/UJrzrGLddUcL/04U5jJIGNkicZPIG/fJPDCvKXmJ10pCnD2Dg== X-Received: by 2002:a05:6870:e6c5:b0:1be:d49b:a3c5 with SMTP id s5-20020a056870e6c500b001bed49ba3c5mr21992278oak.29.1694027855974; Wed, 06 Sep 2023 12:17:35 -0700 (PDT) Received: from localhost.localdomain (125-229-129-140.hinet-ip.hinet.net. [125.229.129.140]) by smtp.gmail.com with ESMTPSA id l194-20020a633ecb000000b0054fe7736ac1sm11526512pga.76.2023.09.06.12.17.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Sep 2023 12:17:35 -0700 (PDT) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/2][SRU][Mantic] Bluetooth: btintel: Add support for Gale Peak Date: Thu, 7 Sep 2023 03:16:49 +0800 Message-Id: <20230906191650.247118-2-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230906191650.247118-1-vicamo.yang@canonical.com> References: <20230906191650.247118-1-vicamo.yang@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.160.48; envelope-from=vicamo@gmail.com; helo=mail-oa1-f48.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: Kiran K BugLink: https://bugs.launchpad.net/bugs/2028065 Add hardware variant(0x1c) for Gale Peak core (CNVi). Signed-off-by: Kiran K Signed-off-by: Luiz Augusto von Dentz (cherry picked from commit 8fd791afddca273817232a0bc5260a309754330b) Signed-off-by: You-Sheng Yang --- drivers/bluetooth/btintel.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c index d9349ba48281e..69f4f48c64159 100644 --- a/drivers/bluetooth/btintel.c +++ b/drivers/bluetooth/btintel.c @@ -470,6 +470,7 @@ static int btintel_version_info_tlv(struct hci_dev *hdev, case 0x18: /* Slr */ case 0x19: /* Slr-F */ case 0x1b: /* Mgr */ + case 0x1c: /* Gale Peak (GaP) */ break; default: bt_dev_err(hdev, "Unsupported Intel hardware variant (0x%x)", @@ -2528,6 +2529,7 @@ static void btintel_set_msft_opcode(struct hci_dev *hdev, u8 hw_variant) case 0x18: case 0x19: case 0x1b: + case 0x1c: hci_set_msft_opcode(hdev, 0xFC1E); break; default: @@ -2742,6 +2744,7 @@ static int btintel_setup_combined(struct hci_dev *hdev) case 0x18: case 0x19: case 0x1b: + case 0x1c: /* Display version information of TLV type */ btintel_version_info_tlv(hdev, &ver_tlv); From patchwork Wed Sep 6 19:16:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1830521 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Rgsb76KtCz1yhk for ; Thu, 7 Sep 2023 05:17:55 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1qdy22-0007JG-B3; Wed, 06 Sep 2023 19:17:42 +0000 Received: from mail-pg1-f174.google.com ([209.85.215.174]) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1qdy1z-0007IZ-Ji for kernel-team@lists.ubuntu.com; Wed, 06 Sep 2023 19:17:39 +0000 Received: by mail-pg1-f174.google.com with SMTP id 41be03b00d2f7-53fa455cd94so172520a12.2 for ; Wed, 06 Sep 2023 12:17:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1694027857; x=1694632657; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=r54+Ded+XaqeDFijeAu5GsYbr41SNk1QYVM2S/jeNt8=; b=g2vN/+zqHAAMPsShW11MPZms3XWfnZW40uskxVvt28wuITHfa7lriOUraVF5aCLjwi DqcwdLYLDNHpvElXF2PpZNvgClVPDO6u1kQdEFx9Tw/lAhZH90UTOVzh5VMUSep96He3 n/T+B+QqnUMZ1zE/TfQP6FnhnHY6b/BWFRCnCQuK8BqNsnXNB5CLY57o7Y6wTv2Or+7W URPDZXEPZZHSCrcraQZTXU2zFsxupAFD6L4nppNibvIPDoJ3RokenedIBA2f9B1DEzQq a3Sa+Qccjc6v5RiPr9qE/IJjDCx9M8lLP0pd/2Q4TQSYwlFHJAmjmQKkYdVFfIpo1Ppd T+dA== X-Gm-Message-State: AOJu0YxZen3XCsy1LFNzOi1ffZCrQ5OFa36hzsVaferT/JCvLzaXQ5zh RrCIWVvCmfxsVKRktU2vtYw1AAc+/Rk= X-Google-Smtp-Source: AGHT+IFURmFG1PiSz/fSC/XI/BiK71vL6Z8z86hxzS9/cb5Idh5uJaDuPXaaqInnM8B1gl8Bn4qURA== X-Received: by 2002:a05:6a20:9783:b0:14c:29b0:9632 with SMTP id hx3-20020a056a20978300b0014c29b09632mr15224731pzc.29.1694027857224; Wed, 06 Sep 2023 12:17:37 -0700 (PDT) Received: from localhost.localdomain (125-229-129-140.hinet-ip.hinet.net. [125.229.129.140]) by smtp.gmail.com with ESMTPSA id l194-20020a633ecb000000b0054fe7736ac1sm11526512pga.76.2023.09.06.12.17.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Sep 2023 12:17:36 -0700 (PDT) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/2][SRU][Mantic] Bluetooth: Add support for Gale Peak (8087:0036) Date: Thu, 7 Sep 2023 03:16:50 +0800 Message-Id: <20230906191650.247118-3-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230906191650.247118-1-vicamo.yang@canonical.com> References: <20230906191650.247118-1-vicamo.yang@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.215.174; envelope-from=vicamo@gmail.com; helo=mail-pg1-f174.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: Kiran K BugLink: https://bugs.launchpad.net/bugs/2028065 Devices from /sys/kernel/debug/usb/devices: T: Bus=09 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 2 Spd=12 MxCh= 0 D: Ver= 2.01 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=8087 ProdID=0036 Rev= 0.00 C:* #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA I:* If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=81(I) Atr=03(Int.) MxPS= 64 Ivl=1ms E: Ad=02(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms E: Ad=82(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 0 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 0 Ivl=1ms I: If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms I: If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms I: If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 25 Ivl=1ms I: If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 33 Ivl=1ms I: If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms I: If#= 1 Alt= 6 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 63 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 63 Ivl=1ms Signed-off-by: Kiran K Signed-off-by: Luiz Augusto von Dentz (cherry picked from commit 24921786074b2ec16e59a36fb48078701113ffff) Signed-off-by: You-Sheng Yang --- drivers/bluetooth/btusb.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index cb3786369cd8c..895df6858223f 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -477,6 +477,7 @@ static const struct usb_device_id blacklist_table[] = { { USB_DEVICE(0x8087, 0x0032), .driver_info = BTUSB_INTEL_COMBINED }, { USB_DEVICE(0x8087, 0x0033), .driver_info = BTUSB_INTEL_COMBINED }, { USB_DEVICE(0x8087, 0x0035), .driver_info = BTUSB_INTEL_COMBINED }, + { USB_DEVICE(0x8087, 0x0036), .driver_info = BTUSB_INTEL_COMBINED }, { USB_DEVICE(0x8087, 0x07da), .driver_info = BTUSB_CSR }, { USB_DEVICE(0x8087, 0x07dc), .driver_info = BTUSB_INTEL_COMBINED | BTUSB_INTEL_NO_WBS_SUPPORT |