[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <8ffee44c-0e44-4137-bf9e-11e7d8b168ab@molgen.mpg.de>
Date: Fri, 14 Nov 2025 11:45:20 +0100
From: Paul Menzel <pmenzel@...gen.mpg.de>
To: Shuai Zhang <shuai.zhang@....qualcomm.com>
Cc: Bartosz Golaszewski <brgl@...ev.pl>, Marcel Holtmann
<marcel@...tmann.org>, Luiz Augusto von Dentz <luiz.dentz@...il.com>,
linux-arm-msm@...r.kernel.org, linux-bluetooth@...r.kernel.org,
linux-kernel@...r.kernel.org, cheng.jiang@....qualcomm.com,
quic_chezhou@...cinc.com, wei.deng@....qualcomm.com, stable@...r.kernel.org
Subject: Re: [PATCH v2 1/1] Bluetooth: btqca: Add WCN6855 firmware priority
selection feature
Dear Shuai,
Am 14.11.25 um 11:41 schrieb Shuai Zhang:
> On 11/14/2025 6:04 PM, Paul Menzel wrote:
>> Am 14.11.25 um 09:17 schrieb Shuai Zhang:
>>> The prefix "wcn" corresponds to the WCN685x chip, while entries without
>>> the "wcn" prefix correspond to the QCA2066 chip. There are some feature
>>> differences between the two.
>>>
>>> However, due to historical reasons, WCN685x chip has been using firmware
>>> without the "wcn" prefix. The mapping between the chip and its
>>> corresponding firmware has now been corrected.
>>
>> Present tense: … is now corrected.
>>
>> Maybe give one example of the firmware file.
>>
>> How did you test this? Maybe paste some log lines before and after?
>>
> Should I put the test log results directly in the commit?
Without knowing how they look, I cannot say for sure, but yes, I would
add as much as possible to the commit message.
>>> Cc: stable@...r.kernel.org
>>> Fixes: 30209aeff75f ("Bluetooth: qca: Expand firmware-name to load
>>> specific rampatch")
>>> Signed-off-by: Shuai Zhang <shuai.zhang@....qualcomm.com>
>>> ---
>>> drivers/bluetooth/btqca.c | 22 ++++++++++++++++++++--
>>> 1 file changed, 20 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c
>>> index 7c958d606..8e0004ef7 100644
>>> --- a/drivers/bluetooth/btqca.c
>>> +++ b/drivers/bluetooth/btqca.c
>>> @@ -847,8 +847,12 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
>>> "qca/msbtfw%02x.mbn", rom_ver);
>>> break;
>>> case QCA_WCN6855:
>>> + /* Due to historical reasons, WCN685x chip has been using firmware
>>> + * without the "wcn" prefix. The mapping between the chip and its
>>> + * corresponding firmware has now been corrected.
>>> + */
>>> snprintf(config.fwname, sizeof(config.fwname),
>>> - "qca/hpbtfw%02x.tlv", rom_ver);
>>> + "qca/wcnhpbtfw%02x.tlv", rom_ver);
>>> break;
>>> case QCA_WCN7850:
>>> snprintf(config.fwname, sizeof(config.fwname),
>>> @@ -861,6 +865,13 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
>>> }
>>> err = qca_download_firmware(hdev, &config, soc_type, rom_ver);
>>> +
>>> + if (!rampatch_name && err < 0 && soc_type == QCA_WCN6855) {
>>> + snprintf(config.fwname, sizeof(config.fwname),
>>> + "qca/hpbtfw%02x.tlv", rom_ver);
>>> + err = qca_download_firmware(hdev, &config, soc_type, rom_ver);
>>> + }
>>> +
>>> if (err < 0) {
>>> bt_dev_err(hdev, "QCA Failed to download patch (%d)", err);
>>> return err;
>>> @@ -923,7 +934,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
>>> case QCA_WCN6855:
>>> qca_read_fw_board_id(hdev, &boardid);
>>> qca_get_nvm_name_by_board(config.fwname, sizeof(config.fwname),
>>> - "hpnv", soc_type, ver, rom_ver, boardid);
>>> + "wcnhpnv", soc_type, ver, rom_ver, boardid);
>>> break;
>>> case QCA_WCN7850:
>>> qca_get_nvm_name_by_board(config.fwname, sizeof(config.fwname),
>>> @@ -936,6 +947,13 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
>>> }
>>> err = qca_download_firmware(hdev, &config, soc_type, rom_ver);
>>> +
>>> + if (!firmware_name && err < 0 && soc_type == QCA_WCN6855) {
>>> + qca_get_nvm_name_by_board(config.fwname, sizeof(config.fwname),
>>> + "hpnv", soc_type, ver, rom_ver, boardid);
>>> + err = qca_download_firmware(hdev, &config, soc_type, rom_ver);
>>> + }
>>> +
>>> if (err < 0) {
>>> bt_dev_err(hdev, "QCA Failed to download NVM (%d)", err);
>>> return err;
>>
>> The diff logs good.
>>
>> Reviewed-by: Paul Menzel <pmenzel@...gen.mpg.de>
Kind regards,
Paul
Powered by blists - more mailing lists