Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp3782507pxb; Tue, 26 Jan 2021 04:49:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJx+CgVa288TdavBcVJwD3f1/eOooU18s0qleN9lda9mlu64GJ25r5QfGTKMKZwjpxwJfdFS X-Received: by 2002:aa7:d352:: with SMTP id m18mr4508283edr.190.1611665370499; Tue, 26 Jan 2021 04:49:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611665370; cv=none; d=google.com; s=arc-20160816; b=deHUXK7Vg5HoR4XS8VOO3hdfIM6dURQNiBaYimSQU38E3oAyRxKRT+1zUaBixIO3+7 R03Q1Nbxs0IzZ7Bt4mKVktGCVRBjaOeZ9uiORoolP8W6vmjG/4IKJLWDf5560LpUo14L bLndWOqPFuXalko/Ie97f0goh4to6QJ9o1IrSWWR3x2QjubtpMU2IKcX49+B7JEYVXRS 6fTUhiEV2nHcm/2FTCsdFO1OWigpa3hCO2ICKV/HL4LHHMAdTq3PBzX6EtKI8kGCSba0 cQyhHWh5SaTTmTNg6qlKGDcb6BernJG2KRo8AFDxkxFUEKRrtNSVpg4DV80TzdV319UX bIQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:subject:cc:to:from :authenticated-by; bh=KjydzF0d9Me1ZMxA/oXVRrdlJ0G+miJB9qNV/JeYen0=; b=t5Z/IiyfRDBDNZGI4sCYVpbZOji7M/5Z6miFHJPscJKf1p7PBMY2dQLbo5RfFBDoXv 2VaLslZMfo9NBUWYJZRfU83Ve/p5CY43D1Z70zVmQhm7t5Y/YBDKIghPRBzudCwZVsUP ry0gVqapxL4Kqi2cvUb8dBuPCakmTrNOEQQUm9QIkPDWynuyjd2Zs7Zs6nUX4dnyZ7QV SatJntbSaNQ4YgclDc5Cnc791K9DV0dJuzfqc22TKU9FIUOZwRIcxUWuNprv3+km5s58 ijGLK1S1doT9JWrjN+862uJqvt0yh0oTtFh+9Ny47ss+dJ+TZ1/MzF1gOKG4YWDoeStk zdLg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i9si6943913eja.115.2021.01.26.04.48.46; Tue, 26 Jan 2021 04:49:30 -0800 (PST) Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391550AbhAZMpZ (ORCPT + 99 others); Tue, 26 Jan 2021 07:45:25 -0500 Received: from rtits2.realtek.com ([211.75.126.72]:47813 "EHLO rtits2.realtek.com.tw" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730893AbhAZKBh (ORCPT ); Tue, 26 Jan 2021 05:01:37 -0500 Authenticated-By: X-SpamFilter-By: ArmorX SpamTrap 5.73 with qID 10QA0gcE6022247, This message is accepted by code: ctloc85258 Received: from mail.realtek.com (rtexmbs03.realtek.com.tw[172.21.6.96]) by rtits2.realtek.com.tw (8.15.2/2.70/5.88) with ESMTPS id 10QA0gcE6022247 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Tue, 26 Jan 2021 18:00:42 +0800 Received: from localhost.localdomain (172.21.132.186) by RTEXMBS03.realtek.com.tw (172.21.6.96) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Tue, 26 Jan 2021 18:00:42 +0800 From: To: , , , , CC: , , , , , Subject: [PATCH v5] Bluetooth: btrtl: Enable WBS for the specific Realtek devices Date: Tue, 26 Jan 2021 18:00:38 +0800 Message-ID: <20210126100038.1278-1-max.chou@realtek.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [172.21.132.186] X-ClientProxiedBy: RTEXMBS02.realtek.com.tw (172.21.6.95) To RTEXMBS03.realtek.com.tw (172.21.6.96) Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Max Chou By this change, it will enable WBS supported on the specific Realtek BT devices, such as RTL8822C and RTL8852A. In the future, it's able to maintain what the Realtek devices support WBS here. Tested-by: Hilda Wu Reviewed-by: Abhishek Pandit-Subedi Signed-off-by: Max Chou --- change in v5 -remove the extra space between "enum" and "btrtl_chip_id" --- drivers/bluetooth/btrtl.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c index 24f03a1f8d57..c80adf5f313d 100644 --- a/drivers/bluetooth/btrtl.c +++ b/drivers/bluetooth/btrtl.c @@ -38,6 +38,19 @@ .hci_ver = (hciv), \ .hci_bus = (bus) +enum btrtl_chip_id { + CHIP_ID_8723A, + CHIP_ID_8723B, + CHIP_ID_8821A, + CHIP_ID_8761A, + CHIP_ID_8822B = 8, + CHIP_ID_8723D, + CHIP_ID_8821C, + CHIP_ID_8822C = 13, + CHIP_ID_8761B, + CHIP_ID_8852A = 18, +}; + struct id_table { __u16 match_flags; __u16 lmp_subver; @@ -58,6 +71,7 @@ struct btrtl_device_info { u8 *cfg_data; int cfg_len; bool drop_fw; + int project_id; }; static const struct id_table ic_id_table[] = { @@ -307,8 +321,10 @@ static int rtlbt_parse_firmware(struct hci_dev *hdev, /* Find project_id in table */ for (i = 0; i < ARRAY_SIZE(project_id_to_lmp_subver); i++) { - if (project_id == project_id_to_lmp_subver[i].id) + if (project_id == project_id_to_lmp_subver[i].id) { + btrtl_dev->project_id = project_id; break; + } } if (i >= ARRAY_SIZE(project_id_to_lmp_subver)) { @@ -719,18 +735,19 @@ int btrtl_setup_realtek(struct hci_dev *hdev) */ set_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &hdev->quirks); - if (!btrtl_dev->ic_info) - goto done; - /* Enable central-peripheral role (able to create new connections with * an existing connection in slave role). */ - switch (btrtl_dev->ic_info->lmp_subver) { - case RTL_ROM_LMP_8822B: + /* Enable WBS supported for the specific Realtek devices. */ + switch (btrtl_dev->project_id) { + case CHIP_ID_8822C: + case CHIP_ID_8852A: set_bit(HCI_QUIRK_VALID_LE_STATES, &hdev->quirks); + set_bit(HCI_QUIRK_WIDEBAND_SPEECH_SUPPORTED, &hdev->quirks); break; default: rtl_dev_dbg(hdev, "Central-peripheral role not enabled."); + rtl_dev_dbg(hdev, "WBS supported not enabled."); break; } -- 2.17.1