1. Patchew
  2. linux
  3. View series

[PATCH v1] Bluetooth: btusb: add default nvm file

Shuai Zhang posted 1 patch 3 months, 1 week ago
There is a newer version of this series
drivers/bluetooth/btusb.c | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
[PATCH v1] Bluetooth: btusb: add default nvm file
Posted by Shuai Zhang 3 months, 1 week ago 
If no NVM file matches the board_id, load the default NVM file.

Signed-off-by: Shuai Zhang <quic_shuaz@quicinc.com>
---
 drivers/bluetooth/btusb.c | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index dcbff7641..998dfd455 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,13 +3521,25 @@ 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);
+		if (err == -ENOENT && board_id != 0) {
+			board_id = 0;
+			goto retry;
+		}
 		return err;
 	}
 
-- 
2.34.1
Re: [PATCH v1] Bluetooth: btusb: add default nvm file
Posted by Dmitry Baryshkov 3 months, 1 week ago 
On Tue, Oct 28, 2025 at 08:05:50PM +0800, Shuai Zhang wrote:
> If no NVM file matches the board_id, load the default NVM file.
> 
> Signed-off-by: Shuai Zhang <quic_shuaz@quicinc.com>
> ---
>  drivers/bluetooth/btusb.c | 19 +++++++++++++++----
>  1 file changed, 15 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
> index dcbff7641..998dfd455 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,13 +3521,25 @@ 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);
> +		if (err == -ENOENT && board_id != 0) {
> +			board_id = 0;
> +			goto retry;
> +		}

I'd rather see here:

  } else {
	bt_dev_err(hdev, "QCOM BT firmware file request failed (%d)", err);
	return err;
  }

>  		return err;
>  	}
>  
> -- 
> 2.34.1
> 

-- 
With best wishes
Dmitry
Re: [PATCH v1] Bluetooth: btusb: add default nvm file
Posted by Shuai Zhang 3 months, 1 week ago 
Hi Dmitry

On 10/29/2025 12:57 AM, Dmitry Baryshkov wrote:
> On Tue, Oct 28, 2025 at 08:05:50PM +0800, Shuai Zhang wrote:
>> If no NVM file matches the board_id, load the default NVM file.
>>
>> Signed-off-by: Shuai Zhang <quic_shuaz@quicinc.com>
>> ---
>>  drivers/bluetooth/btusb.c | 19 +++++++++++++++----
>>  1 file changed, 15 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
>> index dcbff7641..998dfd455 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,13 +3521,25 @@ 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);
>> +		if (err == -ENOENT && board_id != 0) {
>> +			board_id = 0;
>> +			goto retry;
>> +		}
> 
> I'd rather see here:
> 
>   } else {
> 	bt_dev_err(hdev, "QCOM BT firmware file request failed (%d)", err);
> 	return err;
>   }
> 

This will make the log clearer. Thank you for your suggestion;I will update it.

>>  		return err;
>>  	}
>>  
>> -- 
>> 2.34.1
>>
> 
BR，
Shuai

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.