[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <76edfe9c-1302-4e63-8bcd-ee7dd55a128d@oss.qualcomm.com>
Date: Tue, 18 Nov 2025 21:44:57 +0800
From: Shuai Zhang <shuai.zhang@....qualcomm.com>
To: Bartosz Golaszewski <brgl@...ev.pl>,
Marcel Holtmann
<marcel@...tmann.org>,
Luiz Augusto von Dentz <luiz.dentz@...il.com>
Cc: 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
Subject: Re: [PATCH v3 1/1] Bluetooth: btqca: Add WCN6855 firmware priority
selection feature
Dear
On 11/17/2025 10:16 AM, Shuai Zhang wrote:
> Historically, WCN685x and QCA2066 shared the same firmware files.
> Now, changes are planned for the firmware that will make it incompatible
> with QCA2066, so a new firmware name is required for WCN685x.
>
> Test Steps:
> - Boot device
> - Check the BTFW loading status via dmesg
>
> Sanity pass and Test Log:
> QCA Downloading qca/wcnhpbftfw21.tlv
> Direct firmware load for qca/wcnhpbftfw21.tlv failed with error -2
> QCA Downloading qca/hpbftfw21.tlv
>
> 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;
Could you confirm if it has already been accepted?
Kindly,regard
Shuai
Powered by blists - more mailing lists