Skip to content

Commit d200132

Browse files
greearbgregkh
authored andcommitted
wifi: iwlwifi: Use request_module_nowait
commit 3d91371 upstream. This appears to work around a deadlock regression that came in with the LED merge in 6.9. The deadlock happens on my system with 24 iwlwifi radios, so maybe it something like all worker threads are busy and some work that needs to complete cannot complete. Link: https://lore.kernel.org/linux-kernel/20240411070718.GD6194@google.com/ Fixes: f5c31bc ("Merge tag 'leds-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds") Signed-off-by: Ben Greear <greearb@candelatech.com> Link: https://msgid.link/20240430234212.2132958-1-greearb@candelatech.com [also remove unnecessary "load_module" var and now-wrong comment] Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 3be4692 commit d200132

1 file changed

Lines changed: 1 addition & 9 deletions

File tree

drivers/net/wireless/intel/iwlwifi/iwl-drv.c

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1484,7 +1484,6 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context)
14841484
size_t trigger_tlv_sz[FW_DBG_TRIGGER_MAX];
14851485
u32 api_ver;
14861486
int i;
1487-
bool load_module = false;
14881487
bool usniffer_images = false;
14891488
bool failure = true;
14901489

@@ -1732,19 +1731,12 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context)
17321731
goto out_unbind;
17331732
}
17341733
} else {
1735-
load_module = true;
1734+
request_module_nowait("%s", op->name);
17361735
}
17371736
mutex_unlock(&iwlwifi_opmode_table_mtx);
17381737

17391738
complete(&drv->request_firmware_complete);
17401739

1741-
/*
1742-
* Load the module last so we don't block anything
1743-
* else from proceeding if the module fails to load
1744-
* or hangs loading.
1745-
*/
1746-
if (load_module)
1747-
request_module("%s", op->name);
17481740
failure = false;
17491741
goto free;
17501742

0 commit comments

Comments
 (0)