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

Commit bf62f398 authored by Yinghai Lu's avatar Yinghai Lu Committed by Thomas Gleixner
Browse files

x86: move e820_mark_nosave_regions to e820.c 



and make e820_mark_nosave_regions to take limit_pfn to use max_low_pfn
for 32bit and end_pfn for 64bit

Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent aafbdf71

arch/x86/kernel/e820.c

+32 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/module.h>

#include <linux/mm.h>

#include <linux/pfn.h>

#include <linux/suspend.h>



#include <asm/pgtable.h>

#include <asm/page.h>
@@ -495,6 +496,37 @@ __init void e820_setup_gap(void) 
	       pci_mem_start, gapstart, gapsize);

}



#if defined(CONFIG_X86_64) || \

	(defined(CONFIG_X86_32) && defined(CONFIG_HIBERNATION))

/**

 * Find the ranges of physical addresses that do not correspond to

 * e820 RAM areas and mark the corresponding pages as nosave for

 * hibernation (32 bit) or software suspend and suspend to RAM (64 bit).

 *

 * This function requires the e820 map to be sorted and without any

 * overlapping entries and assumes the first e820 area to be RAM.

 */

void __init e820_mark_nosave_regions(unsigned long limit_pfn)

{

	int i;

	unsigned long pfn;



	pfn = PFN_DOWN(e820.map[0].addr + e820.map[0].size);

	for (i = 1; i < e820.nr_map; i++) {

		struct e820entry *ei = &e820.map[i];



		if (pfn < PFN_UP(ei->addr))

			register_nosave_region(pfn, PFN_UP(ei->addr));



		pfn = PFN_DOWN(ei->addr + ei->size);

		if (ei->type != E820_RAM)

			register_nosave_region(PFN_UP(ei->addr), pfn);



		if (pfn >= limit_pfn)

			break;

	}

}

#endif



/*

 * Early reserved memory areas.

arch/x86/kernel/e820_32.c

+0 −32
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
#include <linux/mm.h>

#include <linux/pfn.h>

#include <linux/uaccess.h>

#include <linux/suspend.h>



#include <asm/pgtable.h>

#include <asm/page.h>
@@ -208,37 +207,6 @@ void __init init_iomem_resources(struct resource *code_resource, 
	}

}



#if defined(CONFIG_PM) && defined(CONFIG_HIBERNATION)

/**

 * e820_mark_nosave_regions - Find the ranges of physical addresses that do not

 * correspond to e820 RAM areas and mark the corresponding pages as nosave for

 * hibernation.

 *

 * This function requires the e820 map to be sorted and without any

 * overlapping entries and assumes the first e820 area to be RAM.

 */

void __init e820_mark_nosave_regions(void)

{

	int i;

	unsigned long pfn;



	pfn = PFN_DOWN(e820.map[0].addr + e820.map[0].size);

	for (i = 1; i < e820.nr_map; i++) {

		struct e820entry *ei = &e820.map[i];



		if (pfn < PFN_UP(ei->addr))

			register_nosave_region(pfn, PFN_UP(ei->addr));



		pfn = PFN_DOWN(ei->addr + ei->size);

		if (ei->type != E820_RAM)

			register_nosave_region(PFN_UP(ei->addr), pfn);



		if (pfn >= max_low_pfn)

			break;

	}

}

#endif



/*

 * Find the highest page frame number we have available

 */

arch/x86/kernel/e820_64.c

+0 −32
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include <linux/kexec.h>

#include <linux/module.h>

#include <linux/mm.h>

#include <linux/suspend.h>

#include <linux/pfn.h>

#include <linux/pci.h>
@@ -93,37 +92,6 @@ void __init e820_reserve_resources(void) 
	}

}



/*

 * Find the ranges of physical addresses that do not correspond to

 * e820 RAM areas and mark the corresponding pages as nosave for software

 * suspend and suspend to RAM.

 *

 * This function requires the e820 map to be sorted and without any

 * overlapping entries and assumes the first e820 area to be RAM.

 */

void __init e820_mark_nosave_regions(void)

{

	int i;

	unsigned long paddr;



	paddr = round_down(e820.map[0].addr + e820.map[0].size, PAGE_SIZE);

	for (i = 1; i < e820.nr_map; i++) {

		struct e820entry *ei = &e820.map[i];



		if (paddr < ei->addr)

			register_nosave_region(PFN_DOWN(paddr),

						PFN_UP(ei->addr));



		paddr = round_down(ei->addr + ei->size, PAGE_SIZE);

		if (ei->type != E820_RAM)

			register_nosave_region(PFN_UP(ei->addr),

						PFN_DOWN(paddr));



		if (paddr >= (end_pfn << PAGE_SHIFT))

			break;

	}

}



/*

 * Finds an active region in the address range from start_pfn to last_pfn and

 * returns its range in ei_startpfn and ei_endpfn for the e820 entry.

arch/x86/kernel/setup_32.c

+1 −1
Original line number Diff line number Diff line
@@ -820,7 +820,7 @@ void __init setup_arch(char **cmdline_p) 
#endif



	e820_setup_gap();

	e820_mark_nosave_regions();

	e820_mark_nosave_regions(max_low_pfn);



#ifdef CONFIG_VT

#if defined(CONFIG_VGA_CONSOLE)

arch/x86/kernel/setup_64.c

+1 −1
Original line number Diff line number Diff line
@@ -516,7 +516,7 @@ void __init setup_arch(char **cmdline_p) 
	 * We trust e820 completely. No explicit ROM probing in memory.

	 */

	e820_reserve_resources();

	e820_mark_nosave_regions();

	e820_mark_nosave_regions(end_pfn);



	/* request I/O space for devices used on all i[345]86 PCs */

	for (i = 0; i < ARRAY_SIZE(standard_io_resources); i++)