aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/mvm/ops.c
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2015-04-13 12:05:48 +0300
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>2015-04-19 17:06:56 +0300
commit145d90b6b3a3f00d8b66d0e118b4995b64b74fef (patch)
treea5e7dea0c15ea5a2502412bcb14d4685dc555268 /drivers/net/wireless/iwlwifi/mvm/ops.c
parentd44c3fe68cc7e435ebc06d5b6ac260a5c1b495f8 (diff)
downloadkernel_replicant_linux-145d90b6b3a3f00d8b66d0e118b4995b64b74fef.tar.gz
kernel_replicant_linux-145d90b6b3a3f00d8b66d0e118b4995b64b74fef.tar.bz2
kernel_replicant_linux-145d90b6b3a3f00d8b66d0e118b4995b64b74fef.zip
iwlwifi: mvm: don't stop the FW monitor too early
When the delay paramatere is provided, we need to stop the collection only after the delay has elapsed. Reviewed-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/ops.c')
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/ops.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/ops.c b/drivers/net/wireless/iwlwifi/mvm/ops.c
index a08b03d58d4b..1c66297d82c0 100644
--- a/drivers/net/wireless/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/iwlwifi/mvm/ops.c
@@ -865,6 +865,16 @@ static void iwl_mvm_fw_error_dump_wk(struct work_struct *work)
return;
mutex_lock(&mvm->mutex);
+
+ /* stop recording */
+ if (mvm->cfg->device_family == IWL_DEVICE_FAMILY_7000) {
+ iwl_set_bits_prph(mvm->trans, MON_BUFF_SAMPLE_CTL, 0x100);
+ } else {
+ iwl_write_prph(mvm->trans, DBGC_IN_SAMPLE, 0);
+ /* wait before we collect the data till the DBGC stop */
+ udelay(100);
+ }
+
iwl_mvm_fw_error_dump(mvm);
/* start recording again if the firmware is not crashed */