tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Bluetooth: btqca: Add WCN6855 firmware priority selection feature

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

Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: Shuai Zhang <shuai.zhang@oss.qualcomm.com>
Acked-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

authored by

Shuai Zhang and committed by
Luiz Augusto von Dentz 520257cf ff3bb47a

+18 -3
+18 -3
drivers/bluetooth/btqca.c
··· 830 830 "qca/msbtfw%02x.mbn", rom_ver); 831 831 break; 832 832 case QCA_WCN6855: 833 + /* Due to historical reasons, WCN685x chip has been using firmware 834 + * without the "wcn" prefix. The mapping between the chip and its 835 + * corresponding firmware has now been corrected. 836 + */ 833 837 snprintf(config.fwname, sizeof(config.fwname), 834 - "qca/hpbtfw%02x.tlv", rom_ver); 838 + "qca/wcnhpbtfw%02x.tlv", rom_ver); 835 839 break; 836 840 case QCA_WCN7850: 837 841 snprintf(config.fwname, sizeof(config.fwname), ··· 858 854 snprintf(config.fwname, sizeof(config.fwname), 859 855 "qca/msbtfw%02x.tlv", rom_ver); 860 856 bt_dev_info(hdev, "QCA Downloading %s", config.fwname); 857 + err = qca_download_firmware(hdev, &config, soc_type, rom_ver); 858 + } else if (err < 0 && !rampatch_name && soc_type == QCA_WCN6855) { 859 + snprintf(config.fwname, sizeof(config.fwname), 860 + "qca/hpbtfw%02x.tlv", rom_ver); 861 861 err = qca_download_firmware(hdev, &config, soc_type, rom_ver); 862 862 } 863 863 ··· 928 920 case QCA_WCN6855: 929 921 qca_read_fw_board_id(hdev, &boardid); 930 922 qca_get_nvm_name_by_board(config.fwname, sizeof(config.fwname), 931 - "hpnv", soc_type, ver, rom_ver, boardid); 923 + "wcnhpnv", soc_type, ver, rom_ver, boardid); 932 924 break; 933 925 case QCA_WCN7850: 934 926 qca_get_nvm_name_by_board(config.fwname, sizeof(config.fwname), ··· 941 933 } 942 934 943 935 err = qca_download_firmware(hdev, &config, soc_type, rom_ver); 936 + if (err < 0 && !firmware_name && soc_type == QCA_WCN6855) { 937 + qca_get_nvm_name_by_board(config.fwname, sizeof(config.fwname), 938 + "hpnv", soc_type, ver, rom_ver, boardid); 939 + err = qca_download_firmware(hdev, &config, soc_type, rom_ver); 940 + } 941 + 944 942 if (err < 0) { 945 - bt_dev_err(hdev, "QCA Failed to download NVM (%d)", err); 943 + bt_dev_err(hdev, "QCA Failed to request file: %s (%d)", 944 + config.fwname, err); 946 945 return err; 947 946 } 948 947