iwlwifi: load firmware in chunks

Instead of allocating one big chunk of DMA-coherent
memory for the firmware and keeping it around, only
vmalloc() the firmware and copy it into a single
page of DMA-coherent memory for the upload.

The advantage is that we don't need DMA memory for
the firmware image that is stored while the driver
is operating, we only need it while uploading.

This will make it easier for the driver to work if
the system has fragmented memory.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

1 files changed, 14 insertions, 12 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwlwifi/iwl-drv.c
index 48d6d44c16d0..198634b75ed0 100644
--- a/drivers/net/wireless/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/iwlwifi/iwl-drv.c
@@ -64,6 +64,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/firmware.h>
 #include <linux/module.h>
+#include <linux/vmalloc.h>
 
 #include "iwl-drv.h"
 #include "iwl-debug.h"
@@ -164,10 +165,8 @@ struct fw_sec {
 
 static void iwl_free_fw_desc(struct iwl_drv *drv, struct fw_desc *desc)
 {
-        if (desc->v_addr)
-                dma_free_coherent(drv->trans->dev, desc->len,
-                                  desc->v_addr, desc->p_addr);
-        desc->v_addr = NULL;
+        vfree(desc->data);
+        desc->data = NULL;
         desc->len = 0;
 }
 
@@ -186,21 +185,24 @@ static void iwl_dealloc_ucode(struct iwl_drv *drv)
 }
 
 static int iwl_alloc_fw_desc(struct iwl_drv *drv, struct fw_desc *desc,
-                      struct fw_sec *sec)
+                             struct fw_sec *sec)
 {
-        if (!sec || !sec->size) {
-                desc->v_addr = NULL;
+        void *data;
+
+        desc->data = NULL;
+
+        if (!sec || !sec->size)
                 return -EINVAL;
-        }
 
-        desc->v_addr = dma_alloc_coherent(drv->trans->dev, sec->size,
-                                          &desc->p_addr, GFP_KERNEL);
-        if (!desc->v_addr)
+        data = vmalloc(sec->size);
+        if (!data)
                 return -ENOMEM;
 
         desc->len = sec->size;
         desc->offset = sec->offset;
-        memcpy(desc->v_addr, sec->data, sec->size);
+        memcpy(data, sec->data, desc->len);
+        desc->data = data;
+
         return 0;
 }