[v1] Bluetooth: btintel: Fix the sfi name for BlazarU

Commit Message

K, Kiran June 27, 2024, 1:06 p.m. UTC

Use INTEL_HW_VARIANT() instead of CNVi Id to decide to load Intermediate
Loader (IML) image. Fix the driver loading incorrect firmware for
BlazarU product.

dmesg:
.....
[146.111834] Bluetooth: hci0: Minimum firmware build 1 week 10 2014
[146.111839] Bluetooth: hci0: Bootloader timestamp 2022.18 buildtype 1 build 16362
[146.111848] Bluetooth: hci0: No support for _PRR ACPI method
[146.112204] Bluetooth: hci0: Failed to load Intel firmware file intel/ibt-0291-0291-iml.sfi (-2)

Fixes: a5495fe62d9f ("Bluetooth: btintel: Add firmware ID to firmware name")
Reported-by: Tsigan, Vladislav <[e-mail]>
Signed-off-by: Kiran K <[e-mail]>
---
 drivers/bluetooth/btintel.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

[e-mail] June 27, 2024, 1:37 p.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=866149

---Test result---

Test Summary:
CheckPatch                    FAIL      1.04 seconds
GitLint                       FAIL      0.53 seconds
SubjectPrefix                 PASS      0.11 seconds
BuildKernel                   PASS      30.75 seconds
CheckAllWarning               PASS      34.54 seconds
CheckSparse                   PASS      40.47 seconds
CheckSmatch                   PASS      107.02 seconds
BuildKernel32                 PASS      30.03 seconds
TestRunnerSetup               PASS      552.27 seconds
TestRunner_l2cap-tester       PASS      19.00 seconds
TestRunner_iso-tester         PASS      40.20 seconds
TestRunner_bnep-tester        PASS      5.06 seconds
TestRunner_mgmt-tester        PASS      129.26 seconds
TestRunner_rfcomm-tester      PASS      7.62 seconds
TestRunner_sco-tester         PASS      15.20 seconds
TestRunner_ioctl-tester       PASS      8.12 seconds
TestRunner_mesh-tester        PASS      6.11 seconds
TestRunner_smp-tester         PASS      7.17 seconds
TestRunner_userchan-tester    PASS      5.10 seconds
IncrementalBuild              PASS      29.22 seconds

Details
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script
Output:
[v1] Bluetooth: btintel: Fix the sfi name for BlazarU
WARNING: Reported-by: should be immediately followed by Closes: with a URL to the report
#93: 
Reported-by: Tsigan, Vladislav <[e-mail]>
Signed-off-by: Kiran K <[e-mail]>

total: 0 errors, 1 warnings, 16 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/13714333.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.


##############################
Test: GitLint - FAIL
Desc: Run gitlint
Output:
[v1] Bluetooth: btintel: Fix the sfi name for BlazarU

WARNING: I3 - ignore-body-lines: gitlint will be switching from using Python regex 'match' (match beginning) to 'search' (match anywhere) semantics. Please review your ignore-body-lines.regex option accordingly. To remove this warning, set general.regex-style-search=True. More details: https://jorisroovers.github.io/gitlint/configuration/#regex-style-search
10: B1 Line exceeds max length (82>80): "[146.111839] Bluetooth: hci0: Bootloader timestamp 2022.18 buildtype 1 build 16362"
12: B1 Line exceeds max length (97>80): "[146.112204] Bluetooth: hci0: Failed to load Intel firmware file intel/ibt-0291-0291-iml.sfi (-2)"


---
Regards,
Linux Bluetooth

[e-mail] June 27, 2024, 3:01 p.m. UTC | #2

Hello:

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

On Thu, 27 Jun 2024 18:36:39 +0530 you wrote:
> Use INTEL_HW_VARIANT() instead of CNVi Id to decide to load Intermediate
> Loader (IML) image. Fix the driver loading incorrect firmware for
> BlazarU product.
> 
> dmesg:
> .....
> [146.111834] Bluetooth: hci0: Minimum firmware build 1 week 10 2014
> [146.111839] Bluetooth: hci0: Bootloader timestamp 2022.18 buildtype 1 build 16362
> [146.111848] Bluetooth: hci0: No support for _PRR ACPI method
> [146.112204] Bluetooth: hci0: Failed to load Intel firmware file intel/ibt-0291-0291-iml.sfi (-2)
> 
> [...]

Here is the summary with links:
  - [v1] Bluetooth: btintel: Fix the sfi name for BlazarU
    https://git.kernel.org/bluetooth/bluetooth-next/c/c341bd6acce9

You are awesome, thank you!

Patch

diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c
index 2dfe049d863e..54bfe2ffe1d2 100644
--- a/drivers/bluetooth/btintel.c
+++ b/drivers/bluetooth/btintel.c
@@ -2148,7 +2148,7 @@  static void btintel_get_fw_name_tlv(const struct intel_version_tlv *ver,
 	/* Only Blazar  product supports downloading of intermediate loader
 	 * image
 	 */
-	if ((ver->cnvi_top & 0xfff) >= BTINTEL_CNVI_BLAZARI) {
+	if (INTEL_HW_VARIANT(ver->cnvi_bt) >= 0x1e) {
 		u8 zero[BTINTEL_FWID_MAXLEN];
 
 		if (ver->img_type == BTINTEL_IMG_BOOTLOADER) {
@@ -2240,7 +2240,7 @@  static int btintel_prepare_fw_download_tlv(struct hci_dev *hdev,
 		 * firmware image which doesn't exist. Lets compare the version
 		 * of IML image
 		 */
-		if ((ver->cnvi_top & 0xfff) >= BTINTEL_CNVI_BLAZARI)
+		if (INTEL_HW_VARIANT(ver->cnvi_bt) >= 0x1e)
 			btintel_get_iml_tlv(ver, fwname, sizeof(fwname), "sfi");
 		else
 			btintel_get_fw_name_tlv(ver, fwname, sizeof(fwname), "sfi");