* [PATCH v1] Bluetooth: btusb: Add support different nvm to distinguish different factory for WCN6855 controller
@ 2021-08-04 10:04 Zijun Hu
2021-08-04 11:08 ` [v1] " bluez.test.bot
2021-08-04 14:45 ` [PATCH v1] " Marcel Holtmann
0 siblings, 2 replies; 3+ messages in thread
From: Zijun Hu @ 2021-08-04 10:04 UTC (permalink / raw)
To: marcel, johan.hedberg, luiz.dentz
Cc: linux-kernel, linux-bluetooth, linux-arm-msm, bgodavar, c-hbandi,
hemantg, mka, rjliao, zijuhu, tjiang
From: Tim Jiang <tjiang@codeaurora.org>
we have different factory to produce wcn6855 soc chip, so we should use
different nvm file with surfix to distinguish them.
Signed-off-by: Tim Jiang <tjiang@codeaurora.org>
---
drivers/bluetooth/btusb.c | 30 +++++++++++++++++++++++++-----
1 file changed, 25 insertions(+), 5 deletions(-)
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index b1a05bb9f4bf..cc9618575ab4 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -4013,6 +4013,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;
@@ -4044,6 +4047,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,
@@ -4209,12 +4213,28 @@ static int btusb_setup_qca_load_nvm(struct hci_dev *hdev,
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));
+ /* if ram version is for gf factory, we should add surfix gf to
+ * distinguish with default one .
+ */
+ if (ver->ram_version == WCN6855_2_0_RAM_VERSION_GF ||
+ ver->ram_version == WCN6855_2_1_RAM_VERSION_GF) {
+ snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x_gf.bin",
+ le32_to_cpu(ver->rom_version));
+ } else {
+ 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));
+ if (ver->ram_version == WCN6855_2_0_RAM_VERSION_GF ||
+ ver->ram_version == WCN6855_2_1_RAM_VERSION_GF) {
+ snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x_gf_%04x.bin",
+ le32_to_cpu(ver->rom_version),
+ le16_to_cpu(ver->board_id));
+ } 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",
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
^ permalink raw reply related [flat|nested] 3+ messages in thread
* RE: [v1] Bluetooth: btusb: Add support different nvm to distinguish different factory for WCN6855 controller
2021-08-04 10:04 [PATCH v1] Bluetooth: btusb: Add support different nvm to distinguish different factory for WCN6855 controller Zijun Hu
@ 2021-08-04 11:08 ` bluez.test.bot
2021-08-04 14:45 ` [PATCH v1] " Marcel Holtmann
1 sibling, 0 replies; 3+ messages in thread
From: bluez.test.bot @ 2021-08-04 11:08 UTC (permalink / raw)
To: linux-bluetooth, zijuhu
[-- Attachment #1: Type: text/plain, Size: 2969 bytes --]
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=526171
---Test result---
Test Summary:
CheckPatch PASS 0.47 seconds
GitLint FAIL 0.10 seconds
BuildKernel PASS 532.73 seconds
TestRunner: Setup PASS 351.20 seconds
TestRunner: l2cap-tester PASS 2.56 seconds
TestRunner: bnep-tester PASS 1.91 seconds
TestRunner: mgmt-tester PASS 29.95 seconds
TestRunner: rfcomm-tester PASS 2.14 seconds
TestRunner: sco-tester PASS 2.04 seconds
TestRunner: smp-tester FAIL 2.10 seconds
TestRunner: userchan-tester PASS 2.03 seconds
Details
##############################
Test: CheckPatch - PASS - 0.47 seconds
Run checkpatch.pl script with rule in .checkpatch.conf
##############################
Test: GitLint - FAIL - 0.10 seconds
Run gitlint with rule in .gitlint
Bluetooth: btusb: Add support different nvm to distinguish different factory for WCN6855 controller
1: T1 Title exceeds max length (99>72): "Bluetooth: btusb: Add support different nvm to distinguish different factory for WCN6855 controller"
##############################
Test: BuildKernel - PASS - 532.73 seconds
Build Kernel with minimal configuration supports Bluetooth
##############################
Test: TestRunner: Setup - PASS - 351.20 seconds
Setup environment for running Test Runner
##############################
Test: TestRunner: l2cap-tester - PASS - 2.56 seconds
Run test-runner with l2cap-tester
Total: 40, Passed: 40 (100.0%), Failed: 0, Not Run: 0
##############################
Test: TestRunner: bnep-tester - PASS - 1.91 seconds
Run test-runner with bnep-tester
Total: 1, Passed: 1 (100.0%), Failed: 0, Not Run: 0
##############################
Test: TestRunner: mgmt-tester - PASS - 29.95 seconds
Run test-runner with mgmt-tester
Total: 448, Passed: 445 (99.3%), Failed: 0, Not Run: 3
##############################
Test: TestRunner: rfcomm-tester - PASS - 2.14 seconds
Run test-runner with rfcomm-tester
Total: 9, Passed: 9 (100.0%), Failed: 0, Not Run: 0
##############################
Test: TestRunner: sco-tester - PASS - 2.04 seconds
Run test-runner with sco-tester
Total: 8, Passed: 8 (100.0%), Failed: 0, Not Run: 0
##############################
Test: TestRunner: smp-tester - FAIL - 2.10 seconds
Run test-runner with smp-tester
Total: 8, Passed: 7 (87.5%), Failed: 1, Not Run: 0
Failed Test Cases
SMP Client - SC Request 2 Failed 0.020 seconds
##############################
Test: TestRunner: userchan-tester - PASS - 2.03 seconds
Run test-runner with userchan-tester
Total: 3, Passed: 3 (100.0%), Failed: 0, Not Run: 0
---
Regards,
Linux Bluetooth
[-- Attachment #2: l2cap-tester.log --]
[-- Type: application/octet-stream, Size: 44385 bytes --]
[-- Attachment #3: bnep-tester.log --]
[-- Type: application/octet-stream, Size: 3592 bytes --]
[-- Attachment #4: mgmt-tester.log --]
[-- Type: application/octet-stream, Size: 616862 bytes --]
[-- Attachment #5: rfcomm-tester.log --]
[-- Type: application/octet-stream, Size: 11712 bytes --]
[-- Attachment #6: sco-tester.log --]
[-- Type: application/octet-stream, Size: 9947 bytes --]
[-- Attachment #7: smp-tester.log --]
[-- Type: application/octet-stream, Size: 11740 bytes --]
[-- Attachment #8: userchan-tester.log --]
[-- Type: application/octet-stream, Size: 5488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v1] Bluetooth: btusb: Add support different nvm to distinguish different factory for WCN6855 controller
2021-08-04 10:04 [PATCH v1] Bluetooth: btusb: Add support different nvm to distinguish different factory for WCN6855 controller Zijun Hu
2021-08-04 11:08 ` [v1] " bluez.test.bot
@ 2021-08-04 14:45 ` Marcel Holtmann
1 sibling, 0 replies; 3+ messages in thread
From: Marcel Holtmann @ 2021-08-04 14:45 UTC (permalink / raw)
To: Zijun Hu
Cc: Johan Hedberg, Luiz Augusto von Dentz, open list, BlueZ, MSM,
Balakrishna Godavarthi, c-hbandi, Hemantg, Matthias Kaehlcke,
Rocky Liao, tjiang
Hi Zijun,
> we have different factory to produce wcn6855 soc chip, so we should use
> different nvm file with surfix to distinguish them.
I think you mean suffix and not surfix.
>
> Signed-off-by: Tim Jiang <tjiang@codeaurora.org>
> ---
> drivers/bluetooth/btusb.c | 30 +++++++++++++++++++++++++-----
> 1 file changed, 25 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
> index b1a05bb9f4bf..cc9618575ab4 100644
> --- a/drivers/bluetooth/btusb.c
> +++ b/drivers/bluetooth/btusb.c
> @@ -4013,6 +4013,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;
> @@ -4044,6 +4047,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,
> @@ -4209,12 +4213,28 @@ static int btusb_setup_qca_load_nvm(struct hci_dev *hdev,
> 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));
> + /* if ram version is for gf factory, we should add surfix gf to
> + * distinguish with default one .
> + */
> + if (ver->ram_version == WCN6855_2_0_RAM_VERSION_GF ||
> + ver->ram_version == WCN6855_2_1_RAM_VERSION_GF) {
You need fix the coding style for multi-line if-clauses.
> + snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x_gf.bin",
> + le32_to_cpu(ver->rom_version));
> + } else {
> + 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));
> + if (ver->ram_version == WCN6855_2_0_RAM_VERSION_GF ||
> + ver->ram_version == WCN6855_2_1_RAM_VERSION_GF) {
> + snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x_gf_%04x.bin",
> + le32_to_cpu(ver->rom_version),
> + le16_to_cpu(ver->board_id));
> + } else {
> + snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x_%04x.bin",
> + le32_to_cpu(ver->rom_version),
> + le16_to_cpu(ver->board_id));
> + }
> }
That said, can you just sit down and re-think this code. I am pretty sure there will be another factory at some point and then this code becomes too complex. Check if you could use a table for this.
Regards
Marcel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-08-04 14:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-04 10:04 [PATCH v1] Bluetooth: btusb: Add support different nvm to distinguish different factory for WCN6855 controller Zijun Hu
2021-08-04 11:08 ` [v1] " bluez.test.bot
2021-08-04 14:45 ` [PATCH v1] " Marcel Holtmann
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.