Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Deepin-Kernel-SIG] [Upstream] [linux 6.6-y] drivers: bluetooth: Sync some patches from mainline #525

Merged
merged 13 commits into from
Dec 23, 2024
Merged

[Deepin-Kernel-SIG] [Upstream] [linux 6.6-y] drivers: bluetooth: Sync some patches from mainline #525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c83c8cb
Bluetooth: btrtl: Add the support for RTL8852BT/RTL8852BE-VT
rtkbt-max Dec 26, 2023
9f23221
Bluetooth: HCI: Invert LE State quirk to be opt-out rather then opt-in
Vudentz Aug 12, 2024
b30d8d1
Bluetooth: btusb: Invert LE State flag to set invalid rather then valid
Vudentz Aug 12, 2024
9d5d562
Bluetooth: btrtl: Add the support for RTL8922A
rtkbt-max Aug 20, 2024
7628721
Bluetooth: btusb: Add Mediatek MT7925 support ID 0x13d3:0x3608
Aug 21, 2024
d9caf1a
Bluetooth: btusb: Add 2 USB HW IDs for MT7925 (0xe118/e)
michaelburch Sep 1, 2024
a562738
Bluetooth: btusb: add Foxconn 0xe0fc for Qualcomm WCN785x
pyma1 Sep 23, 2024
5178715
Bluetooth: btusb: Add one more ID 0x0489:0xe0f3 for Qualcomm WCN785x
zijun-hu Sep 20, 2024
80d4688
Bluetooth: btusb: Add one more ID 0x13d3:0x3623 for Qualcomm WCN785x
zijun-hu Sep 26, 2024
a93de0e
Bluetooth: btusb: Add USB HW IDs for MT7920/MT7925
Sep 30, 2024
cfce6e7
Bluetooth: btusb: Add new VID/PID 0489/e111 for MT7925
Oct 26, 2024
794c4ec
Bluetooth: btusb: Add new VID/PID 0489/e124 for MT7925
jmccrohan Nov 2, 2024
17906dd
Bluetooth: btusb: Add 3 HWIDs for MT7925
Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions drivers/bluetooth/btintel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3142,9 +3142,6 @@ static int btintel_setup_combined(struct hci_dev *hdev)
INTEL_ROM_LEGACY_NO_WBS_SUPPORT))
set_bit(HCI_QUIRK_WIDEBAND_SPEECH_SUPPORTED,
&hdev->quirks);
if (ver.hw_variant == 0x08 && ver.fw_variant == 0x22)
set_bit(HCI_QUIRK_VALID_LE_STATES,
&hdev->quirks);

err = btintel_legacy_rom_setup(hdev, &ver);
break;
Expand All @@ -3153,7 +3150,6 @@ static int btintel_setup_combined(struct hci_dev *hdev)
case 0x12: /* ThP */
case 0x13: /* HrP */
case 0x14: /* CcP */
set_bit(HCI_QUIRK_VALID_LE_STATES, &hdev->quirks);
fallthrough;
case 0x0c: /* WsP */
/* Apply the device specific HCI quirks
Expand Down Expand Up @@ -3240,9 +3236,6 @@ static int btintel_setup_combined(struct hci_dev *hdev)
/* These variants don't seem to support LE Coded PHY */
set_bit(HCI_QUIRK_BROKEN_LE_CODED, &hdev->quirks);

/* Set Valid LE States quirk */
set_bit(HCI_QUIRK_VALID_LE_STATES, &hdev->quirks);

/* Setup MSFT Extension support */
btintel_set_msft_opcode(hdev, ver.hw_variant);

Expand All @@ -3268,9 +3261,6 @@ static int btintel_setup_combined(struct hci_dev *hdev)
*/
set_bit(HCI_QUIRK_WIDEBAND_SPEECH_SUPPORTED, &hdev->quirks);

/* Apply LE States quirk from solar onwards */
set_bit(HCI_QUIRK_VALID_LE_STATES, &hdev->quirks);

/* Setup MSFT Extension support */
btintel_set_msft_opcode(hdev,
INTEL_HW_VARIANT(ver_tlv.cnvi_bt));
Expand Down
3 changes: 0 additions & 3 deletions drivers/bluetooth/btintel_pcie.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1456,9 +1456,6 @@ static int btintel_pcie_setup_internal(struct hci_dev *hdev)
*/
set_bit(HCI_QUIRK_WIDEBAND_SPEECH_SUPPORTED, &hdev->quirks);

/* Apply LE States quirk from solar onwards */
set_bit(HCI_QUIRK_VALID_LE_STATES, &hdev->quirks);

/* Setup MSFT Extension support */
btintel_set_msft_opcode(hdev,
INTEL_HW_VARIANT(ver_tlv.cnvi_bt));
Expand Down
3 changes: 0 additions & 3 deletions drivers/bluetooth/btmtksdio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1141,9 +1141,6 @@ static int btmtksdio_setup(struct hci_dev *hdev)
}
}

/* Valid LE States quirk for MediaTek 7921 */
set_bit(HCI_QUIRK_VALID_LE_STATES, &hdev->quirks);

break;
case 0x7663:
case 0x7668:
Expand Down
31 changes: 30 additions & 1 deletion drivers/bluetooth/btrtl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#define RTL_ROM_LMP_8822B 0x8822
#define RTL_ROM_LMP_8852A 0x8852
#define RTL_ROM_LMP_8851B 0x8851
#define RTL_ROM_LMP_8922A 0x8922
#define RTL_CONFIG_MAGIC 0x8723ab55

#define RTL_VSC_OP_COREDUMP 0xfcff
Expand Down Expand Up @@ -69,6 +70,8 @@ enum btrtl_chip_id {
CHIP_ID_8852B = 20,
CHIP_ID_8852C = 25,
CHIP_ID_8851B = 36,
CHIP_ID_8922A = 44,
CHIP_ID_8852BT = 47,
};

struct id_table {
Expand Down Expand Up @@ -307,6 +310,24 @@ static const struct id_table ic_id_table[] = {
.fw_name = "rtl_bt/rtl8851bu_fw",
.cfg_name = "rtl_bt/rtl8851bu_config",
.hw_info = "rtl8851bu" },

/* 8922A */
{ IC_INFO(RTL_ROM_LMP_8922A, 0xa, 0xc, HCI_USB),
.config_needed = false,
.has_rom_version = true,
.has_msft_ext = true,
.fw_name = "rtl_bt/rtl8922au_fw",
.cfg_name = "rtl_bt/rtl8922au_config",
.hw_info = "rtl8922au" },

/* 8852BT/8852BE-VT */
{ IC_INFO(RTL_ROM_LMP_8852A, 0x87, 0xc, HCI_USB),
.config_needed = false,
.has_rom_version = true,
.has_msft_ext = true,
.fw_name = "rtl_bt/rtl8852btu_fw",
.cfg_name = "rtl_bt/rtl8852btu_config",
.hw_info = "rtl8852btu" },
};

static const struct id_table *btrtl_match_ic(u16 lmp_subver, u16 hci_rev,
Expand Down Expand Up @@ -645,6 +666,8 @@ static int rtlbt_parse_firmware(struct hci_dev *hdev,
{ RTL_ROM_LMP_8852A, 20 }, /* 8852B */
{ RTL_ROM_LMP_8852A, 25 }, /* 8852C */
{ RTL_ROM_LMP_8851B, 36 }, /* 8851B */
{ RTL_ROM_LMP_8922A, 44 }, /* 8922A */
{ RTL_ROM_LMP_8852A, 47 }, /* 8852BT */
};

if (btrtl_dev->fw_len <= 8)
Expand Down Expand Up @@ -1244,6 +1267,7 @@ int btrtl_download_firmware(struct hci_dev *hdev,
case RTL_ROM_LMP_8852A:
case RTL_ROM_LMP_8703B:
case RTL_ROM_LMP_8851B:
case RTL_ROM_LMP_8922A:
err = btrtl_setup_rtl8723b(hdev, btrtl_dev);
break;
default:
Expand Down Expand Up @@ -1275,7 +1299,8 @@ void btrtl_set_quirks(struct hci_dev *hdev, struct btrtl_device_info *btrtl_dev)
case CHIP_ID_8852B:
case CHIP_ID_8852C:
case CHIP_ID_8851B:
set_bit(HCI_QUIRK_VALID_LE_STATES, &hdev->quirks);
case CHIP_ID_8922A:
case CHIP_ID_8852BT:
set_bit(HCI_QUIRK_WIDEBAND_SPEECH_SUPPORTED, &hdev->quirks);

/* RTL8852C needs to transmit mSBC data continuously without
Expand Down Expand Up @@ -1506,6 +1531,10 @@ MODULE_FIRMWARE("rtl_bt/rtl8852bs_fw.bin");
MODULE_FIRMWARE("rtl_bt/rtl8852bs_config.bin");
MODULE_FIRMWARE("rtl_bt/rtl8852bu_fw.bin");
MODULE_FIRMWARE("rtl_bt/rtl8852bu_config.bin");
MODULE_FIRMWARE("rtl_bt/rtl8852btu_fw.bin");
MODULE_FIRMWARE("rtl_bt/rtl8852btu_config.bin");
MODULE_FIRMWARE("rtl_bt/rtl8852cu_fw.bin");
MODULE_FIRMWARE("rtl_bt/rtl8852cu_fw_v2.bin");
MODULE_FIRMWARE("rtl_bt/rtl8852cu_config.bin");
MODULE_FIRMWARE("rtl_bt/rtl8922au_fw.bin");
MODULE_FIRMWARE("rtl_bt/rtl8922au_config.bin");
Loading
Loading