diff options
| author | Liad Kaufman | 2017-02-28 16:15:47 +0100 |
|---|---|---|
| committer | Luca Coelho | 2017-04-25 21:51:12 +0200 |
| commit | b9410b186f7129bde5dd5b20475105f17fedb452 (patch) | |
| tree | 15ba0ab1a239a1a16aae1722eaec3e33cba17d29 /drivers/net/wireless/intel/iwlwifi/iwl-io.c | |
| parent | iwlwifi: remove module loading failure message (diff) | |
| download | kernel-qcow2-linux-b9410b186f7129bde5dd5b20475105f17fedb452.tar.gz kernel-qcow2-linux-b9410b186f7129bde5dd5b20475105f17fedb452.tar.xz kernel-qcow2-linux-b9410b186f7129bde5dd5b20475105f17fedb452.zip | |
iwlwifi: gen2: support nmi triggering from host
For gen2 there is a new register.
Signed-off-by: Liad Kaufman <liad.kaufman@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/iwl-io.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/iwl-io.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-io.c b/drivers/net/wireless/intel/iwlwifi/iwl-io.c index 0f893ae6e715..9c8b09cf1f7b 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-io.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-io.c @@ -246,6 +246,9 @@ void iwl_force_nmi(struct iwl_trans *trans) DEVICE_SET_NMI_VAL_DRV); iwl_write_prph(trans, DEVICE_SET_NMI_REG, DEVICE_SET_NMI_VAL_HW); + } else if (trans->cfg->gen2) { + iwl_write_prph(trans, UREG_NIC_SET_NMI_DRIVER, + DEVICE_SET_NMI_8000_VAL); } else { iwl_write_prph(trans, DEVICE_SET_NMI_8000_REG, DEVICE_SET_NMI_8000_VAL); |