Dear Luiz
On 11/4/2025 7:24 PM, Shuai Zhang wrote:
If no NVM file matches the board_id, load the default NVM file.
Cc: stable@vger.kernel.org Signed-off-by: Shuai Zhang quic_shuaz@quicinc.com
drivers/bluetooth/btusb.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-)
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index dcbff7641..020dbb0ab 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: @@ -3517,14 +3516,14 @@ static void btusb_generate_qca_nvm_name(char *fwname, size_t max_size, static int btusb_setup_qca_load_nvm(struct hci_dev *hdev, struct qca_version *ver,
const struct qca_device_info *info)
const struct qca_device_info *info,u16 board_id){ const struct firmware *fw; char fwname[80]; int err;
- btusb_generate_qca_nvm_name(fwname, sizeof(fwname), ver);
- btusb_generate_qca_nvm_name(fwname, sizeof(fwname), ver, board_id); err = request_firmware(&fw, fwname, &hdev->dev); if (err) { bt_dev_err(hdev, "failed to request NVM file: %s (%d)",
@@ -3606,10 +3605,19 @@ static int btusb_setup_qca(struct hci_dev *hdev) btdata->qca_dump.controller_id = le32_to_cpu(ver.rom_version); if (!(status & QCA_SYSCFG_UPDATED)) {
err = btusb_setup_qca_load_nvm(hdev, &ver, info);if (err < 0)return err;
u16 board_id = qca_extract_board_id(&ver);
err = btusb_setup_qca_load_nvm(hdev, &ver, info, board_id);if (err < 0) {//if the board id is not 0, try to load the defalut nvm fileif (err == -ENOENT && board_id != 0) {err = btusb_setup_qca_load_nvm(hdev, &ver, info, 0);if (err < 0)return err;} else {return err;}}
- wait ~100ms for reset Done then go ahead, otherwise, it maybe
- cause potential enable failure.
Please let me know if there are any updates or if modifications are needed. Thank you!
Best regards, Shuai