Bluetooth: btqca: make sure to handle byte order for soc_id

Commit Message

Luca Weiss May 10, 2023, 9:27 a.m. UTC

The field soc_id in struct qca_btsoc_version is __le32 so we need to
convert it to host byteorder before using.

Reported-by: Simon Horman <[e-mail]>
Fixes: 059924fdf6c1 ("Bluetooth: btqca: Use NVM files based on SoC ID for WCN3991")
Signed-off-by: Luca Weiss <[e-mail]>
---
 drivers/bluetooth/btqca.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


---
base-commit: ac9a78681b921877518763ba0e89202254349d1b
change-id: 20230510-btqca-byte-order-e6ea10018f1c

Best regards,

Comments

[e-mail] May 10, 2023, 9:57 a.m. UTC | #1

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=746366

---Test result---

Test Summary:
CheckPatch                    FAIL      0.96 seconds
GitLint                       PASS      0.34 seconds
SubjectPrefix                 PASS      0.13 seconds
BuildKernel                   PASS      31.66 seconds
CheckAllWarning               PASS      35.30 seconds
CheckSparse                   PASS      39.75 seconds
CheckSmatch                   PASS      110.33 seconds
BuildKernel32                 PASS      30.74 seconds
TestRunnerSetup               PASS      439.27 seconds
TestRunner_l2cap-tester       PASS      16.58 seconds
TestRunner_iso-tester         PASS      20.49 seconds
TestRunner_bnep-tester        PASS      5.32 seconds
TestRunner_mgmt-tester        PASS      112.02 seconds
TestRunner_rfcomm-tester      PASS      8.57 seconds
TestRunner_sco-tester         PASS      7.91 seconds
TestRunner_ioctl-tester       PASS      9.21 seconds
TestRunner_mesh-tester        PASS      6.70 seconds
TestRunner_smp-tester         PASS      7.78 seconds
TestRunner_userchan-tester    PASS      5.60 seconds
IncrementalBuild              PASS      29.30 seconds

Details
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script
Output:
Bluetooth: btqca: make sure to handle byte order for soc_id
WARNING: Reported-by: should be immediately followed by Link: with a URL to the report
#94: 
Reported-by: Simon Horman <[e-mail]>
Fixes: 059924fdf6c1 ("Bluetooth: btqca: Use NVM files based on SoC ID for WCN3991")

total: 0 errors, 1 warnings, 8 lines checked

NOTE: For some of the reported defects, checkpatch may be able to
      mechanically convert to the typical style using --fix or --fix-inplace.

/github/workspace/src/src/13236686.patch has style problems, please review.

NOTE: Ignored message types: UNKNOWN_COMMIT_ID

NOTE: If any of the errors are false positives, please report
      them to the maintainer, see CHECKPATCH in MAINTAINERS.




---
Regards,
Linux Bluetooth

Simon Horman May 10, 2023, 1:11 p.m. UTC | #2

On Wed, May 10, 2023 at 11:27:21AM +0200, Luca Weiss wrote:
> The field soc_id in struct qca_btsoc_version is __le32 so we need to
> convert it to host byteorder before using.
> 
> Reported-by: Simon Horman <[e-mail]>
> Fixes: 059924fdf6c1 ("Bluetooth: btqca: Use NVM files based on SoC ID for WCN3991")
> Signed-off-by: Luca Weiss <[e-mail]>

Reviewed-by: Simon Horman <[e-mail]>

[e-mail] May 19, 2023, 8:20 p.m. UTC | #3

Hello:

This patch was applied to bluetooth/bluetooth-next.git (master)
by Luiz Augusto von Dentz <[e-mail]>:

On Wed, 10 May 2023 11:27:21 +0200 you wrote:
> The field soc_id in struct qca_btsoc_version is __le32 so we need to
> convert it to host byteorder before using.
> 
> Reported-by: Simon Horman <[e-mail]>
> Fixes: 059924fdf6c1 ("Bluetooth: btqca: Use NVM files based on SoC ID for WCN3991")
> Signed-off-by: Luca Weiss <[e-mail]>
> 
> [...]

Here is the summary with links:
  - Bluetooth: btqca: make sure to handle byte order for soc_id
    https://git.kernel.org/bluetooth/bluetooth-next/c/0f1e103dc579

You are awesome, thank you!

Patch

diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c
index fd0941fe8608..e7e58a956d15 100644
--- a/drivers/bluetooth/btqca.c
+++ b/drivers/bluetooth/btqca.c
@@ -637,7 +637,7 @@  int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
 		snprintf(config.fwname, sizeof(config.fwname),
 			 "qca/%s", firmware_name);
 	else if (qca_is_wcn399x(soc_type)) {
-		if (ver.soc_id == QCA_WCN3991_SOC_ID) {
+		if (le32_to_cpu(ver.soc_id) == QCA_WCN3991_SOC_ID) {
 			snprintf(config.fwname, sizeof(config.fwname),
 				 "qca/crnv%02xu.bin", rom_ver);
 		} else {