kernel-6.6.36

2024-06-29 17:52:33 +03:00
parent 8275345865
commit 8fd0b3ba0f
11 changed files with 212 additions and 139 deletions
@@ -0,0 +1,42 @@
+From: Takashi Iwai <tiwai-l3A5Bk7waGM@public.gmane.org>
+Subject: [PATCH] iwlwifi: cfg: Add missing MODULE_FIRMWARE() for *.pnvm
+Date: Wed,  5 Apr 2023 08:35:46 +0200
+
+A few models require *.pnvm files while we don't declare them via
+MODULE_FIRMWARE().  This resulted in the breakage of WiFi on the
+system that relies on the information from modinfo (e.g. openSUSE
+installer image).
+
+This patch adds those missing MODULE_FIRMWARE() entries for *.pnvm
+files.
+
+Link: https://bugzilla.opensuse.org/show_bug.cgi?id=1207553
+Signed-off-by: Takashi Iwai <tiwai-l3A5Bk7waGM@public.gmane.org>
+---
+
+The fix is obviously ad hoc.
+
+Here I added the lines with the explicit string since *_PRE definition
+contains the tailing dash and can't be used for *.pnvm file.
+
+Alternatively, we may put a single line
+ MODULE_FIRMWARE("iwlwifi-*.pnvm");
+to catch all, too.
+
+ drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/22000.c b/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
+index 3bdd6774716d..3c6dc3601784 100644
+--- a/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
+@@ -1065,3 +1065,7 @@ MODULE_FIRMWARE(IWL_BNJ_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
+ MODULE_FIRMWARE(IWL_BZ_A_FM4_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
+ MODULE_FIRMWARE(IWL_GL_B_FM_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
+ MODULE_FIRMWARE(IWL_BNJ_B_FM_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
+
+MODULE_FIRMWARE("iwlwifi-so-a0-gf4-a0.pnvm");
+MODULE_FIRMWARE("iwlwifi-so-a0-gf-a0.pnvm");
+MODULE_FIRMWARE("iwlwifi-ty-a0-gf-a0.pnvm");
+--
+2.35.3