| From 241d07e6947945e20580799db0ebfa21ac4988ee Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 19 Apr 2018 10:57:08 +0200 |
| Subject: iwlwifi: don't WARN on trying to dump dead firmware |
| |
| From: Johannes Berg <johannes.berg@intel.com> |
| |
| [ Upstream commit 84f260251ed8153e84c64eb2c5278ab18d3ddef6 ] |
| |
| There's no point in warning here, the user will just get an |
| error back to the debugfs file write, and warning just makes |
| it seem like there's an internal consistency problem when in |
| reality the user just happened to hit this at a bad time. |
| Remove the warning. |
| |
| Fixes: f45f979dc208 ("iwlwifi: mvm: disable dbg data collect when fw isn't alive") |
| Signed-off-by: Johannes Berg <johannes.berg@intel.com> |
| Signed-off-by: Luca Coelho <luciano.coelho@intel.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 7 +++---- |
| 1 file changed, 3 insertions(+), 4 deletions(-) |
| |
| diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c |
| index a31a42e673c46..8070b2d4c46fe 100644 |
| --- a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c |
| +++ b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c |
| @@ -1016,7 +1016,7 @@ int iwl_fw_dbg_collect_desc(struct iwl_fw_runtime *fwrt, |
| * If the loading of the FW completed successfully, the next step is to |
| * get the SMEM config data. Thus, if fwrt->smem_cfg.num_lmacs is non |
| * zero, the FW was already loaded successully. If the state is "NO_FW" |
| - * in such a case - WARN and exit, since FW may be dead. Otherwise, we |
| + * in such a case - exit, since FW may be dead. Otherwise, we |
| * can try to collect the data, since FW might just not be fully |
| * loaded (no "ALIVE" yet), and the debug data is accessible. |
| * |
| @@ -1024,9 +1024,8 @@ int iwl_fw_dbg_collect_desc(struct iwl_fw_runtime *fwrt, |
| * config. In such a case, due to HW access problems, we might |
| * collect garbage. |
| */ |
| - if (WARN((fwrt->trans->state == IWL_TRANS_NO_FW) && |
| - fwrt->smem_cfg.num_lmacs, |
| - "Can't collect dbg data when FW isn't alive\n")) |
| + if (fwrt->trans->state == IWL_TRANS_NO_FW && |
| + fwrt->smem_cfg.num_lmacs) |
| return -EIO; |
| |
| if (test_and_set_bit(IWL_FWRT_STATUS_DUMPING, &fwrt->status)) |
| -- |
| 2.20.1 |
| |