linux-bluetooth.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Bluetooth: btmtk: Add MODULE_FIRMWARE() for MT7922
@ 2024-02-27 10:29 Takashi Iwai
  2024-02-27 10:40 ` Paul Menzel
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Takashi Iwai @ 2024-02-27 10:29 UTC (permalink / raw)
  To: Marcel Holtmann, Luiz Augusto von Dentz
  Cc: Matthias Brugger, AngeloGioacchino Del Regno, linux-bluetooth,
	linux-kernel

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.

Link: https://bugzilla.suse.com/show_bug.cgi?id=1214133
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 drivers/bluetooth/btmtk.c | 1 +
 drivers/bluetooth/btmtk.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/drivers/bluetooth/btmtk.c b/drivers/bluetooth/btmtk.c
index aaabb732082c..e5138a207f37 100644
--- a/drivers/bluetooth/btmtk.c
+++ b/drivers/bluetooth/btmtk.c
@@ -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);
diff --git a/drivers/bluetooth/btmtk.h b/drivers/bluetooth/btmtk.h
index 56f5502baadf..cbcdb99a22e6 100644
--- a/drivers/bluetooth/btmtk.h
+++ b/drivers/bluetooth/btmtk.h
@@ -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"
 
-- 
2.35.3


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH] Bluetooth: btmtk: Add MODULE_FIRMWARE() for MT7922
  2024-02-27 10:29 [PATCH] Bluetooth: btmtk: Add MODULE_FIRMWARE() for MT7922 Takashi Iwai
@ 2024-02-27 10:40 ` Paul Menzel
  2024-02-27 10:57 ` bluez.test.bot
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: Paul Menzel @ 2024-02-27 10:40 UTC (permalink / raw)
  To: Takashi Iwai
  Cc: Marcel Holtmann, Luiz Augusto von Dentz, Matthias Brugger,
	AngeloGioacchino Del Regno, linux-bluetooth, linux-kernel

Dear Takashi,


Thank you for the patch.

Am 27.02.24 um 11:29 schrieb 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

generate*d*

> broken Bluetooth.
> 
> This patch simply adds the MODULE_FIRMWARE() for the missing entry
> for covering that.
> 
> Link: https://bugzilla.suse.com/show_bug.cgi?id=1214133
> Signed-off-by: Takashi Iwai <tiwai@suse.de>
> ---
>   drivers/bluetooth/btmtk.c | 1 +
>   drivers/bluetooth/btmtk.h | 1 +
>   2 files changed, 2 insertions(+)
> 
> diff --git a/drivers/bluetooth/btmtk.c b/drivers/bluetooth/btmtk.c
> index aaabb732082c..e5138a207f37 100644
> --- a/drivers/bluetooth/btmtk.c
> +++ b/drivers/bluetooth/btmtk.c
> @@ -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);
> diff --git a/drivers/bluetooth/btmtk.h b/drivers/bluetooth/btmtk.h
> index 56f5502baadf..cbcdb99a22e6 100644
> --- a/drivers/bluetooth/btmtk.h
> +++ b/drivers/bluetooth/btmtk.h
> @@ -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"

Reviewed-by: Paul Menzel <pmenzel@molgen.mpg.de>


Kind regards,

Paul

^ permalink raw reply	[flat|nested] 5+ messages in thread

* RE: Bluetooth: btmtk: Add MODULE_FIRMWARE() for MT7922
  2024-02-27 10:29 [PATCH] Bluetooth: btmtk: Add MODULE_FIRMWARE() for MT7922 Takashi Iwai
  2024-02-27 10:40 ` Paul Menzel
@ 2024-02-27 10:57 ` bluez.test.bot
  2024-02-29 17:27 ` [PATCH] " Matthias Brugger
  2024-03-04 21:30 ` patchwork-bot+bluetooth
  3 siblings, 0 replies; 5+ messages in thread
From: bluez.test.bot @ 2024-02-27 10:57 UTC (permalink / raw)
  To: linux-bluetooth, tiwai

[-- Attachment #1: Type: text/plain, Size: 1962 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=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


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] Bluetooth: btmtk: Add MODULE_FIRMWARE() for MT7922
  2024-02-27 10:29 [PATCH] Bluetooth: btmtk: Add MODULE_FIRMWARE() for MT7922 Takashi Iwai
  2024-02-27 10:40 ` Paul Menzel
  2024-02-27 10:57 ` bluez.test.bot
@ 2024-02-29 17:27 ` Matthias Brugger
  2024-03-04 21:30 ` patchwork-bot+bluetooth
  3 siblings, 0 replies; 5+ messages in thread
From: Matthias Brugger @ 2024-02-29 17:27 UTC (permalink / raw)
  To: Takashi Iwai, Marcel Holtmann, Luiz Augusto von Dentz
  Cc: AngeloGioacchino Del Regno, linux-bluetooth, linux-kernel



On 27/02/2024 11:29, Takashi Iwai 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.
> 
> Link: https://bugzilla.suse.com/show_bug.cgi?id=1214133
> Signed-off-by: Takashi Iwai <tiwai@suse.de>

Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>

> ---
>   drivers/bluetooth/btmtk.c | 1 +
>   drivers/bluetooth/btmtk.h | 1 +
>   2 files changed, 2 insertions(+)
> 
> diff --git a/drivers/bluetooth/btmtk.c b/drivers/bluetooth/btmtk.c
> index aaabb732082c..e5138a207f37 100644
> --- a/drivers/bluetooth/btmtk.c
> +++ b/drivers/bluetooth/btmtk.c
> @@ -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);
> diff --git a/drivers/bluetooth/btmtk.h b/drivers/bluetooth/btmtk.h
> index 56f5502baadf..cbcdb99a22e6 100644
> --- a/drivers/bluetooth/btmtk.h
> +++ b/drivers/bluetooth/btmtk.h
> @@ -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"
>   

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] Bluetooth: btmtk: Add MODULE_FIRMWARE() for MT7922
  2024-02-27 10:29 [PATCH] Bluetooth: btmtk: Add MODULE_FIRMWARE() for MT7922 Takashi Iwai
                   ` (2 preceding siblings ...)
  2024-02-29 17:27 ` [PATCH] " Matthias Brugger
@ 2024-03-04 21:30 ` patchwork-bot+bluetooth
  3 siblings, 0 replies; 5+ messages in thread
From: patchwork-bot+bluetooth @ 2024-03-04 21:30 UTC (permalink / raw)
  To: Takashi Iwai
  Cc: marcel, luiz.dentz, matthias.bgg, angelogioacchino.delregno,
	linux-bluetooth, linux-kernel

Hello:

This patch was applied to bluetooth/bluetooth-next.git (master)
by Luiz Augusto von Dentz <luiz.von.dentz@intel.com>:

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!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html



^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2024-03-04 21:30 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-02-27 10:29 [PATCH] Bluetooth: btmtk: Add MODULE_FIRMWARE() for MT7922 Takashi Iwai
2024-02-27 10:40 ` Paul Menzel
2024-02-27 10:57 ` bluez.test.bot
2024-02-29 17:27 ` [PATCH] " Matthias Brugger
2024-03-04 21:30 ` patchwork-bot+bluetooth

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).