Commit 44b2dd40 authored by Roee Goldfiner's avatar Roee Goldfiner Committed by Luca Coelho
Browse files

iwlwifi: BZ Family BUS_MASTER_DISABLE_REQ code duplication 



Remove redundant code which occurs anyway in a later stage and add
msleep(100) which is required after disable request.

Signed-off-by: default avatarRoee Goldfiner <roee.h.goldfiner@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20211017162352.46183bcd6549.Ie05161496810d3f28fb9d1fecb5f8593889ed2c6@changeid


Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent f21baf24

drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c

+2 −14
Original line number Diff line number Diff line
@@ -131,21 +131,9 @@ void _iwl_trans_pcie_gen2_stop_device(struct iwl_trans *trans) 
	if (trans_pcie->is_down)

		return;



	if (trans->state >= IWL_TRANS_FW_STARTED) {

		if (trans->trans_cfg->device_family >= IWL_DEVICE_FAMILY_BZ) {

			iwl_set_bit(trans, CSR_GP_CNTRL,

				    CSR_GP_CNTRL_REG_FLAG_BUS_MASTER_DISABLE_REQ);

			iwl_poll_bit(trans, CSR_GP_CNTRL,

				     CSR_GP_CNTRL_REG_FLAG_BUS_MASTER_DISABLE_STATUS,

				     CSR_GP_CNTRL_REG_FLAG_BUS_MASTER_DISABLE_STATUS,

				     5000);

			msleep(100);

			iwl_set_bit(trans, CSR_GP_CNTRL,

				    CSR_GP_CNTRL_REG_FLAG_SW_RESET);

		} else if (trans_pcie->fw_reset_handshake) {

	if (trans->state >= IWL_TRANS_FW_STARTED)

		if (trans_pcie->fw_reset_handshake)

			iwl_trans_pcie_fw_reset_handshake(trans);

		}

	}



	trans_pcie->is_down = true;

drivers/net/wireless/intel/iwlwifi/pcie/trans.c

+1 −0
Original line number Diff line number Diff line
@@ -458,6 +458,7 @@ void iwl_pcie_apm_stop_master(struct iwl_trans *trans) 
				   CSR_GP_CNTRL_REG_FLAG_BUS_MASTER_DISABLE_STATUS,

				   CSR_GP_CNTRL_REG_FLAG_BUS_MASTER_DISABLE_STATUS,

				   100);

		msleep(100);

	} else {

		iwl_set_bit(trans, CSR_RESET, CSR_RESET_REG_FLAG_STOP_MASTER);