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

Commit f0fea2b7 authored by Johannes Berg's avatar Johannes Berg Committed by Luca Coelho
Browse files

iwlwifi: pcie: warn if paging is already initialized during init 



This appears to happen in some cases, like when iwlmvm is unloaded and
loaded again without also unloading iwlwifi. Warn in this case and free
the paging data to be able to continue without causing corruption and
kernel crashes due to it (otherwise, paging data is overwritten, but
dram->paging_cnt gets to be twice as big as it should be, and then an
eventual free will crash.)

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 87fc0302

drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c

+5 −0
Original line number Diff line number Diff line
@@ -137,6 +137,11 @@ static int iwl_pcie_ctxt_info_init_fw_sec(struct iwl_trans *trans, 
	struct iwl_context_info_dram *ctxt_dram = &ctxt_info->dram;

	int i, ret, lmac_cnt, umac_cnt, paging_cnt;



	if (WARN(dram->paging,

		 "paging shouldn't already be initialized (%d pages)\n",

		 dram->paging_cnt))

		iwl_pcie_ctxt_info_free_paging(trans);



	lmac_cnt = iwl_pcie_get_num_sections(fw, 0);

	/* add 1 due to separator */

	umac_cnt = iwl_pcie_get_num_sections(fw, lmac_cnt + 1);