Commit 6c0795f1 authored by Johannes Berg's avatar Johannes Berg Committed by Luca Coelho
Browse files

iwlwifi: implement Bz NMI behaviour 



The method to NMI the firmware also changed in Bz devices,
implement the new logic.

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.20210802215208.c9bd2034dc05.I983c25caa09c3776c7640fff73fe739362ecc5b6@changeid


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

drivers/net/wireless/intel/iwlwifi/iwl-csr.h

+4 −0
Original line number Diff line number Diff line
@@ -104,6 +104,10 @@ 
/* GIO Chicken Bits (PCI Express bus link power management) */

#define CSR_GIO_CHICKEN_BITS    (CSR_BASE+0x100)



/* Doorbell NMI (since Bz) */

#define CSR_DOORBELL_VECTOR	(CSR_BASE + 0x130)

#define CSR_DOORBELL_VECTOR_NMI	BIT(1)



/* host chicken bits */

#define CSR_HOST_CHICKEN	(CSR_BASE + 0x204)

#define CSR_HOST_CHICKEN_PM_IDLE_SRC_DIS_SB_PME	BIT(19)

drivers/net/wireless/intel/iwlwifi/iwl-io.c

+4 −1
Original line number Diff line number Diff line
@@ -213,9 +213,12 @@ void iwl_force_nmi(struct iwl_trans *trans) 
	else 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_NMI_FROM_DRIVER);

	else

	else if (trans->trans_cfg->device_family < IWL_DEVICE_FAMILY_BZ)

		iwl_write_umac_prph(trans, UREG_DOORBELL_TO_ISR6,

				    UREG_DOORBELL_TO_ISR6_NMI_BIT);

	else

		iwl_write32(trans, CSR_DOORBELL_VECTOR,

			    CSR_DOORBELL_VECTOR_NMI);

}

IWL_EXPORT_SYMBOL(iwl_force_nmi);