Skip to contentSkip to conversation

Bluetooth: btusb: Add support for variant WCN6855 by using different nvm

PATCH Superseded [email protected] 2 participants 6 messages Oct 12, 2021 – Oct 21, 2021

Subsystems (2)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 Bluetooth: btusb: Add support for variant WCN6855 by using different nvm

the RF performance of wcn6855 soc chip from different foundries will be difference, so we should use different nvm to configure them.

---
 drivers/bluetooth/btusb.c | 56 
+++++++++++++++++++++++++++++++++++------------
 1 file changed, 42 insertions(+), 14 deletions(-)
drivers/bluetooth/btusb.c +4 -0
index 75c83768c257..f352ff351b61 100644
@@ -3190,6 +3190,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;
@@ -3221,6 +3224,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,
@@ -3375,6 +3379,43 @@ static int btusb_setup_qca_load_rampatch(struct hci_dev *hdev,
return err;
}

+static void btusb_generate_qca_nvm_name(char *fwname,
+ size_t max_size,
+ struct qca_version *ver)
+{
+ u32 rom_version = le32_to_cpu(ver->rom_version);
+ u16 flag = le16_to_cpu(ver->flag);
+
+ if (((flag >> 8) & 0xff) == QCA_FLAG_MULTI_NVM) {
+ u16 board_id = le16_to_cpu(ver->board_id);
+ u32 ram_version = le32_to_cpu(ver->ram_version);
+ const char *variant;
+
+ switch (ram_version) {
+ case WCN6855_2_0_RAM_VERSION_GF:
+ case WCN6855_2_1_RAM_VERSION_GF:
+ variant = "_gf";
+ break;
+ default:
+ variant = "";
+ break;
+ }
+
+ /* if boardid equal 0, use default nvm without suffix */
+ if (board_id == 0x0) {
+ snprintf(fwname, max_size, "qca/nvm_usb_%08x%s.bin",
+ rom_version, variant);
+ } else {
+ snprintf(fwname, max_size, "qca/nvm_usb_%08x%s_%04x.bin",
+ rom_version, variant, board_id);
+ }
+ } else {
+ snprintf(fwname, max_size, "qca/nvm_usb_%08x.bin",
+ rom_version);
+ }
+
+}
+
static int btusb_setup_qca_load_nvm(struct hci_dev *hdev,
struct qca_version *ver,
const struct qca_device_info *info)
@@ -3383,20 +3424,7 @@ 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) {
- snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x.bin",
- le32_to_cpu(ver->rom_version));
- } else {
- snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x_%04x.bin",
- le32_to_cpu(ver->rom_version),
- le16_to_cpu(ver->board_id));
- }
- } else {
- snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x.bin",
- le32_to_cpu(ver->rom_version));
- }
+ btusb_generate_qca_nvm_name(fwname, sizeof(fwname), ver);

err = request_firmware(&fw, fwname, &hdev->dev); if (err) {

Signature · 1 line
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
#1 lore raw

marcel:
sorry to disturb you , could you help review this patch ? thank you.

regards.
tim

Quoted 102 lines · On 2021-10-12 15:55, [email protected] wrote:

the RF performance of wcn6855 soc chip from different foundries will be difference, so we should use different nvm to configure them.

---
 drivers/bluetooth/btusb.c | 56 
+++++++++++++++++++++++++++++++++++------------
 1 file changed, 42 insertions(+), 14 deletions(-)
drivers/bluetooth/btusb.c +3 -0
index 75c83768c257..f352ff351b61 100644
@@ -3190,6 +3190,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;
drivers/bluetooth/btusb.c +1 -0
 	__le32	patch_version;
@@ -3221,6 +3224,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,

drivers/bluetooth/btusb.c +37 -0
@@ -3375,6 +3379,43 @@ static int btusb_setup_qca_load_rampatch(struct
 hci_dev *hdev,
 	return err;
 }
 
+static void btusb_generate_qca_nvm_name(char *fwname,
+					size_t max_size,
+					struct qca_version *ver)
+{
+	u32 rom_version = le32_to_cpu(ver->rom_version);
+	u16 flag = le16_to_cpu(ver->flag);
+
+	if (((flag >> 8) & 0xff) == QCA_FLAG_MULTI_NVM) {
+		u16 board_id = le16_to_cpu(ver->board_id);
+		u32 ram_version = le32_to_cpu(ver->ram_version);
+		const char *variant;
+
+		switch (ram_version) {
+		case WCN6855_2_0_RAM_VERSION_GF:
+		case WCN6855_2_1_RAM_VERSION_GF:
+			variant = "_gf";
+			break;
+		default:
+			variant = "";
+			break;
+		}
+
+		/* if boardid equal 0, use default nvm without suffix */
+		if (board_id == 0x0) {
+			snprintf(fwname, max_size, "qca/nvm_usb_%08x%s.bin",
+				rom_version, variant);
+		} else {
+			snprintf(fwname, max_size, "qca/nvm_usb_%08x%s_%04x.bin",
+				rom_version, variant, board_id);
+		}
+	} else {
+		snprintf(fwname, max_size, "qca/nvm_usb_%08x.bin",
+			rom_version);
+	}
+
+}
+
 static int btusb_setup_qca_load_nvm(struct hci_dev *hdev,
 				    struct qca_version *ver,
drivers/bluetooth/btusb.c +1 -14
 				    const struct qca_device_info *info)
@@ -3383,20 +3424,7 @@ 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) {
-			snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x.bin",
-				 le32_to_cpu(ver->rom_version));
-		} else {
-			snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x_%04x.bin",
-				le32_to_cpu(ver->rom_version),
-				le16_to_cpu(ver->board_id));
-		}
-	} else {
-		snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x.bin",
-			 le32_to_cpu(ver->rom_version));
-	}
+	btusb_generate_qca_nvm_name(fwname, sizeof(fwname), ver);
 
 	err = request_firmware(&fw, fwname, &hdev->dev);

if (err) {

#2 lore raw
In reply to [email protected]
Quoted 34 lines · On Tue, Oct 12, 2021 at 03:55:56PM +0800, [email protected] wrote:

the RF performance of wcn6855 soc chip from different foundries will be difference, so we should use different nvm to configure them.

---
 drivers/bluetooth/btusb.c | 56
+++++++++++++++++++++++++++++++++++------------
 1 file changed, 42 insertions(+), 14 deletions(-)
drivers/bluetooth/btusb.c +3 -0
index 75c83768c257..f352ff351b61 100644
@@ -3190,6 +3190,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;
drivers/bluetooth/btusb.c +1 -0
 	__le32	patch_version;
@@ -3221,6 +3224,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,

drivers/bluetooth/btusb.c static int btusb_setup_qca_load_rampatch(struct · line 3385

Quoted 7 lines
drivers/bluetooth/btusb.c +3 -0
@@ -3375,6 +3379,43 @@ static int btusb_setup_qca_load_rampatch(struct
 hci_dev *hdev,
 	return err;
 }
 
+static void btusb_generate_qca_nvm_name(char *fwname,
+					size_t max_size,
+					struct qca_version *ver)

=> const struct qca_version *ver

Quoted 6 lines
drivers/bluetooth/btusb.c +6 -0
+{
+	u32 rom_version = le32_to_cpu(ver->rom_version);
+	u16 flag = le16_to_cpu(ver->flag);
+
+	if (((flag >> 8) & 0xff) == QCA_FLAG_MULTI_NVM) {
+		u16 board_id = le16_to_cpu(ver->board_id);

drivers/bluetooth/btusb.c static int btusb_setup_qca_load_rampatch(struct · line 3401

Quoted 10 lines
drivers/bluetooth/btusb.c +10 -0
+		u32 ram_version = le32_to_cpu(ver->ram_version);
+		const char *variant;
+
+		switch (ram_version) {
+		case WCN6855_2_0_RAM_VERSION_GF:
+		case WCN6855_2_1_RAM_VERSION_GF:
+			variant = "_gf";
+			break;
+		default:
+			variant = "";

instead of the default branch you could assign a default to 'variant' at declaration time, but it's fine either way.

drivers/bluetooth/btusb.c static int btusb_setup_qca_load_rampatch(struct · line 3405

Quoted 4 lines
drivers/bluetooth/btusb.c +4 -0
+			break;
+		}
+
+		/* if boardid equal 0, use default nvm without suffix */

delete the comment, it just states the obvious

drivers/bluetooth/btusb.c static int btusb_setup_qca_load_rampatch(struct · line 3406

Quoted 1 line
drivers/bluetooth/btusb.c +1 -0
+		if (board_id == 0x0) {

nit: is there really any value in using a hex number here instead of a plain decimal 0?

Quoted 39 lines
drivers/bluetooth/btusb.c +13 -0
+			snprintf(fwname, max_size, "qca/nvm_usb_%08x%s.bin",
+				rom_version, variant);
+		} else {
+			snprintf(fwname, max_size, "qca/nvm_usb_%08x%s_%04x.bin",
+				rom_version, variant, board_id);
+		}
+	} else {
+		snprintf(fwname, max_size, "qca/nvm_usb_%08x.bin",
+			rom_version);
+	}
+
+}
+
 static int btusb_setup_qca_load_nvm(struct hci_dev *hdev,
 				    struct qca_version *ver,
drivers/bluetooth/btusb.c +1 -14
 				    const struct qca_device_info *info)
@@ -3383,20 +3424,7 @@ 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) {
-			snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x.bin",
-				 le32_to_cpu(ver->rom_version));
-		} else {
-			snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x_%04x.bin",
-				le32_to_cpu(ver->rom_version),
-				le16_to_cpu(ver->board_id));
-		}
-	} else {
-		snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x.bin",
-			 le32_to_cpu(ver->rom_version));
-	}
+	btusb_generate_qca_nvm_name(fwname, sizeof(fwname), ver);
 
 	err = request_firmware(&fw, fwname, &hdev->dev);

if (err) {

#3 lore raw

Thanks Matthias for the comments. please see my comments inline .

BTW: marcel , do you agree with Matthias comments ? if fine , I will align Matthias comments and make the final version.

regards.
tim

Quoted 58 lines · Matthias Kaehlcke
Quoted 36 lines · On Tue, Oct 12, 2021 at 03:55:56PM +0800, [email protected] wrote:

the RF performance of wcn6855 soc chip from different foundries will be difference, so we should use different nvm to configure them.

---
 drivers/bluetooth/btusb.c | 56
+++++++++++++++++++++++++++++++++++------------
 1 file changed, 42 insertions(+), 14 deletions(-)
drivers/bluetooth/btusb.c +0 -0
index 75c83768c257..f352ff351b61 100644
@@ -3190,6 +3190,9 @@ static int btusb_set_bdaddr_wcn6855(struct 

hci_dev
*hdev,
#define QCA_DFU_TIMEOUT 3000
#define QCA_FLAG_MULTI_NVM 0x80

drivers/bluetooth/btusb.c +4 -0
+#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;
@@ -3221,6 +3224,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,

drivers/bluetooth/btusb.c static int btusb_setup_qca_load_rampatch(struct · line 3385

Quoted 7 lines
drivers/bluetooth/btusb.c +3 -0
@@ -3375,6 +3379,43 @@ static int btusb_setup_qca_load_rampatch(struct
 hci_dev *hdev,
 	return err;
 }
 
+static void btusb_generate_qca_nvm_name(char *fwname,
+					size_t max_size,
+					struct qca_version *ver)

=> const struct qca_version *ver

Quoted 11 lines
drivers/bluetooth/btusb.c +11 -0
+{
+	u32 rom_version = le32_to_cpu(ver->rom_version);
+	u16 flag = le16_to_cpu(ver->flag);
+
+	if (((flag >> 8) & 0xff) == QCA_FLAG_MULTI_NVM) {
+		u16 board_id = le16_to_cpu(ver->board_id);
+		u32 ram_version = le32_to_cpu(ver->ram_version);
+		const char *variant;
+
+		switch (ram_version) {
+		case WCN6855_2_0_RAM_VERSION_GF:
Quoted 8 lines

drivers/bluetooth/btusb.c static int btusb_setup_qca_load_rampatch(struct · line 3401

Quoted 5 lines
drivers/bluetooth/btusb.c +5 -0
+		case WCN6855_2_1_RAM_VERSION_GF:
+			variant = "_gf";
+			break;
+		default:
+			variant = "";

instead of the default branch you could assign a default to 'variant' at declaration time, but it's fine either way.

[Tim] this code style is recommend by marcel.

Quoted 8 lines

drivers/bluetooth/btusb.c static int btusb_setup_qca_load_rampatch(struct · line 3405

Quoted 5 lines
drivers/bluetooth/btusb.c +4 -0
+			break;
+		}
+
+		/* if boardid equal 0, use default nvm without suffix */

delete the comment, it just states the obvious

Quoted 4 lines

drivers/bluetooth/btusb.c static int btusb_setup_qca_load_rampatch(struct · line 3406

Quoted 1 line
drivers/bluetooth/btusb.c +1 -0
+		if (board_id == 0x0) {

nit: is there really any value in using a hex number here instead of a plain decimal 0?

[Tim] this line is inherit from last change , if you think I should change 0x0 to 0 , I am fine.

Quoted 41 lines
Quoted 41 lines
drivers/bluetooth/btusb.c +13 -0
+			snprintf(fwname, max_size, "qca/nvm_usb_%08x%s.bin",
+				rom_version, variant);
+		} else {
+			snprintf(fwname, max_size, "qca/nvm_usb_%08x%s_%04x.bin",
+				rom_version, variant, board_id);
+		}
+	} else {
+		snprintf(fwname, max_size, "qca/nvm_usb_%08x.bin",
+			rom_version);
+	}
+
+}
+
 static int btusb_setup_qca_load_nvm(struct hci_dev *hdev,
 				    struct qca_version *ver,
drivers/bluetooth/btusb.c +0 -0
 				    const struct qca_device_info *info)
@@ -3383,20 +3424,7 @@ static int btusb_setup_qca_load_nvm(struct 

hci_dev
*hdev,

drivers/bluetooth/btusb.c +1 -14
 	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));
-		} else {
-			snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x_%04x.bin",
-				le32_to_cpu(ver->rom_version),
-				le16_to_cpu(ver->board_id));
-		}
-	} else {
-		snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x.bin",
-			 le32_to_cpu(ver->rom_version));
-	}
+	btusb_generate_qca_nvm_name(fwname, sizeof(fwname), ver);
 
 	err = request_firmware(&fw, fwname, &hdev->dev);
 	if (err) {
#4 lore raw
Quoted 76 lines · On Wed, Oct 20, 2021 at 12:00:52PM +0800, [email protected] wrote:

Thanks Matthias for the comments. please see my comments inline .

BTW: marcel , do you agree with Matthias comments ? if fine , I will align Matthias comments and make the final version.

regards.
tim

Quoted 59 lines · Matthias Kaehlcke
Quoted 37 lines · On Tue, Oct 12, 2021 at 03:55:56PM +0800, [email protected] wrote:

the RF performance of wcn6855 soc chip from different foundries will be
difference, so we should use different nvm to configure them.

---
 drivers/bluetooth/btusb.c | 56
+++++++++++++++++++++++++++++++++++------------
 1 file changed, 42 insertions(+), 14 deletions(-)
drivers/bluetooth/btusb.c +0 -0
index 75c83768c257..f352ff351b61 100644
@@ -3190,6 +3190,9 @@ static int btusb_set_bdaddr_wcn6855(struct

hci_dev
*hdev,
#define QCA_DFU_TIMEOUT 3000
#define QCA_FLAG_MULTI_NVM 0x80

drivers/bluetooth/btusb.c +4 -0
+#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;
@@ -3221,6 +3224,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,

drivers/bluetooth/btusb.c static int btusb_setup_qca_load_rampatch(struct · line 3385

Quoted 7 lines
drivers/bluetooth/btusb.c +3 -0
@@ -3375,6 +3379,43 @@ static int btusb_setup_qca_load_rampatch(struct
 hci_dev *hdev,
 	return err;
 }
 
+static void btusb_generate_qca_nvm_name(char *fwname,
+					size_t max_size,
+					struct qca_version *ver)

=> const struct qca_version *ver

Quoted 11 lines
drivers/bluetooth/btusb.c +11 -0
+{
+	u32 rom_version = le32_to_cpu(ver->rom_version);
+	u16 flag = le16_to_cpu(ver->flag);
+
+	if (((flag >> 8) & 0xff) == QCA_FLAG_MULTI_NVM) {
+		u16 board_id = le16_to_cpu(ver->board_id);
+		u32 ram_version = le32_to_cpu(ver->ram_version);
+		const char *variant;
+
+		switch (ram_version) {
+		case WCN6855_2_0_RAM_VERSION_GF:
Quoted 8 lines

drivers/bluetooth/btusb.c static int btusb_setup_qca_load_rampatch(struct · line 3401

Quoted 5 lines
drivers/bluetooth/btusb.c +5 -0
+		case WCN6855_2_1_RAM_VERSION_GF:
+			variant = "_gf";
+			break;
+		default:
+			variant = "";

instead of the default branch you could assign a default to 'variant' at declaration time, but it's fine either way.

Quoted 1 line

[Tim] this code style is recommend by marcel.

Both are ok, if Marcel prefers the default branch let's keep it that way.

Quoted 8 lines
Quoted 8 lines

drivers/bluetooth/btusb.c static int btusb_setup_qca_load_rampatch(struct · line 3405

Quoted 5 lines
drivers/bluetooth/btusb.c +4 -0
+			break;
+		}
+
+		/* if boardid equal 0, use default nvm without suffix */

delete the comment, it just states the obvious

Quoted 7 lines
Quoted 4 lines

drivers/bluetooth/btusb.c static int btusb_setup_qca_load_rampatch(struct · line 3406

Quoted 1 line
drivers/bluetooth/btusb.c +1 -0
+		if (board_id == 0x0) {

nit: is there really any value in using a hex number here instead of a plain decimal 0?

[Tim] this line is inherit from last change , if you think I should change 0x0 to 0 , I am fine.

Since this patch touches/moves this code it seems a good opportunity to clean things up a bit. It's also true that there are quite a few instances of this and comparisons with '0x00' in other parts of the kernel, so I guess it's also fine to leave it as is.

#5 lore raw

thanks Matthias for the new comments.

marcel :
do you agree with my comments which response to Matthias , if is OK, I
will make the final version for the next patch, thank you for the help.

regards.
tim

Quoted 51 lines · Matthias Kaehlcke
Quoted 50 lines · On Wed, Oct 20, 2021 at 12:00:52PM +0800, [email protected] wrote:

Thanks Matthias for the comments. please see my comments inline .

BTW: marcel , do you agree with Matthias comments ? if fine , I will align Matthias comments and make the final version.

regards.
tim

Quoted 42 lines · Matthias Kaehlcke
Quoted 41 lines · On Tue, Oct 12, 2021 at 03:55:56PM +0800, [email protected] wrote:

the RF performance of wcn6855 soc chip from different foundries will be
difference, so we should use different nvm to configure them.

---
 drivers/bluetooth/btusb.c | 56
+++++++++++++++++++++++++++++++++++------------
 1 file changed, 42 insertions(+), 14 deletions(-)
drivers/bluetooth/btusb.c +0 -0
index 75c83768c257..f352ff351b61 100644
@@ -3190,6 +3190,9 @@ static int btusb_set_bdaddr_wcn6855(struct

hci_dev
*hdev,
#define QCA_DFU_TIMEOUT 3000
#define QCA_FLAG_MULTI_NVM 0x80

drivers/bluetooth/btusb.c +4 -0
+#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;
@@ -3221,6 +3224,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,

drivers/bluetooth/btusb.c +0 -0
@@ -3375,6 +3379,43 @@ static int btusb_setup_qca_load_rampatch(struct
 hci_dev *hdev,
 	return err;
 }
 
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

drivers/bluetooth/btusb.c static int btusb_setup_qca_load_rampatch(struct · line 3385

Quoted 3 lines
drivers/bluetooth/btusb.c +3 -0
+static void btusb_generate_qca_nvm_name(char *fwname,
+					size_t max_size,
+					struct qca_version *ver)

=> const struct qca_version *ver

[Tim] fine ,will modify it in next version.

Quoted 21 lines
Quoted 21 lines
Quoted 20 lines
Quoted 7 lines
drivers/bluetooth/btusb.c +6 -0
+{
+	u32 rom_version = le32_to_cpu(ver->rom_version);
+	u16 flag = le16_to_cpu(ver->flag);
+
+	if (((flag >> 8) & 0xff) == QCA_FLAG_MULTI_NVM) {
+		u16 board_id = le16_to_cpu(ver->board_id);

drivers/bluetooth/btusb.c static int btusb_setup_qca_load_rampatch(struct · line 3401

Quoted 10 lines
drivers/bluetooth/btusb.c +10 -0
+		u32 ram_version = le32_to_cpu(ver->ram_version);
+		const char *variant;
+
+		switch (ram_version) {
+		case WCN6855_2_0_RAM_VERSION_GF:
+		case WCN6855_2_1_RAM_VERSION_GF:
+			variant = "_gf";
+			break;
+		default:
+			variant = "";

instead of the default branch you could assign a default to 'variant' at declaration time, but it's fine either way.

Quoted 11 lines
Quoted 1 line

[Tim] this code style is recommend by marcel.

Both are ok, if Marcel prefers the default branch let's keep it that way.

Quoted 7 lines
Quoted 7 lines

drivers/bluetooth/btusb.c static int btusb_setup_qca_load_rampatch(struct · line 3405

Quoted 5 lines
drivers/bluetooth/btusb.c +4 -0
+			break;
+		}
+
+		/* if boardid equal 0, use default nvm without suffix */

delete the comment, it just states the obvious

[Tim] fine, will modify it in next version.

Quoted 6 lines
Quoted 6 lines
Quoted 5 lines

drivers/bluetooth/btusb.c static int btusb_setup_qca_load_rampatch(struct · line 3406

Quoted 2 lines
drivers/bluetooth/btusb.c +1 -0
+		if (board_id == 0x0) {

nit: is there really any value in using a hex number here instead of a plain decimal 0?

Quoted 7 lines
Quoted 2 lines

[Tim] this line is inherit from last change , if you think I should change 0x0 to 0 , I am fine.

Since this patch touches/moves this code it seems a good opportunity to clean things up a bit. It's also true that there are quite a few instances of this and comparisons with '0x00' in other parts of the kernel, so I guess it's also fine to leave it as is.

[Tim] I am OK to change from 0x0 to 0 in next version.