On Thu, Apr 10, 2025 at 12:28:45PM +0200, Sascha Hauer wrote:
> Historically all commands sent to the mwifiex driver have been
> asynchronous. The different commands sent during driver initialization
> have been queued at once and only the final command has been waited
> for being ready before finally starting the driver.
>
> This has been changed in 7bff9c974e1a ("mwifiex: send firmware
> initialization commands synchronously"). With this the initialization
> is finished once the last mwifiex_send_cmd_sync() (now
> mwifiex_send_cmd()) has returned. This makes all the code used to
> wait for the last initialization command to be finished unnecessary,
> so it's removed in this patch.
>
> Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
> ---
> drivers/net/wireless/marvell/mwifiex/cmdevt.c | 16 ----------------
> drivers/net/wireless/marvell/mwifiex/init.c | 5 +++--
> drivers/net/wireless/marvell/mwifiex/main.c | 12 ++----------
> drivers/net/wireless/marvell/mwifiex/main.h | 6 ------
> drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 4 ----
> drivers/net/wireless/marvell/mwifiex/util.c | 18 ------------------
> 6 files changed, 5 insertions(+), 56 deletions(-)
The following hunk is missing in this patch. Will add next time.
-------------------------------8<-------------------------------
commit 707b4d85612123bee63b79947cb036211b59152f
Author: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
Date: Fri Apr 11 08:47:59 2025 +0200
fixup! wifi: mwifiex: drop asynchronous init waiting code
diff --git a/drivers/net/wireless/marvell/mwifiex/main.c b/drivers/net/wireless/marvell/mwifiex/main.c
index ff094b5c32239..73298b0769c94 100644
--- a/drivers/net/wireless/marvell/mwifiex/main.c
+++ b/drivers/net/wireless/marvell/mwifiex/main.c
@@ -584,14 +584,6 @@ static int _mwifiex_fw_dpc(const struct firmware *firmware, void *context)
if (ret == -1)
goto err_init_fw;
- /* Wait for mwifiex_init to complete */
- if (!adapter->mfg_mode) {
- wait_event_interruptible(adapter->init_wait_q,
- adapter->init_wait_q_woken);
- if (adapter->hw_status != MWIFIEX_HW_STATUS_READY)
- goto err_init_fw;
- }
-
maybe_quirk_fw_disable_ds(adapter);
if (!adapter->wiphy) {
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
