linux-kernel - Re: [PATCH v1] Bluetooth: btusb: add default nvm file

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <ee4478c6-32ca-4c30-aee6-994f39532dc7@quicinc.com>
Date: Wed, 29 Oct 2025 10:02:05 +0800
From: Shuai Zhang <quic_shuaz@...cinc.com>
To: Dmitry Baryshkov <dmitry.baryshkov@....qualcomm.com>
CC: <marcel@...tmann.org>, <luiz.dentz@...il.com>,
        <linux-bluetooth@...r.kernel.org>, <stable@...r.kernel.org>,
        <linux-arm-msm@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
        <quic_chejiang@...cinc.com>
Subject: Re: [PATCH v1] Bluetooth: btusb: add default nvm file

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@...cinc.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