Bluetooth: support download nvm with different board id for wcn6855
Subsystems (2)
PATCH 1/1 Bluetooth: support download nvm with different board id for wcn6855
From: Tim Jiang <[email protected]>
we define many nvm files for wcn6855 btsoc and host driver should find the correct nvm file based on board ID and then download it.
--- drivers/bluetooth/btusb.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
drivers/bluetooth/btusb.c +14 -3
@@ -3474,7 +3474,8 @@ struct qca_version {__le32 rom_version;__le32 patch_version;__le32 ram_version; -__le32 ref_clock; +__u16 board_id; +__u8 flag[2 ];__u8 reserved[4 ]; } __packed;
@@ -3657,8 +3658,13 @@ static int btusb_setup_qca_load_nvm(struct hci_dev *hdev,char fwname[64 ];int err; -snprintf (fwname,sizeof (fwname),"qca/nvm_usb_%08x.bin" , -le32_to_cpu (ver->rom_version)); +if (ver->flag[1 ] ==0x80 ) {//check board id for wcn6855 +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)); + } err =request_firmware (&fw, fwname, &hdev->dev);if (err) {
@@ -3725,6 +3731,11 @@ static int btusb_setup_qca(struct hci_dev *hdev)return err; } + err =btusb_qca_send_vendor_req (udev,QCA_GET_TARGET_VERSION , &ver, +sizeof (ver)); +if (err <0 ) +return err; +if (!(status &QCA_SYSCFG_UPDATED )) { err =btusb_setup_qca_load_nvm (hdev, &ver, info);if (err <0 )
Signature · 1 line
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=393653
---Test result---
##############################
Test: CheckPatch - PASS
##############################
Test: CheckGitLint - PASS
##############################
Test: CheckBuildK - PASS
---
Regards,
Linux Bluetooth
Quoted 16 lines · Zijun Hu
From: Tim Jiang <[email protected]>
we define many nvm files for wcn6855 btsoc and host driver should find the correct nvm file based on board ID and then download it.
Signed-off-by Tim Jiang <[email protected]>--- drivers/bluetooth/btusb.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)drivers/bluetooth/btusb.c +0
-0
drivers/bluetooth/btusb.c struct qca_version { · line 3477
Quoted 5 lines
drivers/bluetooth/btusb.c +1
-1@@ -3474,7 +3474,8 @@ struct qca_version {__le32 rom_version;__le32 patch_version;__le32 ram_version; -__le32 ref_clock; +__u16 board_id;
You should follow the scheme of describing the endianess of the fields.
drivers/bluetooth/btusb.c struct qca_version { · line 3478
Quoted 1 line
drivers/bluetooth/btusb.c +1
-0+__u8 flag[2 ];
It seems more reasonable to make this a 16-bit flags. And either way there are more than one of these, so plural "flags" seems appropriate.
PS. Can you confirm that no firmware actually used these 16 bits of the "ref_clock"? Why wasn't the reserved bytes used to add the new properties?
drivers/bluetooth/btusb.c static int btusb_setup_qca_load_nvm(struct hci_dev *hdev, · line 3661
Quoted 10 lines
drivers/bluetooth/btusb.c +1
-2__u8 reserved[4 ]; } __packed;@@ -3657,8 +3658,13 @@ static int btusb_setup_qca_load_nvm(struct hci_dev *hdev,char fwname[64 ];int err; -snprintf (fwname,sizeof (fwname),"qca/nvm_usb_%08x.bin" , -le32_to_cpu (ver->rom_version)); +if (ver->flag[1 ] ==0x80 ) {//check board id for wcn6855
Is this BIT(7) in the second byte of the flags, or is the second flag 0x80?
Based on the comment you should be able to provide a
#define QCA_VERSION_SECOND_FLAG_IS_WCN6855 0x80
to use instead of this magic number.
Regards,
Bjorn
Quoted 24 lines
drivers/bluetooth/btusb.c +11
-0+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)); + } err =request_firmware (&fw, fwname, &hdev->dev);if (err) {@@ -3725,6 +3731,11 @@ static int btusb_setup_qca(struct hci_dev *hdev)return err; } + err =btusb_qca_send_vendor_req (udev,QCA_GET_TARGET_VERSION , &ver, +sizeof (ver)); +if (err <0 ) +return err; +if (!(status &QCA_SYSCFG_UPDATED )) { err =btusb_setup_qca_load_nvm (hdev, &ver, info);if (err <0 )Signature · 1 line
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project