Commit 22ddfcaa authored by Yinghai Lu's avatar Yinghai Lu Committed by H. Peter Anvin
Browse files

x86, mm: Move init_memory_mapping calling out of setup.c 



Now init_memory_mapping is called two times, later will be called for every
ram ranges.

Could put all related init_mem calling together and out of setup.c.

Actually, it reverts commit 1bbbbe77
    x86: Exclude E820_RESERVED regions and memory holes above 4 GB from direct mapping.
will address that later with complete solution include handling hole under 4g.

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Link: http://lkml.kernel.org/r/1353123563-3103-5-git-send-email-yinghai@kernel.org


Reviewed-by: default avatarPekka Enberg <penberg@kernel.org>
Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 2086fe11

arch/x86/include/asm/init.h

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ kernel_physical_mapping_init(unsigned long start, 
			     unsigned long end,

			     unsigned long page_size_mask);





extern unsigned long __initdata pgt_buf_start;

extern unsigned long __meminitdata pgt_buf_end;

extern unsigned long __meminitdata pgt_buf_top;

arch/x86/include/asm/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -602,7 +602,7 @@ static inline int pgd_none(pgd_t pgd) 
#ifndef __ASSEMBLY__



extern int direct_gbpages;

void probe_page_size_mask(void);

void init_mem_mapping(void);



/* local pte updates need not use xchg for locking */

static inline pte_t native_local_ptep_get_and_clear(pte_t *ptep)

arch/x86/kernel/setup.c

+1 −26
Original line number Diff line number Diff line
@@ -913,34 +913,9 @@ void __init setup_arch(char **cmdline_p) 
	setup_real_mode();



	init_gbpages();

	probe_page_size_mask();



	/* max_pfn_mapped is updated here */

	max_low_pfn_mapped = init_memory_mapping(0, max_low_pfn<<PAGE_SHIFT);

	max_pfn_mapped = max_low_pfn_mapped;

	init_mem_mapping();



#ifdef CONFIG_X86_64

	if (max_pfn > max_low_pfn) {

		int i;

		unsigned long start, end;

		unsigned long start_pfn, end_pfn;



		for_each_mem_pfn_range(i, MAX_NUMNODES, &start_pfn, &end_pfn,

							 NULL) {



			end = PFN_PHYS(end_pfn);

			if (end <= (1UL<<32))

				continue;



			start = PFN_PHYS(start_pfn);

			max_pfn_mapped = init_memory_mapping(

						max((1UL<<32), start), end);

		}



		/* can we preseve max_low_pfn ?*/

		max_low_pfn = max_pfn;

	}

#endif

	memblock.current_limit = get_max_mapped();

	dma_contiguous_reserve(0);

arch/x86/mm/init.c

+18 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ struct map_range { 


static int page_size_mask;



void probe_page_size_mask(void)

static void __init probe_page_size_mask(void)

{

#if !defined(CONFIG_DEBUG_PAGEALLOC) && !defined(CONFIG_KMEMCHECK)

	/*
@@ -315,6 +315,23 @@ unsigned long __init_refok init_memory_mapping(unsigned long start, 
	return ret >> PAGE_SHIFT;

}



void __init init_mem_mapping(void)

{

	probe_page_size_mask();



	/* max_pfn_mapped is updated here */

	max_low_pfn_mapped = init_memory_mapping(0, max_low_pfn<<PAGE_SHIFT);

	max_pfn_mapped = max_low_pfn_mapped;



#ifdef CONFIG_X86_64

	if (max_pfn > max_low_pfn) {

		max_pfn_mapped = init_memory_mapping(1UL<<32,

						     max_pfn<<PAGE_SHIFT);

		/* can we preseve max_low_pfn ?*/

		max_low_pfn = max_pfn;

	}

#endif

}



/*

 * devmem_is_allowed() checks to see if /dev/mem access to a certain address

CRA Git | Maintained and supported by SUSTech CRA and CCSE