Skip to content

Commit a458472

Browse files
haimdreyfusslucacoelho
authored andcommitted
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: Haim Dreyfuss <[email protected]> Signed-off-by: Luca Coelho <[email protected]>
1 parent 3ed83da commit a458472

File tree

1 file changed

+3
-0
lines changed
  • drivers/net/wireless/intel/iwlwifi/mvm

1 file changed

+3
-0
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,9 @@ static int iwl_run_unified_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm)
420420
};
421421
int ret;
422422

423+
if (mvm->trans->cfg->tx_with_siso_diversity)
424+
init_cfg.init_flags |= cpu_to_le32(BIT(IWL_INIT_PHY));
425+
423426
lockdep_assert_held(&mvm->mutex);
424427

425428
mvm->rfkill_safe_init_done = false;

0 commit comments

Comments
 (0)