Commit 23a392a4 authored by Johannes Berg's avatar Johannes Berg Committed by Luca Coelho
Browse files

iwlwifi: implement reset flow for Bz devices 



On Bz devices, UREG_DOORBELL_TO_ISR6_NMI_BIT no longer actually
triggers an NMI. So instead of setting BIT(0) | BIT(1) for the
reset flow, we need to just set BIT(1) and then force the NMI
in the new way.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20211204174546.6b56e7ee1773.I71cba66e17cc0daabc5ad7abd88763674b625c82@changeid


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

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

+4 −1
Original line number Diff line number Diff line
@@ -105,9 +105,12 @@ static void iwl_trans_pcie_fw_reset_handshake(struct iwl_trans *trans) 
	if (trans->trans_cfg->device_family < IWL_DEVICE_FAMILY_AX210)

		iwl_write_umac_prph(trans, UREG_NIC_SET_NMI_DRIVER,

				    UREG_NIC_SET_NMI_DRIVER_RESET_HANDSHAKE);

	else

	else if (trans->trans_cfg->device_family == IWL_DEVICE_FAMILY_AX210)

		iwl_write_umac_prph(trans, UREG_DOORBELL_TO_ISR6,

				    UREG_DOORBELL_TO_ISR6_RESET_HANDSHAKE);

	else

		iwl_write32(trans, CSR_DOORBELL_VECTOR,

			    UREG_DOORBELL_TO_ISR6_RESET_HANDSHAKE);



	/* wait 200ms */

	ret = wait_event_timeout(trans_pcie->fw_reset_waitq,