Merge branch 'stable/128gb.v5.1' into stable/for-linus-3.7

[~andy/linux] / arch / x86 / xen / setup.c

diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
index 740517be4da528efeea9c64fa19cb618d926e8f4..3edb320d508f83dee738dd08e3fe539438f08f07 100644 (file)
--- a/arch/x86/xen/setup.c
+++ b/arch/x86/xen/setup.c
@@ -78,9 +78,16 @@ static void __init xen_add_extra_mem(u64 start, u64 size)
        memblock_reserve(start, size);
 
        xen_max_p2m_pfn = PFN_DOWN(start + size);
+       for (pfn = PFN_DOWN(start); pfn < xen_max_p2m_pfn; pfn++) {
+               unsigned long mfn = pfn_to_mfn(pfn);
+
+               if (WARN(mfn == pfn, "Trying to over-write 1-1 mapping (pfn: %lx)\n", pfn))
+                       continue;
+               WARN(mfn != INVALID_P2M_ENTRY, "Trying to remove %lx which has %lx mfn!\n",
+                       pfn, mfn);
 
-       for (pfn = PFN_DOWN(start); pfn <= xen_max_p2m_pfn; pfn++)
                __set_phys_to_machine(pfn, INVALID_P2M_ENTRY);
+       }
 }
 
 static unsigned long __init xen_do_chunk(unsigned long start,
@@ -157,25 +164,24 @@ static unsigned long __init xen_populate_chunk(
        unsigned long dest_pfn;
 
        for (i = 0, entry = list; i < map_size; i++, entry++) {
-               unsigned long credits = credits_left;
                unsigned long s_pfn;
                unsigned long e_pfn;
                unsigned long pfns;
                long capacity;
 
-               if (credits <= 0)
+               if (credits_left <= 0)
                        break;
 
                if (entry->type != E820_RAM)
                        continue;
 
-               e_pfn = PFN_UP(entry->addr + entry->size);
+               e_pfn = PFN_DOWN(entry->addr + entry->size);
 
                /* We only care about E820 after the xen_start_info->nr_pages */
                if (e_pfn <= max_pfn)
                        continue;
 
-               s_pfn = PFN_DOWN(entry->addr);
+               s_pfn = PFN_UP(entry->addr);
                /* If the E820 falls within the nr_pages, we want to start
                 * at the nr_pages PFN.
                 * If that would mean going past the E820 entry, skip it
@@ -184,23 +190,19 @@ static unsigned long __init xen_populate_chunk(
                        capacity = e_pfn - max_pfn;
                        dest_pfn = max_pfn;
                } else {
-                       /* last_pfn MUST be within E820_RAM regions */
-                       if (*last_pfn && e_pfn >= *last_pfn)
-                               s_pfn = *last_pfn;
                        capacity = e_pfn - s_pfn;
                        dest_pfn = s_pfn;
                }
-               /* If we had filled this E820_RAM entry, go to the next one. */
-               if (capacity <= 0)
-                       continue;
 
-               if (credits > capacity)
-                       credits = capacity;
+               if (credits_left < capacity)
+                       capacity = credits_left;
 
-               pfns = xen_do_chunk(dest_pfn, dest_pfn + credits, false);
+               pfns = xen_do_chunk(dest_pfn, dest_pfn + capacity, false);
                done += pfns;
-               credits_left -= pfns;
                *last_pfn = (dest_pfn + pfns);
+               if (pfns < capacity)
+                       break;
+               credits_left -= pfns;
        }
        return done;
 }