Skip to content

Commit

Permalink
Bluetooth: btrtl: Enable WBS for the specific Realtek devices
Browse files Browse the repository at this point in the history
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 <hildawu@realtek.com>
Reviewed-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org>
Signed-off-by: Max Chou <max.chou@realtek.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
  • Loading branch information
Max Chou authored and Marcel Holtmann committed Jan 29, 2021
1 parent 231ee8b commit 9ab9235
Showing 1 changed file with 23 additions and 7 deletions.
30 changes: 23 additions & 7 deletions drivers/bluetooth/btrtl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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[] = {
Expand Down Expand Up @@ -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)) {
Expand Down Expand Up @@ -719,22 +735,22 @@ 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;
}

done:
btrtl_free(btrtl_dev);
return ret;
}
Expand Down

0 comments on commit 9ab9235

Please sign in to comment.