1 files changed, 100 insertions, 0 deletions

diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.17/0128-PM-Hibernate-fix-the-number-of-pages-used-for-hibern.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.17/0128-PM-Hibernate-fix-the-number-of-pages-used-for-hibern.patch
new file mode 100644
index 00000000..913b4738
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.17/0128-PM-Hibernate-fix-the-number-of-pages-used-for-hibern.patch
@@ -0,0 +1,100 @@
+From a33123cb0368231d84b8839f9f56bee45c51016d Mon Sep 17 00:00:00 2001
+From: Bojan Smojver <bojan@rexursive.com>
+Date: Tue, 24 Apr 2012 23:53:28 +0200
+Subject: [PATCH 128/165] PM / Hibernate: fix the number of pages used for
+ hibernate/thaw buffering
+
+commit f8262d476823a7ea1eb497ff9676d1eab2393c75 upstream.
+
+Hibernation regression fix, since 3.2.
+
+Calculate the number of required free pages based on non-high memory
+pages only, because that is where the buffers will come from.
+
+Commit 081a9d043c983f161b78fdc4671324d1342b86bc introduced a new buffer
+page allocation logic during hibernation, in order to improve the
+performance. The amount of pages allocated was calculated based on total
+amount of pages available, although only non-high memory pages are
+usable for this purpose. This caused hibernation code to attempt to over
+allocate pages on platforms that have high memory, which led to hangs.
+
+Signed-off-by: Bojan Smojver <bojan@rexursive.com>
+Signed-off-by: Rafael J. Wysocki <rjw@suse.de>
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+---
+ kernel/power/swap.c |   28 ++++++++++++++++++++++------
+ 1 files changed, 22 insertions(+), 6 deletions(-)
+
+diff --git a/kernel/power/swap.c b/kernel/power/swap.c
+index 11a594c..b313086 100644
+--- a/kernel/power/swap.c
++++ b/kernel/power/swap.c
+@@ -52,6 +52,23 @@
+ 
+ #define MAP_PAGE_ENTRIES       (PAGE_SIZE / sizeof(sector_t) - 1)
+ 
++/*
++ * Number of free pages that are not high.
++ */
++static inline unsigned long low_free_pages(void)
++{
++       return nr_free_pages() - nr_free_highpages();
++}
++
++/*
++ * Number of pages required to be kept free while writing the image. Always
++ * half of all available low pages before the writing starts.
++ */
++static inline unsigned long reqd_free_pages(void)
++{
++       return low_free_pages() / 2;
++}
++
+ struct swap_map_page {
+        sector_t entries[MAP_PAGE_ENTRIES];
+        sector_t next_swap;
+@@ -73,7 +90,7 @@ struct swap_map_handle {
+        sector_t cur_swap;
+        sector_t first_sector;
+        unsigned int k;
+-       unsigned long nr_free_pages, written;
++       unsigned long reqd_free_pages;
+        u32 crc32;
+ };
+ 
+@@ -317,8 +334,7 @@ static int get_swap_writer(struct swap_map_handle *handle)
+                goto err_rel;
+        }
+        handle->k = 0;
+-       handle->nr_free_pages = nr_free_pages() >> 1;
+-       handle->written = 0;
++       handle->reqd_free_pages = reqd_free_pages();
+        handle->first_sector = handle->cur_swap;
+        return 0;
+ err_rel:
+@@ -353,11 +369,11 @@ static int swap_write_page(struct swap_map_handle *handle, void *buf,
+                handle->cur_swap = offset;
+                handle->k = 0;
+        }
+-       if (bio_chain && ++handle->written > handle->nr_free_pages) {
++       if (bio_chain && low_free_pages() <= handle->reqd_free_pages) {
+                error = hib_wait_on_bio_chain(bio_chain);
+                if (error)
+                        goto out;
+-               handle->written = 0;
++               handle->reqd_free_pages = reqd_free_pages();
+        }
+  out:
+        return error;
+@@ -619,7 +635,7 @@ static int save_image_lzo(struct swap_map_handle *handle,
+         * Adjust number of free pages after all allocations have been done.
+         * We don't want to run out of pages when writing.
+         */
+-       handle->nr_free_pages = nr_free_pages() >> 1;
++       handle->reqd_free_pages = reqd_free_pages();
+ 
+        /*
+         * Start the CRC32 thread.
+-- 
+1.7.7.6
+