Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 714afd35 authored by Shahar S Matityahu's avatar Shahar S Matityahu Committed by Luca Coelho
Browse files

iwlwifi: remove redundant condition from prior alive dump flow 



After the FW image was loaded for the first time,
fwrt->smem_cfg.num_lmacs value will no longer be zero since we don't
clean it when we stop the device. So if we load the image once and then
we fail on a consecutive attempt, the driver will abort any dumping.

Solve this by removing the condition. It is safe to remove since
when we do the actual dumping in iwl_fw_dbg_collect_sync we check
that STATUS_DEVICE_ENABLED bit is still active.

Signed-off-by: default avatarShahar S Matityahu <shahar.s.matityahu@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent a53b2a0b

drivers/net/wireless/intel/iwlwifi/fw/dbg.c

+0 −16
Original line number Diff line number Diff line
@@ -1592,22 +1592,6 @@ int iwl_fw_dbg_collect_desc(struct iwl_fw_runtime *fwrt, 
			    bool monitor_only,

			    unsigned int delay)

{

	/*

	 * 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 - 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.

	 *

	 * Corner case: got the FW alive but crashed before getting the SMEM

	 *	config. In such a case, due to HW access problems, we might

	 *	collect garbage.

	 */

	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))

		return -EBUSY;