Re: [PATCH 2/3] Bluetooth: btrtl: Add support for RTL8822BS UART

[Christophe JAILLET]

Le 14/05/2023 à 09:47, Rudi Heitbaum a écrit :
> Add a RTL8822BS UART with hci_ver = 0x07. This is similar to RTL8822CS
> observed on the Tanix TX6 Android set-top box. But the previous
> generation of chip. The RTL8822BS requires the
> BROKEN_LOCAL_EXT_FEATURES_PAGE_2 quirk.
>
> Signed-off-by: Rudi Heitbaum <rudi-8t6dWLoy+3lWk0Htik3J/w@xxxxxxxxxxxxxxxx>
> ---
>   drivers/bluetooth/btrtl.c  | 12 +++++++++++-
>   drivers/bluetooth/hci_h5.c |  6 ++++++
>   2 files changed, 17 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c
> index 2915c82d719d..b53a4ef88550 100644
> --- a/drivers/bluetooth/btrtl.c
> +++ b/drivers/bluetooth/btrtl.c
> @@ -234,7 +234,15 @@ static const struct id_table ic_id_table[] = {
>   	  .fw_name  = "rtl_bt/rtl8822cu_fw.bin",
>   	  .cfg_name = "rtl_bt/rtl8822cu_config" },
>   
> -	/* 8822B */
> +	/* 8822BS with UART interface */
> +	{ IC_INFO(RTL_ROM_LMP_8822B, 0xb, 0x7, HCI_UART),
> +	  .config_needed = true,
> +	  .has_rom_version = true,
> +	  .has_msft_ext = true,
> +	  .fw_name  = "rtl_bt/rtl8822bs_fw.bin",
> +	  .cfg_name = "rtl_bt/rtl8822bs_config" },
> +
> +	/* 8822BU with USB interface */
>   	{ IC_INFO(RTL_ROM_LMP_8822B, 0xb, 0x7, HCI_USB),
>   	  .config_needed = true,
>   	  .has_rom_version = true,
> @@ -1182,6 +1190,8 @@ void btrtl_set_quirks(struct hci_dev *hdev, struct btrtl_device_info *btrtl_dev)
>   
>   		hci_set_aosp_capable(hdev);
>   		break;
> +	case CHIP_ID_8822B:
> +		set_bit(HCI_QUIRK_BROKEN_LOCAL_EXT_FEATURES_PAGE_2, &hdev->quirks);

break missing?
If it is intentinal, a "fallthrough;" would be more explicit.

just my 2c,

CJ

>   	default:
>   		rtl_dev_dbg(hdev, "Central-peripheral role not enabled.");
>   		rtl_dev_dbg(hdev, "WBS supported not enabled.");
> diff --git a/drivers/bluetooth/hci_h5.c b/drivers/bluetooth/hci_h5.c
> index fefc37b98b4a..726b6c7e28b8 100644
> --- a/drivers/bluetooth/hci_h5.c
> +++ b/drivers/bluetooth/hci_h5.c
> @@ -1072,6 +1072,10 @@ static struct h5_vnd rtl_vnd = {
>   	.acpi_gpio_map	= acpi_btrtl_gpios,
>   };
>   
> +static const struct h5_device_data h5_data_rtl8822bs = {
> +	.vnd = &rtl_vnd,
> +};
> +
>   static const struct h5_device_data h5_data_rtl8822cs = {
>   	.vnd = &rtl_vnd,
>   };
> @@ -1100,6 +1104,8 @@ static const struct dev_pm_ops h5_serdev_pm_ops = {
>   
>   static const struct of_device_id rtl_bluetooth_of_match[] = {
>   #ifdef CONFIG_BT_HCIUART_RTL
> +	{ .compatible = "realtek,rtl8822bs-bt",
> +	  .data = (const void *)&h5_data_rtl8822bs },
>   	{ .compatible = "realtek,rtl8822cs-bt",
>   	  .data = (const void *)&h5_data_rtl8822cs },
>   	{ .compatible = "realtek,rtl8723bs-bt",