Commit 10a3fbf1 authored by Chen Feng's avatar Chen Feng Committed by Greg Kroah-Hartman

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: default avatarChen Feng <puck.chen@hisilicon.com>
Signed-off-by: default avatarXia Qing <saberlily.xia@hisilicon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6a4f555a
...@@ -257,7 +257,7 @@ static void __fw_free_buf(struct kref *ref) ...@@ -257,7 +257,7 @@ static void __fw_free_buf(struct kref *ref)
vunmap(buf->data); vunmap(buf->data);
for (i = 0; i < buf->nr_pages; i++) for (i = 0; i < buf->nr_pages; i++)
__free_page(buf->pages[i]); __free_page(buf->pages[i]);
kfree(buf->pages); vfree(buf->pages);
} else } else
#endif #endif
vfree(buf->data); vfree(buf->data);
...@@ -660,7 +660,7 @@ static ssize_t firmware_loading_store(struct device *dev, ...@@ -660,7 +660,7 @@ static ssize_t firmware_loading_store(struct device *dev,
if (!test_bit(FW_STATUS_DONE, &fw_buf->status)) { if (!test_bit(FW_STATUS_DONE, &fw_buf->status)) {
for (i = 0; i < fw_buf->nr_pages; i++) for (i = 0; i < fw_buf->nr_pages; i++)
__free_page(fw_buf->pages[i]); __free_page(fw_buf->pages[i]);
kfree(fw_buf->pages); vfree(fw_buf->pages);
fw_buf->pages = NULL; fw_buf->pages = NULL;
fw_buf->page_array_size = 0; fw_buf->page_array_size = 0;
fw_buf->nr_pages = 0; fw_buf->nr_pages = 0;
...@@ -770,8 +770,7 @@ static int fw_realloc_buffer(struct firmware_priv *fw_priv, int min_size) ...@@ -770,8 +770,7 @@ static int fw_realloc_buffer(struct firmware_priv *fw_priv, int min_size)
buf->page_array_size * 2); buf->page_array_size * 2);
struct page **new_pages; struct page **new_pages;
new_pages = kmalloc(new_array_size * sizeof(void *), new_pages = vmalloc(new_array_size * sizeof(void *));
GFP_KERNEL);
if (!new_pages) { if (!new_pages) {
fw_load_abort(fw_priv); fw_load_abort(fw_priv);
return -ENOMEM; return -ENOMEM;
...@@ -780,7 +779,7 @@ static int fw_realloc_buffer(struct firmware_priv *fw_priv, int min_size) ...@@ -780,7 +779,7 @@ static int fw_realloc_buffer(struct firmware_priv *fw_priv, int min_size)
buf->page_array_size * sizeof(void *)); buf->page_array_size * sizeof(void *));
memset(&new_pages[buf->page_array_size], 0, sizeof(void *) * memset(&new_pages[buf->page_array_size], 0, sizeof(void *) *
(new_array_size - buf->page_array_size)); (new_array_size - buf->page_array_size));
kfree(buf->pages); vfree(buf->pages);
buf->pages = new_pages; buf->pages = new_pages;
buf->page_array_size = new_array_size; buf->page_array_size = new_array_size;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment