Download board id specific NVM instead of default for WCN7850 if board id
is available.
Signed-off-by: Zijun Hu <[email protected]>
---
drivers/bluetooth/btqca.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c
index 19cfc342fc7b..3ff1d3f99d7b 100644
--- a/drivers/bluetooth/btqca.c
+++ b/drivers/bluetooth/btqca.c
@@ -629,6 +629,19 @@ static void qca_generate_hsp_nvm_name(char *fwname, size_t max_size,
snprintf(fwname, max_size, "qca/hpnv%02x%s.%x", rom_ver, variant, bid);
}
+static inline void qca_get_nvm_name_generic(struct qca_fw_config *cfg,
+ const char *stem, u8 rom_ver, u16 bid)
+{
+ if (bid == 0x0)
+ snprintf(cfg->fwname, sizeof(cfg->fwname), "qca/%snv%02x.bin", stem, rom_ver);
+ else if (bid & 0xff00)
+ snprintf(cfg->fwname, sizeof(cfg->fwname),
+ "qca/%snv%02x.b%x", stem, rom_ver, bid);
+ else
+ snprintf(cfg->fwname, sizeof(cfg->fwname),
+ "qca/%snv%02x.b%02x", stem, rom_ver, bid);
+}
+
int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
enum qca_btsoc_type soc_type, struct qca_btsoc_version ver,
const char *firmware_name)
@@ -709,7 +722,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
/* Give the controller some time to get ready to receive the NVM */
msleep(10);
- if (soc_type == QCA_QCA2066)
+ if (soc_type == QCA_QCA2066 || soc_type == QCA_WCN7850)
qca_read_fw_board_id(hdev, &boardid);
/* Download NVM configuration */
@@ -751,8 +764,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
"qca/hpnv%02x.bin", rom_ver);
break;
case QCA_WCN7850:
- snprintf(config.fwname, sizeof(config.fwname),
- "qca/hmtnv%02x.bin", rom_ver);
+ qca_get_nvm_name_generic(&config, "hmt", rom_ver, boardid);
break;
default:
--
2.7.4
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=845323
---Test result---
Test Summary:
CheckPatch PASS 0.63 seconds
GitLint PASS 0.28 seconds
SubjectPrefix PASS 0.10 seconds
BuildKernel PASS 30.04 seconds
CheckAllWarning PASS 32.60 seconds
CheckSparse PASS 38.38 seconds
CheckSmatch FAIL 36.55 seconds
BuildKernel32 PASS 29.13 seconds
TestRunnerSetup PASS 524.69 seconds
TestRunner_l2cap-tester PASS 18.48 seconds
TestRunner_iso-tester PASS 29.39 seconds
TestRunner_bnep-tester PASS 4.86 seconds
TestRunner_mgmt-tester PASS 114.39 seconds
TestRunner_rfcomm-tester PASS 7.30 seconds
TestRunner_sco-tester PASS 15.05 seconds
TestRunner_ioctl-tester PASS 7.68 seconds
TestRunner_mesh-tester PASS 6.45 seconds
TestRunner_smp-tester PASS 6.66 seconds
TestRunner_userchan-tester PASS 4.89 seconds
IncrementalBuild PASS 28.12 seconds
Details
##############################
Test: CheckSmatch - FAIL
Desc: Run smatch tool with source
Output:
Segmentation fault (core dumped)
make[4]: *** [scripts/Makefile.build:244: net/bluetooth/hci_core.o] Error 139
make[4]: *** Deleting file 'net/bluetooth/hci_core.o'
make[3]: *** [scripts/Makefile.build:485: net/bluetooth] Error 2
make[2]: *** [scripts/Makefile.build:485: net] Error 2
make[2]: *** Waiting for unfinished jobs....
Segmentation fault (core dumped)
make[4]: *** [scripts/Makefile.build:244: drivers/bluetooth/bcm203x.o] Error 139
make[4]: *** Deleting file 'drivers/bluetooth/bcm203x.o'
make[4]: *** Waiting for unfinished jobs....
Segmentation fault (core dumped)
make[4]: *** [scripts/Makefile.build:244: drivers/bluetooth/bpa10x.o] Error 139
make[4]: *** Deleting file 'drivers/bluetooth/bpa10x.o'
make[3]: *** [scripts/Makefile.build:485: drivers/bluetooth] Error 2
make[2]: *** [scripts/Makefile.build:485: drivers] Error 2
make[1]: *** [/github/workspace/src/src/Makefile:1919: .] Error 2
make: *** [Makefile:240: __sub-make] Error 2
---
Regards,
Linux Bluetooth
On 4/17/2024 3:49 PM, Zijun Hu wrote:
> Download board id specific NVM instead of default for WCN7850 if board id
> is available.
>
> Signed-off-by: Zijun Hu <[email protected]>
> ---
> drivers/bluetooth/btqca.c | 18 +++++++++++++++---
> 1 file changed, 15 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c
> index 19cfc342fc7b..3ff1d3f99d7b 100644
> --- a/drivers/bluetooth/btqca.c
> +++ b/drivers/bluetooth/btqca.c
> @@ -629,6 +629,19 @@ static void qca_generate_hsp_nvm_name(char *fwname, size_t max_size,
> snprintf(fwname, max_size, "qca/hpnv%02x%s.%x", rom_ver, variant, bid);
> }
>
> +static inline void qca_get_nvm_name_generic(struct qca_fw_config *cfg,
> + const char *stem, u8 rom_ver, u16 bid)
> +{
> + if (bid == 0x0)
> + snprintf(cfg->fwname, sizeof(cfg->fwname), "qca/%snv%02x.bin", stem, rom_ver);
> + else if (bid & 0xff00)
> + snprintf(cfg->fwname, sizeof(cfg->fwname),
> + "qca/%snv%02x.b%x", stem, rom_ver, bid);
> + else
> + snprintf(cfg->fwname, sizeof(cfg->fwname),
> + "qca/%snv%02x.b%02x", stem, rom_ver, bid);
> +}
> +
> int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
> enum qca_btsoc_type soc_type, struct qca_btsoc_version ver,
> const char *firmware_name)
> @@ -709,7 +722,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
> /* Give the controller some time to get ready to receive the NVM */
> msleep(10);
>
> - if (soc_type == QCA_QCA2066)
> + if (soc_type == QCA_QCA2066 || soc_type == QCA_WCN7850)
> qca_read_fw_board_id(hdev, &boardid);
>
> /* Download NVM configuration */
> @@ -751,8 +764,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
> "qca/hpnv%02x.bin", rom_ver);
> break;
> case QCA_WCN7850:
> - snprintf(config.fwname, sizeof(config.fwname),
> - "qca/hmtnv%02x.bin", rom_ver);
> + qca_get_nvm_name_generic(&config, "hmt", rom_ver, boardid);
> break;
>
> default:
Hi luiz, marcel,
could you code review for this change since a new product needs this
change ?
On 19/04/2024 09:04, quic_zijuhu wrote:
>> /* Download NVM configuration */
>> @@ -751,8 +764,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
>> "qca/hpnv%02x.bin", rom_ver);
>> break;
>> case QCA_WCN7850:
>> - snprintf(config.fwname, sizeof(config.fwname),
>> - "qca/hmtnv%02x.bin", rom_ver);
>> + qca_get_nvm_name_generic(&config, "hmt", rom_ver, boardid);
>> break;
>>
>> default:
>
> Hi luiz, marcel,
> could you code review for this change since a new product needs this
> change ?
What does your internal guide (go/upstream) tell you about pinging after
two days?
Best regards,
Krzysztof
Hello:
This patch was applied to bluetooth/bluetooth-next.git (master)
by Luiz Augusto von Dentz <[email protected]>:
On Wed, 17 Apr 2024 15:49:34 +0800 you wrote:
> Download board id specific NVM instead of default for WCN7850 if board id
> is available.
>
> Signed-off-by: Zijun Hu <[email protected]>
> ---
> drivers/bluetooth/btqca.c | 18 +++++++++++++++---
> 1 file changed, 15 insertions(+), 3 deletions(-)
Here is the summary with links:
- Bluetooth: qca: Support downloading board id specific NVM for WCN7850
https://git.kernel.org/bluetooth/bluetooth-next/c/39844750bddf
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html