From d3fc42fc9a45c18a3a9a226653868b05141ba806 Mon Sep 17 00:00:00 2001 From: Oscar Salvador Date: Mar 27 2023 08:17:55 +0000 Subject: Merge remote-tracking branch 'origin/users/tiwai/SLE15-SP5-GA/for-next' into SLE15-SP5-GA Delete patch by Takashi Iwai --- diff --git a/patches.suse/iwlwifi-module-firmware-ucode-fix.patch b/patches.suse/iwlwifi-module-firmware-ucode-fix.patch deleted file mode 100644 index 42bd675..0000000 --- a/patches.suse/iwlwifi-module-firmware-ucode-fix.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: Takashi Iwai -Subject: iwlwifi: Fix MODULE_FIRMWARE() for non-existing ucode version -Patch-mainline: Never, temporary workaround -References: boo#1191417 - -iwlwifi driver declares the requested firmware *-72.ucode for 22000 -series, but that version isn't found in the upstream linux-firmware -tree. As a result, the installation image (and initrd) misses the -requested firmware, which leads to the non-working WiFi. - -As a temporary fix, correct the ucode version to the existing one, -*-71. - -Signed-off-by: Takashi Iwai - ---- - drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - ---- a/drivers/net/wireless/intel/iwlwifi/cfg/22000.c -+++ b/drivers/net/wireless/intel/iwlwifi/cfg/22000.c -@@ -10,7 +10,11 @@ - #include "fw/api/txq.h" - - /* Highest firmware API version supported */ --#define IWL_22000_UCODE_API_MAX 72 -+/* FIXME: Intel never released *-72.ucode but only *-71.ucode (as of 2022 Aug). -+ * For fixing a spurious kernel error and initrd creation, -+ * set to 71 instead of non-existing 72 -+ */ -+#define IWL_22000_UCODE_API_MAX 71 - - /* Lowest firmware API version supported */ - #define IWL_22000_UCODE_API_MIN 39 diff --git a/series.conf b/series.conf index 2d1d622..ee5d8c7 100644 --- a/series.conf +++ b/series.conf @@ -37282,7 +37282,6 @@ # Wireless networking drivers ######################################################## patches.suse/b43-missing-firmware-info.patch - patches.suse/iwlwifi-module-firmware-ucode-fix.patch patches.suse/0001-regulator-mt6360-Add-OF-match-table.patch patches.suse/0002-regulator-mt6358-Add-OF-match-table.patch patches.suse/0003-regulator-mt6323-Add-OF-match-table.patch