iwlwifi: mvm: Decrease size of the paging download buffer

Currently the driver has 2 buffers for paging:
1. paging db - this contains all of the pages that were in the FW
image, that the driver stores for the FW. This is allocated for each
block separately (not contiguous).
2. download buffer - we need to provide this empty buffer for the
iwl_sdio_load_fw_chunk function to copy the requested pages to the shared
memory. This is one big buffer of contiguous memory whose size is the
size of all the blocks that the fw paging section can contain.

This download buffer size is too big, and causes the allocation to fail
sometimes. Since the driver allocates memory for each block separately,
it is not possible for the FW to request all of the pages in one request
(the FW gives an address and size, so blocks need to be contiguous for
this to happen), therefore the FW is limited to request only one block.

Decrease the size of the paging download buffer to be the size of a
paging block.

Signed-off-by: Matti Gottlieb <matti.gottlieb@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
index 594cd0dc7df937d8b495f9c2864de13ed51f795d..ebbadcf41ea051cb1b927901a68e281138988a73 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
@@ -410,7 +410,9 @@ static int iwl_trans_get_paging_item(struct iwl_mvm *mvm)
                goto exit;
        }
 
-       mvm->trans->paging_download_buf = kzalloc(MAX_PAGING_IMAGE_SIZE,
+       /* Add an extra page for headers */
+       mvm->trans->paging_download_buf = kzalloc(PAGING_BLOCK_SIZE +
+                                                 FW_PAGING_SIZE,
                                                  GFP_KERNEL);
        if (!mvm->trans->paging_download_buf) {
                ret = -ENOMEM;