[PATCH v3] Bluetooth: btusb: Add support different nvm to distinguish different factory for WCN6855 controller

* [PATCH v3] Bluetooth: btusb: Add support different nvm to distinguish different factory for WCN6855 controller
@ 2021-08-12  8:50 Zijun Hu
  2021-08-12 10:06 ` [v3] " bluez.test.bot
                   ` (3 more replies)
  0 siblings, 4 replies; 7+ messages in thread
From: Zijun Hu @ 2021-08-12  8:50 UTC (permalink / raw)
  To: marcel, johan.hedberg, luiz.dentz
  Cc: linux-kernel, linux-bluetooth, linux-arm-msm, bgodavar, c-hbandi,
	hemantg, mka, rjliao, zijuhu, tjiang

From: Tim Jiang <tjiang@codeaurora.org>

we have different factory to produce wcn6855 soc chip, so we should
use different nvm file with suffix to distinguish them.

Signed-off-by: Tim Jiang <tjiang@codeaurora.org>
---
 drivers/bluetooth/btusb.c | 60 ++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 51 insertions(+), 9 deletions(-)

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index b1a05bb9f4bf..d7b4e0f1c3e3 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -4013,6 +4013,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;
@@ -4044,6 +4047,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,
@@ -4198,6 +4202,39 @@ static int btusb_setup_qca_load_rampatch(struct hci_dev *hdev,
 	return err;
 }
 
+static int btusb_setup_qca_form_nvm_name(char **fwname,
+					int max_size,
+					struct qca_version *ver,
+					char *factory)
+{
+	/* if boardid equal 0, use default nvm without suffix */
+	switch (le16_to_cpu(ver->board_id)) {
+	case 0x0:
+		/* we add suffix factory to distinguish with different factory. */
+		if (factory != NULL) {
+			snprintf(*fwname, max_size, "qca/nvm_usb_%08x_%s.bin",
+				 le32_to_cpu(ver->rom_version),
+				 factory);
+		} else {
+			snprintf(*fwname, max_size, "qca/nvm_usb_%08x.bin",
+				 le32_to_cpu(ver->rom_version));
+		}
+		break;
+	default:
+		if (factory != NULL) {
+			snprintf(*fwname, max_size, "qca/nvm_usb_%08x_%s_%04x.bin",
+				le32_to_cpu(ver->rom_version),
+				factory,
+				le16_to_cpu(ver->board_id));
+		} else {
+			snprintf(*fwname, max_size, "qca/nvm_usb_%08x_%04x.bin",
+				le32_to_cpu(ver->rom_version),
+				le16_to_cpu(ver->board_id));
+		}
+		break;
+	}
+}
+
 static int btusb_setup_qca_load_nvm(struct hci_dev *hdev,
 				    struct qca_version *ver,
 				    const struct qca_device_info *info)
@@ -4206,19 +4243,24 @@ static int btusb_setup_qca_load_nvm(struct hci_dev *hdev,
 	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) {
+	switch (ver->ram_version) {
+	case WCN6855_2_0_RAM_VERSION_GF:
+	case WCN6855_2_1_RAM_VERSION_GF:
+		if (((ver->flag >> 8) & 0xff) == QCA_FLAG_MULTI_NVM) {
+			btusb_setup_qca_form_nvm_name(&fwname, sizeof(fwname), ver, "gf");
+		} else {
 			snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x.bin",
 				 le32_to_cpu(ver->rom_version));
+		}
+		break;
+	default:
+		if (((ver->flag >> 8) & 0xff) == QCA_FLAG_MULTI_NVM) {
+			btusb_setup_qca_form_nvm_name(&fwname, sizeof(fwname), ver, NULL);
 		} else {
-			snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x_%04x.bin",
-				le32_to_cpu(ver->rom_version),
-				le16_to_cpu(ver->board_id));
+			snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x.bin",
+				 le32_to_cpu(ver->rom_version));
 		}
-	} else {
-		snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x.bin",
-			 le32_to_cpu(ver->rom_version));
+		break;
 	}
 
 	err = request_firmware(&fw, fwname, &hdev->dev);
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project


^ permalink raw reply related	[flat|nested] 7+ messages in thread