aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base/firmware_class.c
diff options
context:
space:
mode:
authorChen Feng <puck.chen@hisilicon.com>2015-12-16 04:03:15 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-02-08 18:01:31 -0500
commit10a3fbf18d99caeeecd2b28445d9104deab11ed7 (patch)
tree1e2ae785d4b2b11436a70bc9e739fb6d6723ffb5 /drivers/base/firmware_class.c
parent6a4f555aa1990ec80e8cdc92719f1349792363db (diff)
firmware: Change the page arrary alloc to vmalloc
No need to use use continuous memory, it may be fail when memory deeply fragmented. Signed-off-by: Chen Feng <puck.chen@hisilicon.com> Signed-off-by: Xia Qing <saberlily.xia@hisilicon.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base/firmware_class.c')
-rw-r--r--drivers/base/firmware_class.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index ce88355eb128..a7f4aa3f6b32 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -257,7 +257,7 @@ static void __fw_free_buf(struct kref *ref)
257 vunmap(buf->data); 257 vunmap(buf->data);
258 for (i = 0; i < buf->nr_pages; i++) 258 for (i = 0; i < buf->nr_pages; i++)
259 __free_page(buf->pages[i]); 259 __free_page(buf->pages[i]);
260 kfree(buf->pages); 260 vfree(buf->pages);
261 } else 261 } else
262#endif 262#endif
263 vfree(buf->data); 263 vfree(buf->data);
@@ -660,7 +660,7 @@ static ssize_t firmware_loading_store(struct device *dev,
660 if (!test_bit(FW_STATUS_DONE, &fw_buf->status)) { 660 if (!test_bit(FW_STATUS_DONE, &fw_buf->status)) {
661 for (i = 0; i < fw_buf->nr_pages; i++) 661 for (i = 0; i < fw_buf->nr_pages; i++)
662 __free_page(fw_buf->pages[i]); 662 __free_page(fw_buf->pages[i]);
663 kfree(fw_buf->pages); 663 vfree(fw_buf->pages);
664 fw_buf->pages = NULL; 664 fw_buf->pages = NULL;
665 fw_buf->page_array_size = 0; 665 fw_buf->page_array_size = 0;
666 fw_buf->nr_pages = 0; 666 fw_buf->nr_pages = 0;
@@ -770,8 +770,7 @@ static int fw_realloc_buffer(struct firmware_priv *fw_priv, int min_size)
770 buf->page_array_size * 2); 770 buf->page_array_size * 2);
771 struct page **new_pages; 771 struct page **new_pages;
772 772
773 new_pages = kmalloc(new_array_size * sizeof(void *), 773 new_pages = vmalloc(new_array_size * sizeof(void *));
774 GFP_KERNEL);
775 if (!new_pages) { 774 if (!new_pages) {
776 fw_load_abort(fw_priv); 775 fw_load_abort(fw_priv);
777 return -ENOMEM; 776 return -ENOMEM;
@@ -780,7 +779,7 @@ static int fw_realloc_buffer(struct firmware_priv *fw_priv, int min_size)
780 buf->page_array_size * sizeof(void *)); 779 buf->page_array_size * sizeof(void *));
781 memset(&new_pages[buf->page_array_size], 0, sizeof(void *) * 780 memset(&new_pages[buf->page_array_size], 0, sizeof(void *) *
782 (new_array_size - buf->page_array_size)); 781 (new_array_size - buf->page_array_size));
783 kfree(buf->pages); 782 vfree(buf->pages);
784 buf->pages = new_pages; 783 buf->pages = new_pages;
785 buf->page_array_size = new_array_size; 784 buf->page_array_size = new_array_size;
786 } 785 }