Re: [PATCH v2 1/1] Bluetooth: btusb: add default nvm file

[Luiz Augusto von Dentz]

Hi,

On Tue, Oct 28, 2025 at 10:30 PM Shuai Zhang <quic_shuaz@xxxxxxxxxxx> wrote:
>
> If no NVM file matches the board_id, load the default NVM file.
>
> Signed-off-by: Shuai Zhang <quic_shuaz@xxxxxxxxxxx>
> Cc: stable@xxxxxxxxxxxxxxx
> ---
>  drivers/bluetooth/btusb.c | 23 ++++++++++++++++++-----
>  1 file changed, 18 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
> index dcbff7641..6903606d3 100644
> --- a/drivers/bluetooth/btusb.c
> +++ b/drivers/bluetooth/btusb.c
> @@ -3482,15 +3482,14 @@ static int btusb_setup_qca_load_rampatch(struct hci_dev *hdev,
>  }
>
>  static void btusb_generate_qca_nvm_name(char *fwname, size_t max_size,
> -                                       const struct qca_version *ver)
> +                                       const struct qca_version *ver,
> +                                       u16 board_id)
>  {
>         u32 rom_version = le32_to_cpu(ver->rom_version);
>         const char *variant, *fw_subdir;
>         int len;
> -       u16 board_id;
>
>         fw_subdir = qca_get_fw_subdirectory(ver);
> -       board_id = qca_extract_board_id(ver);
>
>         switch (le32_to_cpu(ver->ram_version)) {
>         case WCN6855_2_0_RAM_VERSION_GF:
> @@ -3522,14 +3521,28 @@ static int btusb_setup_qca_load_nvm(struct hci_dev *hdev,
>         const struct firmware *fw;
>         char fwname[80];
>         int err;
> +       u16 board_id = 0;
>
> -       btusb_generate_qca_nvm_name(fwname, sizeof(fwname), ver);
> +       board_id = qca_extract_board_id(ver);
>
> +retry:
> +       btusb_generate_qca_nvm_name(fwname, sizeof(fwname), ver, board_id);
>         err = request_firmware(&fw, fwname, &hdev->dev);
>         if (err) {
> +               if (err == -EINVAL) {
> +                       bt_dev_err(hdev, "QCOM BT firmware file request failed (%d)", err);
> +                       return err;
> +               }
> +
>                 bt_dev_err(hdev, "failed to request NVM file: %s (%d)",
>                            fwname, err);
> -               return err;
> +               if (err == -ENOENT && board_id != 0) {
> +                       board_id = 0;
> +                       goto retry;

goto backwards is asking for trouble, just split the required code
into its own function and then call it again with board set to 0.

> +               } else {
> +                       bt_dev_err(hdev, "QCOM BT firmware file request failed (%d)", err);
> +                       return err;
> +               }
>         }
>
>         bt_dev_info(hdev, "using NVM file: %s", fwname);
> --
> 2.34.1
>


-- 
Luiz Augusto von Dentz