wifi: iwlwifi: Update init sequence if tx diversity supported

PHY configuration command need to be sent to FW if the tx diversity
with SISO is supported.
This need to be sent to get the init notification from FW.

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.c2121c8694a7.Ibee3dd8765ef4b7504660fa228a7c7eff78920af@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 a6b11bccb0c180d3fa9eda4f1d873d4894c9bea4..521eded39028cad18cad66139c47c733bf939592 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
@@ -672,6 +672,13 @@ static int iwl_run_unified_mvm_ucode(struct iwl_mvm *mvm)
                goto error;
        }
 
+       ret = iwl_send_phy_cfg_cmd(mvm);
+       if (ret) {
+               IWL_ERR(mvm, "Failed to run PHY configuration: %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);
@@ -1538,12 +1545,11 @@ int iwl_mvm_up(struct iwl_mvm *mvm)
                ret = iwl_send_phy_db_data(mvm->phy_db);
                if (ret)
                        goto error;
+               ret = iwl_send_phy_cfg_cmd(mvm);
+               if (ret)
+                       goto error;
        }
 
-       ret = iwl_send_phy_cfg_cmd(mvm);
-       if (ret)
-               goto error;
-
        ret = iwl_mvm_send_bt_init_conf(mvm);
        if (ret)
                goto error;