On Fri, Nov 14, 2025 at 04:17:51PM +0800, Shuai Zhang wrote:
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.
It's not that it existed beforehand. Please write your commit message logically: historically WCN685x and QCA2066 were using the same firmware files, you are planning to introduce changes to the firmware which will not be compatible with QCA2066, which promts you to use new firmware name for WCN685x.
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.
Cc: stable@vger.kernel.org Fixes: 30209aeff75f ("Bluetooth: qca: Expand firmware-name to load specific rampatch")
No, there was no issue in that commit.
Signed-off-by: Shuai Zhang shuai.zhang@oss.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;@@ -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;@@ -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;
-- 2.34.1