Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-14 09:25:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

x86: Add find_fw_memmap_area

Browse Source 
... so we can move early_res up.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
LKML-Reference: <1265793639-15071-27-git-send-email-yinghai@kernel.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
Yinghai Lu 2010-02-10 01:20:30 -08:00 committed by H. Peter Anvin
parent 9b3be9f992
commit dd645cee7b
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/include/asm/early_res.h
View File

@ -12,6 +12,7 @@ u64 find_early_area(u64 ei_start, u64 ei_last, u64 start, u64 end,
u64 size, u64 align); u64 size, u64 align);
u64 find_early_area_size(u64 ei_start, u64 ei_last, u64 start, u64 find_early_area_size(u64 ei_start, u64 ei_last, u64 start,
u64 *sizep, u64 align); u64 *sizep, u64 align);
u64 find_fw_memmap_area(u64 start, u64 end, u64 size, u64 align);
#include <linux/range.h> #include <linux/range.h>
int get_free_all_memory_range(struct range **rangep, int nodeid); int get_free_all_memory_range(struct range **rangep, int nodeid);

4
arch/x86/kernel/e820.c
View File

@ -748,6 +748,10 @@ u64 __init find_e820_area(u64 start, u64 end, u64 size, u64 align)
return -1ULL; return -1ULL;
} }
u64 __init find_fw_memmap_area(u64 start, u64 end, u64 size, u64 align)
{
return find_e820_area(start, end, size, align);
}
/* /*
* Find next free range after *start * Find next free range after *start
*/ */

17
arch/x86/kernel/early_res.c
View File

@ -7,16 +7,14 @@
#include <linux/bootmem.h> #include <linux/bootmem.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <asm/e820.h>
#include <asm/early_res.h> #include <asm/early_res.h>
#include <asm/proto.h>
/* /*
* Early reserved memory areas. * Early reserved memory areas.
*/ */
/* /*
* need to make sure this one is bigger enough before * need to make sure this one is bigger enough before
* find_e820_area could be used * find_fw_memmap_area could be used
*/ */
#define MAX_EARLY_RES_X 32 #define MAX_EARLY_RES_X 32
@ -180,6 +178,13 @@ void __init reserve_early_overlap_ok(u64 start, u64 end, char *name)
__reserve_early(start, end, name, 1); __reserve_early(start, end, name, 1);
} }
u64 __init __weak find_fw_memmap_area(u64 start, u64 end, u64 size, u64 align)
{
panic("should have find_fw_memmap_area defined with arch");
return -1ULL;
}
static void __init __check_and_double_early_res(u64 ex_start, u64 ex_end) static void __init __check_and_double_early_res(u64 ex_start, u64 ex_end)
{ {
u64 start, end, size, mem; u64 start, end, size, mem;
@ -198,13 +203,13 @@ static void __init __check_and_double_early_res(u64 ex_start, u64 ex_end)
start = early_res[0].end; start = early_res[0].end;
end = ex_start; end = ex_start;
if (start + size < end) if (start + size < end)
mem = find_e820_area(start, end, size, mem = find_fw_memmap_area(start, end, size,
sizeof(struct early_res)); sizeof(struct early_res));
if (mem == -1ULL) { if (mem == -1ULL) {
start = ex_end; start = ex_end;
end = max_pfn_mapped << PAGE_SHIFT; end = max_pfn_mapped << PAGE_SHIFT;
if (start + size < end) if (start + size < end)
mem = find_e820_area(start, end, size, mem = find_fw_memmap_area(start, end, size,
sizeof(struct early_res)); sizeof(struct early_res));
} }
if (mem == -1ULL) if (mem == -1ULL)
@ -343,7 +348,7 @@ int __init get_free_all_memory_range(struct range **rangep, int nodeid)
start = MAX_DMA32_PFN << PAGE_SHIFT; start = MAX_DMA32_PFN << PAGE_SHIFT;
#endif #endif
end = max_pfn_mapped << PAGE_SHIFT; end = max_pfn_mapped << PAGE_SHIFT;
mem = find_e820_area(start, end, size, sizeof(struct range)); mem = find_fw_memmap_area(start, end, size, sizeof(struct range));
if (mem == -1ULL) if (mem == -1ULL)
panic("can not find more space for range free"); panic("can not find more space for range free");