wifi: iwlwifi: mvm: move function sequence

Need to move a function definition and actual changes
will be done in following commit.

Signed-off-by: Mukesh Sisodiya <mukesh.sisodiya@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230413102635.00a6c203712f.I7c099e5c1954f1daa5a5039b98149b6f081e46ae@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
index 7fe733d..a6b11bc 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
@@ -467,111 +467,6 @@ static int iwl_mvm_load_ucode_wait_alive(struct iwl_mvm *mvm,
        return 0;
 }
 
-static int iwl_run_unified_mvm_ucode(struct iwl_mvm *mvm)
-{
-       struct iwl_notification_wait init_wait;
-       struct iwl_nvm_access_complete_cmd nvm_complete = {};
-       struct iwl_init_extended_cfg_cmd init_cfg = {
-               .init_flags = cpu_to_le32(BIT(IWL_INIT_NVM)),
-       };
-       static const u16 init_complete[] = {
-               INIT_COMPLETE_NOTIF,
-       };
-       int ret;
-
-       if (mvm->trans->cfg->tx_with_siso_diversity)
-               init_cfg.init_flags |= cpu_to_le32(BIT(IWL_INIT_PHY));
-
-       lockdep_assert_held(&mvm->mutex);
-
-       mvm->rfkill_safe_init_done = false;
-
-       iwl_init_notification_wait(&mvm->notif_wait,
-                                  &init_wait,
-                                  init_complete,
-                                  ARRAY_SIZE(init_complete),
-                                  iwl_wait_init_complete,
-                                  NULL);
-
-       iwl_dbg_tlv_time_point(&mvm->fwrt, IWL_FW_INI_TIME_POINT_EARLY, NULL);
-
-       /* Will also start the device */
-       ret = iwl_mvm_load_ucode_wait_alive(mvm, IWL_UCODE_REGULAR);
-       if (ret) {
-               IWL_ERR(mvm, "Failed to start RT ucode: %d\n", ret);
-               goto error;
-       }
-       iwl_dbg_tlv_time_point(&mvm->fwrt, IWL_FW_INI_TIME_POINT_AFTER_ALIVE,
-                              NULL);
-
-       /* Send init config command to mark that we are sending NVM access
-        * commands
-        */
-       ret = iwl_mvm_send_cmd_pdu(mvm, WIDE_ID(SYSTEM_GROUP,
-                                               INIT_EXTENDED_CFG_CMD),
-                                  CMD_SEND_IN_RFKILL,
-                                  sizeof(init_cfg), &init_cfg);
-       if (ret) {
-               IWL_ERR(mvm, "Failed to run init config command: %d\n",
-                       ret);
-               goto error;
-       }
-
-       /* Load NVM to NIC if needed */
-       if (mvm->nvm_file_name) {
-               ret = iwl_read_external_nvm(mvm->trans, mvm->nvm_file_name,
-                                           mvm->nvm_sections);
-               if (ret)
-                       goto error;
-               ret = iwl_mvm_load_nvm_to_nic(mvm);
-               if (ret)
-                       goto error;
-       }
-
-       if (IWL_MVM_PARSE_NVM && !mvm->nvm_data) {
-               ret = iwl_nvm_init(mvm);
-               if (ret) {
-                       IWL_ERR(mvm, "Failed to read NVM: %d\n", ret);
-                       goto error;
-               }
-       }
-
-       ret = iwl_mvm_send_cmd_pdu(mvm, WIDE_ID(REGULATORY_AND_NVM_GROUP,
-                                               NVM_ACCESS_COMPLETE),
-                                  CMD_SEND_IN_RFKILL,
-                                  sizeof(nvm_complete), &nvm_complete);
-       if (ret) {
-               IWL_ERR(mvm, "Failed to run complete NVM access: %d\n",
-                       ret);
-               goto error;
-       }
-
-       /* We wait for the INIT complete notification */
-       ret = iwl_wait_notification(&mvm->notif_wait, &init_wait,
-                                   MVM_UCODE_ALIVE_TIMEOUT);
-       if (ret)
-               return ret;
-
-       /* Read the NVM only at driver load time, no need to do this twice */
-       if (!IWL_MVM_PARSE_NVM && !mvm->nvm_data) {
-               mvm->nvm_data = iwl_get_nvm(mvm->trans, mvm->fw);
-               if (IS_ERR(mvm->nvm_data)) {
-                       ret = PTR_ERR(mvm->nvm_data);
-                       mvm->nvm_data = NULL;
-                       IWL_ERR(mvm, "Failed to read NVM: %d\n", ret);
-                       return ret;
-               }
-       }
-
-       mvm->rfkill_safe_init_done = true;
-
-       return 0;
-
-error:
-       iwl_remove_notification(&mvm->notif_wait, &init_wait);
-       return ret;
-}
-
 #ifdef CONFIG_ACPI
 static void iwl_mvm_phy_filter_init(struct iwl_mvm *mvm,
                                    struct iwl_phy_specific_cfg *phy_filters)
@@ -698,6 +593,111 @@ static int iwl_send_phy_cfg_cmd(struct iwl_mvm *mvm)
        return iwl_mvm_send_cmd_pdu(mvm, cmd_id, 0, cmd_size, &phy_cfg_cmd);
 }
 
+static int iwl_run_unified_mvm_ucode(struct iwl_mvm *mvm)
+{
+       struct iwl_notification_wait init_wait;
+       struct iwl_nvm_access_complete_cmd nvm_complete = {};
+       struct iwl_init_extended_cfg_cmd init_cfg = {
+               .init_flags = cpu_to_le32(BIT(IWL_INIT_NVM)),
+       };
+       static const u16 init_complete[] = {
+               INIT_COMPLETE_NOTIF,
+       };
+       int ret;
+
+       if (mvm->trans->cfg->tx_with_siso_diversity)
+               init_cfg.init_flags |= cpu_to_le32(BIT(IWL_INIT_PHY));
+
+       lockdep_assert_held(&mvm->mutex);
+
+       mvm->rfkill_safe_init_done = false;
+
+       iwl_init_notification_wait(&mvm->notif_wait,
+                                  &init_wait,
+                                  init_complete,
+                                  ARRAY_SIZE(init_complete),
+                                  iwl_wait_init_complete,
+                                  NULL);
+
+       iwl_dbg_tlv_time_point(&mvm->fwrt, IWL_FW_INI_TIME_POINT_EARLY, NULL);
+
+       /* Will also start the device */
+       ret = iwl_mvm_load_ucode_wait_alive(mvm, IWL_UCODE_REGULAR);
+       if (ret) {
+               IWL_ERR(mvm, "Failed to start RT ucode: %d\n", ret);
+               goto error;
+       }
+       iwl_dbg_tlv_time_point(&mvm->fwrt, IWL_FW_INI_TIME_POINT_AFTER_ALIVE,
+                              NULL);
+
+       /* Send init config command to mark that we are sending NVM access
+        * commands
+        */
+       ret = iwl_mvm_send_cmd_pdu(mvm, WIDE_ID(SYSTEM_GROUP,
+                                               INIT_EXTENDED_CFG_CMD),
+                                  CMD_SEND_IN_RFKILL,
+                                  sizeof(init_cfg), &init_cfg);
+       if (ret) {
+               IWL_ERR(mvm, "Failed to run init config command: %d\n",
+                       ret);
+               goto error;
+       }
+
+       /* Load NVM to NIC if needed */
+       if (mvm->nvm_file_name) {
+               ret = iwl_read_external_nvm(mvm->trans, mvm->nvm_file_name,
+                                           mvm->nvm_sections);
+               if (ret)
+                       goto error;
+               ret = iwl_mvm_load_nvm_to_nic(mvm);
+               if (ret)
+                       goto error;
+       }
+
+       if (IWL_MVM_PARSE_NVM && !mvm->nvm_data) {
+               ret = iwl_nvm_init(mvm);
+               if (ret) {
+                       IWL_ERR(mvm, "Failed to read NVM: %d\n", ret);
+                       goto error;
+               }
+       }
+
+       ret = iwl_mvm_send_cmd_pdu(mvm, WIDE_ID(REGULATORY_AND_NVM_GROUP,
+                                               NVM_ACCESS_COMPLETE),
+                                  CMD_SEND_IN_RFKILL,
+                                  sizeof(nvm_complete), &nvm_complete);
+       if (ret) {
+               IWL_ERR(mvm, "Failed to run complete NVM access: %d\n",
+                       ret);
+               goto error;
+       }
+
+       /* We wait for the INIT complete notification */
+       ret = iwl_wait_notification(&mvm->notif_wait, &init_wait,
+                                   MVM_UCODE_ALIVE_TIMEOUT);
+       if (ret)
+               return ret;
+
+       /* Read the NVM only at driver load time, no need to do this twice */
+       if (!IWL_MVM_PARSE_NVM && !mvm->nvm_data) {
+               mvm->nvm_data = iwl_get_nvm(mvm->trans, mvm->fw);
+               if (IS_ERR(mvm->nvm_data)) {
+                       ret = PTR_ERR(mvm->nvm_data);
+                       mvm->nvm_data = NULL;
+                       IWL_ERR(mvm, "Failed to read NVM: %d\n", ret);
+                       return ret;
+               }
+       }
+
+       mvm->rfkill_safe_init_done = true;
+
+       return 0;
+
+error:
+       iwl_remove_notification(&mvm->notif_wait, &init_wait);
+       return ret;
+}
+
 int iwl_run_init_mvm_ucode(struct iwl_mvm *mvm)
 {
        struct iwl_notification_wait calib_wait;