From: Luca Coelho <luca@coelho.fi>
To: kvalo@codeaurora.org
Cc: linux-wireless@vger.kernel.org,
Shahar S Matityahu <shahar.s.matityahu@intel.com>,
Luca Coelho <luciano.coelho@intel.com>
Subject: [PATCH 18/21] iwlwifi: dbg_ini: properly handle ini user trigger
Date: Sun, 27 Jan 2019 12:19:05 +0200 [thread overview]
Message-ID: <20190127101908.6428-19-luca@coelho.fi> (raw)
In-Reply-To: <20190127101908.6428-1-luca@coelho.fi>
From: Shahar S Matityahu <shahar.s.matityahu@intel.com>
in case of a user trigger while ini is enable we change
FW_DBG_TRIGGER_USER to IWL_FW_TRIGGER_ID_USER_TRIGGER in
iwl_fw_dbg_collect and then again we attempt to do so in
_iwl_fw_error_ini_dump which causes to abort the dump.
Fix it by removing the second check in _iwl_fw_error_ini_dump.
Signed-off-by: Shahar S Matityahu <shahar.s.matityahu@intel.com>
Fixes: 7a14c23dcdee ("iwlwifi: dbg: dump data according to the new ini TLVs")
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
index 947f282c05a9..07dc2919b0b4 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
@@ -1254,10 +1254,6 @@ _iwl_fw_error_ini_dump(struct iwl_fw_runtime *fwrt,
if (id == FW_DBG_TRIGGER_FW_ASSERT)
id = IWL_FW_TRIGGER_ID_FW_ASSERT;
- else if (id == FW_DBG_TRIGGER_USER)
- id = IWL_FW_TRIGGER_ID_USER_TRIGGER;
- else if (id < FW_DBG_TRIGGER_MAX)
- return NULL;
if (WARN_ON(id >= ARRAY_SIZE(fwrt->dump.active_trigs)))
return NULL;
--
2.20.1
next prev parent reply other threads:[~2019-01-27 10:20 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-27 10:18 [PATCH 00/21] iwlwifi: updates intended for v5.1 2019-01-27 Luca Coelho
2019-01-27 10:18 ` [PATCH 01/21] iwlwifi: mvm: fix A-MPDU reference assignment Luca Coelho
2019-01-27 10:18 ` [PATCH 02/21] iwlwifi: mvm: get rid of tx_path_lock Luca Coelho
2019-01-27 10:18 ` [PATCH 03/21] iwlwifi: remove TOF implementation Luca Coelho
2019-01-27 10:18 ` [PATCH 04/21] iwlwifi: dvm: remove useless condition Luca Coelho
2019-01-27 10:18 ` [PATCH 05/21] iwlwifi: pcie: use u32* argument to iwl_trans_get_fw_monitor_len() Luca Coelho
2019-01-27 10:18 ` [PATCH 06/21] iwlwifi: mvm: Disconnect on large beacon loss Luca Coelho
2019-01-27 10:18 ` [PATCH 07/21] iwlwifi: mvm: add location APIs Luca Coelho
2019-01-27 10:18 ` [PATCH 08/21] iwlwifi: mvm: implement CSI reporting Luca Coelho
2019-01-27 10:18 ` [PATCH 09/21] iwlwifi: mvm: Change FW channel info API Luca Coelho
2019-01-27 10:18 ` [PATCH 10/21] iwlwifi: mvm: freeze management TXQ timer when station goes to sleep Luca Coelho
2019-01-27 10:18 ` [PATCH 11/21] iwlwifi: mvm: disable completely low latency mode with debugfs Luca Coelho
2019-01-27 10:18 ` [PATCH 12/21] iwlwifi: update product name for 9260 and 9560 Luca Coelho
2019-01-27 10:19 ` [PATCH 13/21] iwlwifi: mvm: document monitor mode reorder buffer bypass Luca Coelho
2019-01-27 10:19 ` [PATCH 14/21] iwlwifi: mvm: include configured sniffer AID in radiotap Luca Coelho
2019-01-27 10:19 ` [PATCH 15/21] iwlwifi: trigger dump on assert prior to setting the device up Luca Coelho
2019-01-27 10:19 ` [PATCH 16/21] iwlwifi: mvm: update firmware when MU EDCA params change Luca Coelho
2019-01-27 10:19 ` [PATCH 17/21] iwlwifi: dbg_ini: allocate dram buffer with proper flags Luca Coelho
2019-01-27 10:19 ` Luca Coelho [this message]
2019-01-27 10:19 ` [PATCH 19/21] iwlwifi: dbg_ini: retrieve dump_delay value properly Luca Coelho
2019-01-27 10:19 ` [PATCH 20/21] iwlwifi: dbg_ini: set dump mask BIT(n) instead of n Luca Coelho
2019-01-27 10:19 ` [PATCH 21/21] iwiwifi: fix bad monitor buffer register addresses Luca Coelho
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190127101908.6428-19-luca@coelho.fi \
--to=luca@coelho.fi \
--cc=kvalo@codeaurora.org \
--cc=linux-wireless@vger.kernel.org \
--cc=luciano.coelho@intel.com \
--cc=shahar.s.matityahu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).