From: Tim Jiang <tjiang@xxxxxxxxxxxxxx>
we have variant wcn6855 soc chip from different vendors, so we should
use different nvm file with suffix to distinguish them.
Signed-off-by: Tim Jiang <tjiang@xxxxxxxxxxxxxx>
---
drivers/bluetooth/btusb.c | 46 ++++++++++++++++++++++++++++++++++++----------
1 file changed, 36 insertions(+), 10 deletions(-)
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 60d2fce59a71..9b4408307138 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -3141,6 +3141,9 @@ static int btusb_set_bdaddr_wcn6855(struct hci_dev *hdev,
#define QCA_DFU_TIMEOUT 3000
#define QCA_FLAG_MULTI_NVM 0x80
+#define WCN6855_2_0_RAM_VERSION_GF 0x400c1200
+#define WCN6855_2_1_RAM_VERSION_GF 0x400c1211
+
struct qca_version {
__le32 rom_version;
__le32 patch_version;
@@ -3172,6 +3175,7 @@ static const struct qca_device_info qca_devices_table[] = {
{ 0x00000302, 28, 4, 16 }, /* Rome 3.2 */
{ 0x00130100, 40, 4, 16 }, /* WCN6855 1.0 */
{ 0x00130200, 40, 4, 16 }, /* WCN6855 2.0 */
+ { 0x00130201, 40, 4, 16 }, /* WCN6855 2.1 */
};
static int btusb_qca_send_vendor_req(struct usb_device *udev, u8 request,
@@ -3326,22 +3330,24 @@ static int btusb_setup_qca_load_rampatch(struct hci_dev *hdev,
return err;
}
-static int btusb_setup_qca_load_nvm(struct hci_dev *hdev,
- struct qca_version *ver,
- const struct qca_device_info *info)
+static void btusb_generate_qca_nvm_name(char **fwname,
+ int max_size,
+ struct qca_version *ver,
+ char *separator,
+ char *vendor)
{
- const struct firmware *fw;
- char fwname[64];
- int err;
-
if (((ver->flag >> 8) & 0xff) == QCA_FLAG_MULTI_NVM) {
/* if boardid equal 0, use default nvm without surfix */
if (le16_to_cpu(ver->board_id) == 0x0) {
- snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x.bin",
- le32_to_cpu(ver->rom_version));
+ snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x%s%s.bin",
+ le32_to_cpu(ver->rom_version),
+ separator,
+ vendor);
} else {
- snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x_%04x.bin",
+ snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x%s%s%04x.bin",
le32_to_cpu(ver->rom_version),
+ separator,
+ vendor,
le16_to_cpu(ver->board_id));
}
} else {
@@ -3349,6 +3355,26 @@ static int btusb_setup_qca_load_nvm(struct hci_dev *hdev,
le32_to_cpu(ver->rom_version));
}
+}
+
+static int btusb_setup_qca_load_nvm(struct hci_dev *hdev,
+ struct qca_version *ver,
+ const struct qca_device_info *info)
+{
+ const struct firmware *fw;
+ char fwname[64];
+ int err;
+
+ switch (ver->ram_version) {
+ case WCN6855_2_0_RAM_VERSION_GF:
+ case WCN6855_2_1_RAM_VERSION_GF:
+ btusb_generate_qca_nvm_name(&fwname, sizeof(fwname), ver, "_", "gf");
+ break;
+ default:
+ btusb_generate_qca_nvm_name(&fwname, sizeof(fwname), ver, NULL, NULL);
+ break;
+ }
+
err = request_firmware(&fw, fwname, &hdev->dev);
if (err) {
bt_dev_err(hdev, "failed to request NVM file: %s (%d)",
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
