wifi: mwifiex: drop asynchronous init waiting code

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 Commit 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.

Acked-by: Brian Norris <briannorris@chromium.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Link: https://patch.msgid.link/20250423-mwifiex-drop-asynchronous-init-v2-3-1bb951073a06@pengutronix.de
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/marvell/mwifiex/cmdevt.c b/drivers/net/wireless/marvell/mwifiex/cmdevt.c
index 1dca09646be27e62c3b59303fe1dcd490274f1cf..3bf27efe4537027c338779c728ad7429b7e76a0c 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/cmdevt.c
+++ b/drivers/net/wireless/marvell/mwifiex/cmdevt.c
@@ -892,18 +892,6 @@ int mwifiex_process_cmdresp(struct mwifiex_adapter *adapter)
                ret = mwifiex_process_sta_cmdresp(priv, cmdresp_no, resp);
        }
 
-       /* Check init command response */
-       if (adapter->hw_status == MWIFIEX_HW_STATUS_INITIALIZING) {
-               if (ret) {
-                       mwifiex_dbg(adapter, ERROR,
-                                   "%s: cmd %#x failed during\t"
-                                   "initialization\n", __func__, cmdresp_no);
-                       mwifiex_init_fw_complete(adapter);
-                       return -1;
-               } else if (adapter->last_init_cmd == cmdresp_no)
-                       adapter->hw_status = MWIFIEX_HW_STATUS_INIT_DONE;
-       }
-
        if (adapter->curr_cmd) {
                if (adapter->curr_cmd->wait_q_enabled)
                        adapter->cmd_wait_q.status = ret;
@@ -1022,10 +1010,6 @@ mwifiex_cmd_timeout_func(struct timer_list *t)
                        mwifiex_cancel_pending_ioctl(adapter);
                }
        }
-       if (adapter->hw_status == MWIFIEX_HW_STATUS_INITIALIZING) {
-               mwifiex_init_fw_complete(adapter);
-               return;
-       }
 
        if (adapter->if_ops.device_dump)
                adapter->if_ops.device_dump(adapter);

diff --git a/drivers/net/wireless/marvell/mwifiex/init.c b/drivers/net/wireless/marvell/mwifiex/init.c
index aa54a7874ee82ecdfc1227f142b53390fac06d34..dd2c17d946d7c973a57cd4bbc119b6403dcc5572 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/init.c
+++ b/drivers/net/wireless/marvell/mwifiex/init.c
@@ -524,6 +524,9 @@ int mwifiex_init_fw(struct mwifiex_adapter *adapter)
 
        adapter->hw_status = MWIFIEX_HW_STATUS_READY;
 
+       if (adapter->if_ops.init_fw_port)
+               adapter->if_ops.init_fw_port(adapter);
+
        return 0;
 }
 

diff --git a/drivers/net/wireless/marvell/mwifiex/main.c b/drivers/net/wireless/marvell/mwifiex/main.c
index 208859803b4120887e1d841b1ca39dba1e59edd2..1485f949ad4e07052feee5c5030940c270e74186 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/main.c
+++ b/drivers/net/wireless/marvell/mwifiex/main.c
@@ -355,13 +355,6 @@ process_start:
                if (adapter->cmd_resp_received) {
                        adapter->cmd_resp_received = false;
                        mwifiex_process_cmdresp(adapter);
-
-                       /* call mwifiex back when init_fw is done */
-                       if (adapter->hw_status == MWIFIEX_HW_STATUS_INIT_DONE) {
-                               adapter->hw_status = MWIFIEX_HW_STATUS_READY;
-                               mwifiex_init_fw_complete(adapter);
-                               maybe_quirk_fw_disable_ds(adapter);
-                       }
                }
 
                /* Check if we need to confirm Sleep Request
@@ -579,18 +572,11 @@ static int _mwifiex_fw_dpc(const struct firmware *firmware, void *context)
                        goto err_dnld_fw;
        }
 
-       adapter->init_wait_q_woken = false;
        ret = mwifiex_init_fw(adapter);
        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) {
                if (mwifiex_register_cfg80211(adapter)) {
@@ -1547,7 +1533,6 @@ mwifiex_reinit_sw(struct mwifiex_adapter *adapter)
 
        adapter->hw_status = MWIFIEX_HW_STATUS_INITIALIZING;
        clear_bit(MWIFIEX_SURPRISE_REMOVED, &adapter->work_flags);
-       init_waitqueue_head(&adapter->init_wait_q);
        clear_bit(MWIFIEX_IS_SUSPENDED, &adapter->work_flags);
        adapter->hs_activated = false;
        clear_bit(MWIFIEX_IS_CMD_TIMEDOUT, &adapter->work_flags);
@@ -1715,7 +1700,6 @@ mwifiex_add_card(void *card, struct completion *fw_done,
 
        adapter->hw_status = MWIFIEX_HW_STATUS_INITIALIZING;
        clear_bit(MWIFIEX_SURPRISE_REMOVED, &adapter->work_flags);
-       init_waitqueue_head(&adapter->init_wait_q);
        clear_bit(MWIFIEX_IS_SUSPENDED, &adapter->work_flags);
        adapter->hs_activated = false;
        init_waitqueue_head(&adapter->hs_activate_wait_q);

diff --git a/drivers/net/wireless/marvell/mwifiex/main.h b/drivers/net/wireless/marvell/mwifiex/main.h
index e566470226d8fca974f26d377400de13259c33c8..7fe268761b0742abfb84ec90830336271487744a 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/main.h
+++ b/drivers/net/wireless/marvell/mwifiex/main.h
@@ -239,7 +239,6 @@ struct mwifiex_dbg {
 enum MWIFIEX_HARDWARE_STATUS {
        MWIFIEX_HW_STATUS_READY,
        MWIFIEX_HW_STATUS_INITIALIZING,
-       MWIFIEX_HW_STATUS_INIT_DONE,
        MWIFIEX_HW_STATUS_RESET,
        MWIFIEX_HW_STATUS_NOT_READY
 };
@@ -865,8 +864,6 @@ struct mwifiex_adapter {
        unsigned long work_flags;
        u32 fw_release_number;
        u8 intf_hdr_len;
-       u16 init_wait_q_woken;
-       wait_queue_head_t init_wait_q;
        void *card;
        struct mwifiex_if_ops if_ops;
        atomic_t bypass_tx_pending;
@@ -919,7 +916,6 @@ struct mwifiex_adapter {
        struct cmd_ctrl_node *curr_cmd;
        /* spin lock for command */
        spinlock_t mwifiex_cmd_lock;
-       u16 last_init_cmd;
        struct timer_list cmd_timer;
        struct list_head cmd_free_q;
        /* spin lock for cmd_free_q */
@@ -1060,8 +1056,6 @@ void mwifiex_free_priv(struct mwifiex_private *priv);
 
 int mwifiex_init_fw(struct mwifiex_adapter *adapter);
 
-int mwifiex_init_fw_complete(struct mwifiex_adapter *adapter);
-
 void mwifiex_shutdown_drv(struct mwifiex_adapter *adapter);
 
 int mwifiex_dnld_fw(struct mwifiex_adapter *, struct mwifiex_fw_image *);

diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
index 5f049be24139033fd3f5ce163b6f23f21ee6a4e3..199a8e52e5b164b5bd10d6d5cf22db9675132f84 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
+++ b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
@@ -2418,9 +2418,5 @@ int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta, bool init)
        ret = mwifiex_send_cmd(priv, HostCmd_CMD_11N_CFG,
                               HostCmd_ACT_GEN_SET, 0, &tx_cfg, true);
 
-       if (init)
-               /* set last_init_cmd before sending the command */
-               priv->adapter->last_init_cmd = HostCmd_CMD_11N_CFG;
-
        return ret;
 }

diff --git a/drivers/net/wireless/marvell/mwifiex/util.c b/drivers/net/wireless/marvell/mwifiex/util.c
index ea28d604ee69ca79aa486f384f13c1dee2aabf76..4c5b1de0e936c6322835b557b41c959020d4e66b 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/util.c
+++ b/drivers/net/wireless/marvell/mwifiex/util.c
@@ -115,24 +115,6 @@ static struct mwifiex_debug_data items[] = {
 
 static int num_of_items = ARRAY_SIZE(items);
 
-/*
- * Firmware initialization complete callback handler.
- *
- * This function wakes up the function waiting on the init
- * wait queue for the firmware initialization to complete.
- */
-int mwifiex_init_fw_complete(struct mwifiex_adapter *adapter)
-{
-
-       if (adapter->hw_status == MWIFIEX_HW_STATUS_READY)
-               if (adapter->if_ops.init_fw_port)
-                       adapter->if_ops.init_fw_port(adapter);
-
-       adapter->init_wait_q_woken = true;
-       wake_up_interruptible(&adapter->init_wait_q);
-       return 0;
-}
-
 /*
  * This function sends init/shutdown command
  * to firmware.