diff options
| author | Emmanuel Grumbach | 2016-06-19 19:57:02 +0200 |
|---|---|---|
| committer | Luca Coelho | 2016-07-06 08:58:33 +0200 |
| commit | 3edbc7dabab8ce85aa75c5e290ecda7a3692ebc9 (patch) | |
| tree | 59779d291403f74b93b44fa0b97164a462b31b3b /drivers/net/wireless/intel/iwlwifi/mvm/fw.c | |
| parent | iwlwifi: remove iwl_ht_params.smps_mode (diff) | |
| download | kernel-qcow2-linux-3edbc7dabab8ce85aa75c5e290ecda7a3692ebc9.tar.gz kernel-qcow2-linux-3edbc7dabab8ce85aa75c5e290ecda7a3692ebc9.tar.xz kernel-qcow2-linux-3edbc7dabab8ce85aa75c5e290ecda7a3692ebc9.zip | |
iwlwifi: mvm: unmap the paging memory before freeing it
This led to a DMA splat.
Fixes: a6c4fb4441f4 ("iwlwifi: mvm: Add FW paging mechanism for the UMAC on PCI")
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/fw.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c index 4db1d84749ab..4c16fa79b462 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c @@ -160,17 +160,21 @@ void iwl_free_fw_paging(struct iwl_mvm *mvm) return; for (i = 0; i < NUM_OF_FW_PAGING_BLOCKS; i++) { - if (!mvm->fw_paging_db[i].fw_paging_block) { + struct iwl_fw_paging *paging = &mvm->fw_paging_db[i]; + + if (!paging->fw_paging_block) { IWL_DEBUG_FW(mvm, "Paging: block %d already freed, continue to next page\n", i); continue; } + dma_unmap_page(mvm->trans->dev, paging->fw_paging_phys, + paging->fw_paging_size, DMA_BIDIRECTIONAL); - __free_pages(mvm->fw_paging_db[i].fw_paging_block, - get_order(mvm->fw_paging_db[i].fw_paging_size)); - mvm->fw_paging_db[i].fw_paging_block = NULL; + __free_pages(paging->fw_paging_block, + get_order(paging->fw_paging_size)); + paging->fw_paging_block = NULL; } kfree(mvm->trans->paging_download_buf); mvm->trans->paging_download_buf = NULL; |