Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/base/firmware_class.c

+4 −5
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ static void __fw_free_buf(struct kref *ref) 
		vunmap(buf->data);

		for (i = 0; i < buf->nr_pages; i++)

			__free_page(buf->pages[i]);

		kfree(buf->pages);

		vfree(buf->pages);

	} else

#endif

		vfree(buf->data);
@@ -660,7 +660,7 @@ static ssize_t firmware_loading_store(struct device *dev, 
		if (!test_bit(FW_STATUS_DONE, &fw_buf->status)) {

			for (i = 0; i < fw_buf->nr_pages; i++)

				__free_page(fw_buf->pages[i]);

			kfree(fw_buf->pages);

			vfree(fw_buf->pages);

			fw_buf->pages = NULL;

			fw_buf->page_array_size = 0;

			fw_buf->nr_pages = 0;
@@ -770,8 +770,7 @@ static int fw_realloc_buffer(struct firmware_priv *fw_priv, int min_size) 
					 buf->page_array_size * 2);

		struct page **new_pages;



		new_pages = kmalloc(new_array_size * sizeof(void *),

				    GFP_KERNEL);

		new_pages = vmalloc(new_array_size * sizeof(void *));

		if (!new_pages) {

			fw_load_abort(fw_priv);

			return -ENOMEM;
@@ -780,7 +779,7 @@ static int fw_realloc_buffer(struct firmware_priv *fw_priv, int min_size) 
		       buf->page_array_size * sizeof(void *));

		memset(&new_pages[buf->page_array_size], 0, sizeof(void *) *

		       (new_array_size - buf->page_array_size));

		kfree(buf->pages);

		vfree(buf->pages);

		buf->pages = new_pages;

		buf->page_array_size = new_array_size;

	}