Skip to contentSkip to conversation

Bluetooth: btusb: correct nvm file name for WCN6855 btsoc

PATCH In review [email protected] 2 participants 3 messages Nov 3, 2021

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

PATCH 1/1 Bluetooth: btusb: correct nvm file name for WCN6855 btsoc

As we name nvm file by using big-endian for boardID, so align host with it.

---
 drivers/bluetooth/btusb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/bluetooth/btusb.c +1 -1
index 46d892bbde62..572d64524cf3 100644
@@ -3072,7 +3072,7 @@ static void btusb_generate_qca_nvm_name(char *fwname, size_t max_size,
 	u16 flag = le16_to_cpu(ver->flag);
 
 	if (((flag >> 8) & 0xff) == QCA_FLAG_MULTI_NVM) {
-		u16 board_id = le16_to_cpu(ver->board_id);
+		u16 board_id = be16_to_cpu(ver->board_id);
 		const char *variant;
 
 		switch (le32_to_cpu(ver->ram_version)) {
Signature · 1 line
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
maintainer
#1 lore raw

Hi Tim,

Quoted 12 lines

As we name nvm file by using big-endian for boardID, so align host with it.

---
drivers/bluetooth/btusb.c | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)
drivers/bluetooth/btusb.c +0 -0
index 46d892bbde62..572d64524cf3 100644

drivers/bluetooth/btusb.c static void btusb_generate_qca_nvm_name(char *fwname, size_t max_size, · line 3076

Quoted 6 lines
drivers/bluetooth/btusb.c +1 -1
@@ -3072,7 +3072,7 @@ static void btusb_generate_qca_nvm_name(char *fwname, size_t max_size,
 	u16 flag = le16_to_cpu(ver->flag);
 
 	if (((flag >> 8) & 0xff) == QCA_FLAG_MULTI_NVM) {
-		u16 board_id = le16_to_cpu(ver->board_id);
+		u16 board_id = be16_to_cpu(ver->board_id);
 		const char *variant;

this change is not matching the commit description. It makes no sense. This is about your ver data structure and not your filename.

So inside your ver struct you have a mix of little-endian and bit-endian fields?

Regards

Marcel

#2 lore raw

thanks for your comments, marcel.

I update one new version, thank you.
regards.
tim

Quoted 30 lines · Marcel Holtmann

Hi Tim,

Quoted 12 lines

As we name nvm file by using big-endian for boardID, so align host with it.

---
drivers/bluetooth/btusb.c | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)
drivers/bluetooth/btusb.c +0 -0
index 46d892bbde62..572d64524cf3 100644

drivers/bluetooth/btusb.c static void btusb_generate_qca_nvm_name(char · line 3077

Quoted 7 lines
drivers/bluetooth/btusb.c +1 -1
@@ -3072,7 +3072,7 @@ static void btusb_generate_qca_nvm_name(char 
 *fwname, size_t max_size,
 	u16 flag = le16_to_cpu(ver->flag);
 
 	if (((flag >> 8) & 0xff) == QCA_FLAG_MULTI_NVM) {
-		u16 board_id = le16_to_cpu(ver->board_id);
+		u16 board_id = be16_to_cpu(ver->board_id);
 		const char *variant;

this change is not matching the commit description. It makes no sense. This is about your ver data structure and not your filename.

So inside your ver struct you have a mix of little-endian and bit-endian fields?

Regards

Marcel