Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4584729 authored by Haim Dreyfuss's avatar Haim Dreyfuss Committed by Luca Coelho
Browse files

iwlwifi: mvm: force single phy init 



The PHY is initialized during device initialization, but devices with
the tx_siso_diversity flag set need to send PHY_CONFIGURATION_CMD first,
otherwise the PHY would be reinitialized, causing a SYSASSERT.

To fix this, use a bit that tells the FW not to complete the PHY
initialization before a PHY_CONFIGURATION_CMD is received.

Signed-off-by: default avatarHaim Dreyfuss <haim.dreyfuss@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 3ed83da3

drivers/net/wireless/intel/iwlwifi/mvm/fw.c

+3 −0
Original line number Diff line number Diff line
@@ -420,6 +420,9 @@ static int iwl_run_unified_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm) 
	};

	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;