Skip to contentSkip to conversation

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

PATCH In review [email protected] 3 participants 3 messages Oct 29, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v16 1/1 Bluetooth: btusb: Add support using different nvm for variant WCN6855 controller

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 | 54 
+++++++++++++++++++++++++++++++++++------------
 1 file changed, 40 insertions(+), 14 deletions(-)
drivers/bluetooth/btusb.c +4 -0
index 87b71740fad8..16bb5de3ce2f 100644
@@ -3195,6 +3195,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;
@@ -3226,6 +3229,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,
@@ -3380,6 +3384,41 @@ 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,
+ const 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);
+ const char *variant ;
+
+ switch (le32_to_cpu(ver->ram_version)) {
+ case WCN6855_2_0_RAM_VERSION_GF:
+ case WCN6855_2_1_RAM_VERSION_GF:
+ variant = "_gf";
+ break;
+ default:
+ variant = "";
+ break;
+ }
+
+ if (board_id == 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,
const struct qca_device_info *info)
@@ -3388,20 +3427,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
Reviewed-by on v16 1/1
#1 lore raw
Quoted 38 lines · On Fri, Oct 29, 2021 at 11:21:21AM +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 | 54
+++++++++++++++++++++++++++++++++++------------
 1 file changed, 40 insertions(+), 14 deletions(-)
drivers/bluetooth/btusb.c +3 -0
index 87b71740fad8..16bb5de3ce2f 100644
@@ -3195,6 +3195,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;
@@ -3226,6 +3229,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
@@ -3380,6 +3384,41 @@ static int btusb_setup_qca_load_rampatch(struct
 hci_dev *hdev,
 	return err;
 }
 

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

Quoted 10 lines
drivers/bluetooth/btusb.c +10 -0
+static void btusb_generate_qca_nvm_name(char *fwname,
+					size_t max_size,
+					const 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);
+		const char *variant ;

Remove blank before the semicolon.

Besides that:

maintainer
#2 lore raw
In reply to [email protected]

Hi Tim,

Quoted 7 lines

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 | 54 +++++++++++++++++++++++++++++++++++------------

1 file changed, 40 insertions(+), 14 deletions(-)

patch has been applied to bluetooth-next tree.

Regards

Marcel