On Wed, Oct 27, 2021 at 12:14:15PM +0300, Vyacheslav Bocharov wrote:
> Add detection of RTL8822CS controller with hci_ver = 0x08
>
> Signed-off-by: Vyacheslav Bocharov <adeep@xxxxxxxxx>
> ---
> drivers/bluetooth/btrtl.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c
> index c2bdd1e6060e..38d547cc6fcd 100644
> --- a/drivers/bluetooth/btrtl.c
> +++ b/drivers/bluetooth/btrtl.c
> @@ -156,6 +156,13 @@ static const struct id_table ic_id_table[] = {
> .fw_name = "rtl_bt/rtl8822cs_fw.bin",
> .cfg_name = "rtl_bt/rtl8822cs_config" },
>
> + /* 8822C with UART interface */
> + { IC_INFO(RTL_ROM_LMP_8822B, 0xc, 0x8, HCI_UART),
> + .config_needed = true,
> + .has_rom_version = true,
> + .fw_name = "rtl_bt/rtl8822cs_fw.bin",
> + .cfg_name = "rtl_bt/rtl8822cs_config" },
> +
> /* 8822C with USB interface */
> { IC_INFO(RTL_ROM_LMP_8822B, 0xc, 0xa, HCI_USB),
> .config_needed = false,
Hi Vyacheslav,
Could I make a suggestion rebasing this patch against 5.16 and putting
the UART hci ver 0008 berore 000a
this has been tested on Tanix TX6.
Before:
[ 11.512883] Bluetooth: hci0: RTL: examining hci_ver=08 hci_rev=000c lmp_ver=08 lmp_subver=8822
[ 11.512940] Bluetooth: hci0: RTL: unknown IC info, lmp subver 8822, hci rev 000c, hci ver 0008
[ 11.512957] Bluetooth: hci0: RTL: no config loaded
After:
[ 12.642167] Bluetooth: hci0: RTL: examining hci_ver=08 hci_rev=000c lmp_ver=08 lmp_subver=8822
[ 12.671911] Bluetooth: hci0: RTL: rom_version status=0 version=3
[ 12.671961] Bluetooth: hci0: RTL: loading rtl_bt/rtl8822cs_fw.bin
[ 12.706248] Bluetooth: hci0: RTL: loading rtl_bt/rtl8822cs_config.bin
[ 12.730251] Bluetooth: hci0: RTL: cfg_sz 33, total sz 40737
[ 13.318832] Bluetooth: hci0: RTL: fw version 0x05a91a4a
Tested-by: Rudi Heitbaum <rudi@xxxxxxxxxxxx>
---
drivers/bluetooth/btrtl.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c
--- a/drivers/bluetooth/btrtl.c 2022-01-09 22:55:34.000000000 +0000
+++ b/drivers/bluetooth/btrtl.c 2022-01-15 07:12:21.102080089 +0000
@@ -148,7 +148,15 @@
.fw_name = "rtl_bt/rtl8761bu_fw.bin",
.cfg_name = "rtl_bt/rtl8761bu_config" },
+ /* 8822C (hci ver 0008) with UART interface */
+ { IC_INFO(RTL_ROM_LMP_8822B, 0xc, 0x8, HCI_UART),
+ .config_needed = true,
+ .has_rom_version = true,
+ .has_msft_ext = true,
+ .fw_name = "rtl_bt/rtl8822cs_fw.bin",
+ .cfg_name = "rtl_bt/rtl8822cs_config" },
+
- /* 8822C with UART interface */
+ /* 8822C (hci ver 000a) with UART interface */
{ IC_INFO(RTL_ROM_LMP_8822B, 0xc, 0xa, HCI_UART),
.config_needed = true,
.has_rom_version = true,
--
2.25.1
