Re: [PATCH v2 1/1] Bluetooth: btrtl: Add missing MODULE_FIRMWARE declarations

[Vitaly Chikunov]

Greg, Sasha,

Please add this patch to 6.1.x branch. Mainline commit
bb23f07cb63975968bbabe314486e2b087234fc5

This will fix Bluetooth support (visibility of devices) and manifested
errors during boot:

  bluetooth hci0: Direct firmware load for rtl_bt/rtl8822cu_fw.bin failed with error -2
  Bluetooth: hci0: RTL: firmware file rtl_bt/rtl8822cu_fw.bin not found

Downstream bug report: https://bugzilla.altlinux.org/50471

Thanks,

On Tue, May 09, 2023 at 12:51:19PM -0700, Dan Gora wrote:
> Add missing MODULE_FIRMWARE declarations for firmware referenced in
> btrtl.c.
> 
> Signed-off-by: Dan Gora <dan.gora@xxxxxxxxx>
> ---
>  drivers/bluetooth/btrtl.c | 18 ++++++++++++++++--
>  1 file changed, 16 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c
> index 2915c82d719d..d978e7cea873 100644
> --- a/drivers/bluetooth/btrtl.c
> +++ b/drivers/bluetooth/btrtl.c
> @@ -1367,14 +1367,30 @@ MODULE_FIRMWARE("rtl_bt/rtl8723cs_vf_fw.bin");
>  MODULE_FIRMWARE("rtl_bt/rtl8723cs_vf_config.bin");
>  MODULE_FIRMWARE("rtl_bt/rtl8723cs_xx_fw.bin");
>  MODULE_FIRMWARE("rtl_bt/rtl8723cs_xx_config.bin");
> +MODULE_FIRMWARE("rtl_bt/rtl8723d_fw.bin");
> +MODULE_FIRMWARE("rtl_bt/rtl8723d_config.bin");
>  MODULE_FIRMWARE("rtl_bt/rtl8723ds_fw.bin");
>  MODULE_FIRMWARE("rtl_bt/rtl8723ds_config.bin");
>  MODULE_FIRMWARE("rtl_bt/rtl8761a_fw.bin");
>  MODULE_FIRMWARE("rtl_bt/rtl8761a_config.bin");
> +MODULE_FIRMWARE("rtl_bt/rtl8761b_fw.bin");
> +MODULE_FIRMWARE("rtl_bt/rtl8761b_config.bin");
> +MODULE_FIRMWARE("rtl_bt/rtl8761bu_fw.bin");
> +MODULE_FIRMWARE("rtl_bt/rtl8761bu_config.bin");
>  MODULE_FIRMWARE("rtl_bt/rtl8821a_fw.bin");
>  MODULE_FIRMWARE("rtl_bt/rtl8821a_config.bin");
> +MODULE_FIRMWARE("rtl_bt/rtl8821c_fw.bin");
> +MODULE_FIRMWARE("rtl_bt/rtl8821c_config.bin");
> +MODULE_FIRMWARE("rtl_bt/rtl8821cs_fw.bin");
> +MODULE_FIRMWARE("rtl_bt/rtl8821cs_config.bin");
>  MODULE_FIRMWARE("rtl_bt/rtl8822b_fw.bin");
>  MODULE_FIRMWARE("rtl_bt/rtl8822b_config.bin");
> +MODULE_FIRMWARE("rtl_bt/rtl8822cs_fw.bin");
> +MODULE_FIRMWARE("rtl_bt/rtl8822cs_config.bin");
> +MODULE_FIRMWARE("rtl_bt/rtl8822cu_fw.bin");
> +MODULE_FIRMWARE("rtl_bt/rtl8822cu_config.bin");
> +MODULE_FIRMWARE("rtl_bt/rtl8851bu_fw.bin");
> +MODULE_FIRMWARE("rtl_bt/rtl8851bu_config.bin");
>  MODULE_FIRMWARE("rtl_bt/rtl8852au_fw.bin");
>  MODULE_FIRMWARE("rtl_bt/rtl8852au_config.bin");
>  MODULE_FIRMWARE("rtl_bt/rtl8852bs_fw.bin");
> @@ -1383,5 +1399,3 @@ MODULE_FIRMWARE("rtl_bt/rtl8852bu_fw.bin");
>  MODULE_FIRMWARE("rtl_bt/rtl8852bu_config.bin");
>  MODULE_FIRMWARE("rtl_bt/rtl8852cu_fw.bin");
>  MODULE_FIRMWARE("rtl_bt/rtl8852cu_config.bin");
> -MODULE_FIRMWARE("rtl_bt/rtl8851bu_fw.bin");
> -MODULE_FIRMWARE("rtl_bt/rtl8851bu_config.bin");
> -- 
> 2.35.1.102.g2b9c120970
>