| Message ID | 1631513399-22826-1-git-send-email-zijuhu@codeaurora.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v9] Bluetooth: btusb: Add support using different nvm for variant WCN6855 controller | expand |
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=545557 ---Test result--- Test Summary: CheckPatch PASS 0.89 seconds GitLint FAIL 0.13 seconds BuildKernel PASS 687.83 seconds TestRunner: Setup PASS 449.83 seconds TestRunner: l2cap-tester PASS 3.15 seconds TestRunner: bnep-tester PASS 2.18 seconds TestRunner: mgmt-tester FAIL 35.25 seconds TestRunner: rfcomm-tester PASS 2.54 seconds TestRunner: sco-tester PASS 2.44 seconds TestRunner: smp-tester PASS 2.55 seconds TestRunner: userchan-tester PASS 2.27 seconds Details ############################## Test: CheckPatch - PASS - 0.89 seconds Run checkpatch.pl script with rule in .checkpatch.conf ############################## Test: GitLint - FAIL - 0.13 seconds Run gitlint with rule in .gitlint Bluetooth: btusb: Add support using different nvm for variant WCN6855 controller 1: T1 Title exceeds max length (80>72): "Bluetooth: btusb: Add support using different nvm for variant WCN6855 controller" ############################## Test: BuildKernel - PASS - 687.83 seconds Build Kernel with minimal configuration supports Bluetooth ############################## Test: TestRunner: Setup - PASS - 449.83 seconds Setup environment for running Test Runner ############################## Test: TestRunner: l2cap-tester - PASS - 3.15 seconds Run test-runner with l2cap-tester Total: 40, Passed: 40 (100.0%), Failed: 0, Not Run: 0 ############################## Test: TestRunner: bnep-tester - PASS - 2.18 seconds Run test-runner with bnep-tester Total: 1, Passed: 1 (100.0%), Failed: 0, Not Run: 0 ############################## Test: TestRunner: mgmt-tester - FAIL - 35.25 seconds Run test-runner with mgmt-tester Total: 452, Passed: 451 (99.8%), Failed: 1, Not Run: 0 Failed Test Cases Read Exp Feature - Success Failed 0.024 seconds ############################## Test: TestRunner: rfcomm-tester - PASS - 2.54 seconds Run test-runner with rfcomm-tester Total: 9, Passed: 9 (100.0%), Failed: 0, Not Run: 0 ############################## Test: TestRunner: sco-tester - PASS - 2.44 seconds Run test-runner with sco-tester Total: 11, Passed: 11 (100.0%), Failed: 0, Not Run: 0 ############################## Test: TestRunner: smp-tester - PASS - 2.55 seconds Run test-runner with smp-tester Total: 8, Passed: 8 (100.0%), Failed: 0, Not Run: 0 ############################## Test: TestRunner: userchan-tester - PASS - 2.27 seconds Run test-runner with userchan-tester Total: 3, Passed: 3 (100.0%), Failed: 0, Not Run: 0 --- Regards, Linux Bluetooth
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 928cbfa4c42d..7b23cfd131f6 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -3161,6 +3161,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; @@ -3192,6 +3195,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, @@ -3346,6 +3350,31 @@ 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, + char *variant) +{ + char *sep = (strlen(variant) == 0) ? "" : "_"; + u16 board_id = le16_to_cpu(ver->board_id); + u32 rom_version = le32_to_cpu(ver->rom_version); + + if (((ver->flag >> 8) & 0xff) == QCA_FLAG_MULTI_NVM) { + /* if boardid equal 0, use default nvm without suffix */ + if (board_id == 0x0) { + snprintf(fwname, max_size, "qca/nvm_usb_%08x%s%s.bin", + rom_version, sep, variant); + } else { + snprintf(fwname, max_size, "qca/nvm_usb_%08x%s%s_%04x.bin", + rom_version, sep, 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) @@ -3354,19 +3383,15 @@ 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)); + switch (ver->ram_version) { + case WCN6855_2_0_RAM_VERSION_GF: + case WCN6855_2_1_RAM_VERSION_GF: + btusb_generate_qca_nvm_name(fwname, sizeof(fwname), ver, "gf"); + break; + + default: + btusb_generate_qca_nvm_name(fwname, sizeof(fwname), ver, ""); + break; } err = request_firmware(&fw, fwname, &hdev->dev);
the RF performance of wcn6855 soc chip from different foundries will be difference, so we should use different nvm to configure them. Signed-off-by: Zijun Hu <zijuhu@codeaurora.org> --- drivers/bluetooth/btusb.c | 51 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 38 insertions(+), 13 deletions(-)