Commit 1b6598c3 authored by Roee Goldfiner's avatar Roee Goldfiner Committed by Luca Coelho
Browse files

iwlwifi: BZ Family SW reset support 



Previously added BZ reset wasn't taking into account the
call to iwl_trans_pcie_sw_reset which used a pre-BZ logic
to reset the device - enabling iwl_trans_pcie_sw_reset to
support BZ family made this reset redundant.

MAC_ACCESS clear shouldn't be called here but only when calling
_iwl_trans_pcie_stop_device which now support also BZ family.

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.648931fe07e2.Ibf30f9b8e70536da93c4a574ace33d325d3f8da4@changeid


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

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

+0 −12
Original line number Diff line number Diff line
@@ -163,18 +163,6 @@ void _iwl_trans_pcie_gen2_stop_device(struct iwl_trans *trans) 
	else

		iwl_pcie_ctxt_info_free(trans);



	/* Make sure (redundant) we've released our request to stay awake */

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

		iwl_clear_bit(trans, CSR_GP_CNTRL,

			      CSR_GP_CNTRL_REG_FLAG_BZ_MAC_ACCESS_REQ);

	else

		iwl_clear_bit(trans, CSR_GP_CNTRL,

			      CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);



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

		iwl_set_bit(trans, CSR_GP_CNTRL,

			    CSR_GP_CNTRL_REG_FLAG_SW_RESET);

	}

	/* Stop the device, and put it in low power state */

	iwl_pcie_gen2_apm_stop(trans, false);

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

+18 −6
Original line number Diff line number Diff line
@@ -129,7 +129,12 @@ void iwl_trans_pcie_dump_regs(struct iwl_trans *trans) 
static void iwl_trans_pcie_sw_reset(struct iwl_trans *trans)

{

	/* Reset entire device - do controller reset (results in SHRD_HW_RST) */

	iwl_set_bit(trans, CSR_RESET, CSR_RESET_REG_FLAG_SW_RESET);

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

		iwl_set_bit(trans, CSR_GP_CNTRL,

			    CSR_GP_CNTRL_REG_FLAG_SW_RESET);

	else

		iwl_set_bit(trans, CSR_RESET,

			    CSR_RESET_REG_FLAG_SW_RESET);

	usleep_range(5000, 6000);

}
@@ -1209,6 +1214,10 @@ static void _iwl_trans_pcie_stop_device(struct iwl_trans *trans) 
	}



	/* Make sure (redundant) we've released our request to stay awake */

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

		iwl_clear_bit(trans, CSR_GP_CNTRL,

			      CSR_GP_CNTRL_REG_FLAG_BZ_MAC_ACCESS_REQ);

	else

		iwl_clear_bit(trans, CSR_GP_CNTRL,

			      CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
@@ -2141,7 +2150,10 @@ static void iwl_trans_pcie_release_nic_access(struct iwl_trans *trans) 


	if (trans_pcie->cmd_hold_nic_awake)

		goto out;



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

		__iwl_trans_pcie_clear_bit(trans, CSR_GP_CNTRL,

					   CSR_GP_CNTRL_REG_FLAG_BZ_MAC_ACCESS_REQ);

	else

		__iwl_trans_pcie_clear_bit(trans, CSR_GP_CNTRL,

					   CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);

	/*