Skip to contentSkip to conversation

Bluetooth: btmtk: Add MODULE_FIRMWARE() for MT7922

PATCH Applied Takashi Iwai 5 participants 5 messages Feb 27, 2024 – Mar 4, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Bluetooth: btmtk: Add MODULE_FIRMWARE() for MT7922

Since dracut refers to the module info for defining the required firmware files and btmtk driver doesn't provide the firmware info for MT7922, the generate initrd misses the firmware, resulting in the broken Bluetooth.

This patch simply adds the MODULE_FIRMWARE() for the missing entry for covering that.

---
 drivers/bluetooth/btmtk.c | 1 +
 drivers/bluetooth/btmtk.h | 1 +
 2 files changed, 2 insertions(+)
drivers/bluetooth/btmtk.c +1 -0
index aaabb732082c..e5138a207f37 100644
@@ -420,5 +420,6 @@ MODULE_LICENSE("GPL");
 MODULE_FIRMWARE(FIRMWARE_MT7622);
 MODULE_FIRMWARE(FIRMWARE_MT7663);
 MODULE_FIRMWARE(FIRMWARE_MT7668);
+MODULE_FIRMWARE(FIRMWARE_MT7922);
 MODULE_FIRMWARE(FIRMWARE_MT7961);
 MODULE_FIRMWARE(FIRMWARE_MT7925);
drivers/bluetooth/btmtk.h +1 -0
index 56f5502baadf..cbcdb99a22e6 100644
@@ -4,6 +4,7 @@
 #define FIRMWARE_MT7622		"mediatek/mt7622pr2h.bin"
 #define FIRMWARE_MT7663		"mediatek/mt7663pr2h.bin"
 #define FIRMWARE_MT7668		"mediatek/mt7668pr2h.bin"
+#define FIRMWARE_MT7922		"mediatek/BT_RAM_CODE_MT7922_1_1_hdr.bin"
 #define FIRMWARE_MT7961		"mediatek/BT_RAM_CODE_MT7961_1_2_hdr.bin"
 #define FIRMWARE_MT7925		"mediatek/mt7925/BT_RAM_CODE_MT7925_1_1_hdr.bin"
 
Signature · 1 line
2.35.3
Reviewed-by on v1 1/1
#1 lore raw

Dear Takashi,

Thank you for the patch.

Am 27.02.24 um 11:29 schrieb Takashi Iwai:

Quoted 3 lines

Since dracut refers to the module info for defining the required firmware files and btmtk driver doesn't provide the firmware info for MT7922, the generate initrd misses the firmware, resulting in the

generate*d*

Quoted 28 lines

broken Bluetooth.

This patch simply adds the MODULE_FIRMWARE() for the missing entry for covering that.

---
  drivers/bluetooth/btmtk.c | 1 +
  drivers/bluetooth/btmtk.h | 1 +
  2 files changed, 2 insertions(+)
drivers/bluetooth/btmtk.c +1 -0
index aaabb732082c..e5138a207f37 100644
@@ -420,5 +420,6 @@ MODULE_LICENSE("GPL");
  MODULE_FIRMWARE(FIRMWARE_MT7622);
  MODULE_FIRMWARE(FIRMWARE_MT7663);
  MODULE_FIRMWARE(FIRMWARE_MT7668);
+MODULE_FIRMWARE(FIRMWARE_MT7922);
  MODULE_FIRMWARE(FIRMWARE_MT7961);
  MODULE_FIRMWARE(FIRMWARE_MT7925);
drivers/bluetooth/btmtk.h +0 -0
index 56f5502baadf..cbcdb99a22e6 100644

drivers/bluetooth/btmtk.h line 9

Quoted 6 lines
drivers/bluetooth/btmtk.h +1 -0
@@ -4,6 +4,7 @@
  #define FIRMWARE_MT7622		"mediatek/mt7622pr2h.bin"
  #define FIRMWARE_MT7663		"mediatek/mt7663pr2h.bin"
  #define FIRMWARE_MT7668		"mediatek/mt7668pr2h.bin"
+#define FIRMWARE_MT7922		"mediatek/BT_RAM_CODE_MT7922_1_1_hdr.bin"
  #define FIRMWARE_MT7961		"mediatek/BT_RAM_CODE_MT7961_1_2_hdr.bin"
  #define FIRMWARE_MT7925		"mediatek/mt7925/BT_RAM_CODE_MT7925_1_1_hdr.bin"

Kind regards,

Paul

#2 lore raw
In reply to Takashi Iwai

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

---Test result---

Test Summary:

CheckPatch                    PASS      0.63 seconds
GitLint                       PASS      0.18 seconds
SubjectPrefix                 PASS      0.28 seconds
BuildKernel                   PASS      27.40 seconds
CheckAllWarning               PASS      30.15 seconds
CheckSparse                   PASS      36.05 seconds
CheckSmatch                   PASS      97.54 seconds
BuildKernel32                 PASS      26.81 seconds
TestRunnerSetup               PASS      506.45 seconds
TestRunner_l2cap-tester       FAIL      22.37 seconds
TestRunner_iso-tester         FAIL      38.89 seconds
TestRunner_bnep-tester        PASS      4.69 seconds
TestRunner_mgmt-tester        PASS      113.32 seconds
TestRunner_rfcomm-tester      PASS      7.29 seconds
TestRunner_sco-tester         PASS      13.00 seconds
TestRunner_ioctl-tester       PASS      8.43 seconds
TestRunner_mesh-tester        PASS      5.90 seconds
TestRunner_smp-tester         PASS      6.75 seconds
TestRunner_userchan-tester    PASS      4.95 seconds
IncrementalBuild              PASS      25.78 seconds

Details
##############################
Test: TestRunner_l2cap-tester - FAIL
Desc: Run l2cap-tester with test-runner Output:
Total: 51, Passed: 50 (98.0%), Failed: 1, Not Run: 0

Failed Test Cases
L2CAP LE Client - Close socket 2 Timed out 2.167 seconds
##############################
Test: TestRunner_iso-tester - FAIL
Desc: Run iso-tester with test-runner
Output:
Total: 117, Passed: 116 (99.1%), Failed: 1, Not Run: 0

Failed Test Cases
ISO Connect2 Suspend - Success Timed out 12.292 seconds

---
Regards,
Linux Bluetooth

maintainer Reviewed-by on v1 1/1
#3 lore raw
In reply to Takashi Iwai
Quoted 10 lines · Takashi Iwai

Since dracut refers to the module info for defining the required firmware files and btmtk driver doesn't provide the firmware info for MT7922, the generate initrd misses the firmware, resulting in the broken Bluetooth.

This patch simply adds the MODULE_FIRMWARE() for the missing entry for covering that.

Quoted 28 lines
---
  drivers/bluetooth/btmtk.c | 1 +
  drivers/bluetooth/btmtk.h | 1 +
  2 files changed, 2 insertions(+)
drivers/bluetooth/btmtk.c +1 -0
index aaabb732082c..e5138a207f37 100644
@@ -420,5 +420,6 @@ MODULE_LICENSE("GPL");
  MODULE_FIRMWARE(FIRMWARE_MT7622);
  MODULE_FIRMWARE(FIRMWARE_MT7663);
  MODULE_FIRMWARE(FIRMWARE_MT7668);
+MODULE_FIRMWARE(FIRMWARE_MT7922);
  MODULE_FIRMWARE(FIRMWARE_MT7961);
  MODULE_FIRMWARE(FIRMWARE_MT7925);
drivers/bluetooth/btmtk.h +1 -0
index 56f5502baadf..cbcdb99a22e6 100644
@@ -4,6 +4,7 @@
  #define FIRMWARE_MT7622		"mediatek/mt7622pr2h.bin"
  #define FIRMWARE_MT7663		"mediatek/mt7663pr2h.bin"
  #define FIRMWARE_MT7668		"mediatek/mt7668pr2h.bin"
+#define FIRMWARE_MT7922		"mediatek/BT_RAM_CODE_MT7922_1_1_hdr.bin"
  #define FIRMWARE_MT7961		"mediatek/BT_RAM_CODE_MT7961_1_2_hdr.bin"
  #define FIRMWARE_MT7925		"mediatek/mt7925/BT_RAM_CODE_MT7925_1_1_hdr.bin"
 
#4 lore raw
In reply to Takashi Iwai
This patch was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:

Hello:

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

Quoted 9 lines · On Tue, 27 Feb 2024 11:29:14 +0100 you wrote:

Since dracut refers to the module info for defining the required firmware files and btmtk driver doesn't provide the firmware info for MT7922, the generate initrd misses the firmware, resulting in the broken Bluetooth.

This patch simply adds the MODULE_FIRMWARE() for the missing entry for covering that.

[...]

Here is the summary with links:
- Bluetooth: btmtk: Add MODULE_FIRMWARE() for MT7922

    https://git.kernel.org/bluetooth/bluetooth-next/c/aa1767a3fcd7

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html