x86: Add find_fw_memmap_area
... 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:
parent
9b3be9f992
commit
dd645cee7b
|
@ -12,6 +12,7 @@ u64 find_early_area(u64 ei_start, u64 ei_last, u64 start, u64 end,
|
|||
u64 size, u64 align);
|
||||
u64 find_early_area_size(u64 ei_start, u64 ei_last, u64 start,
|
||||
u64 *sizep, u64 align);
|
||||
u64 find_fw_memmap_area(u64 start, u64 end, u64 size, u64 align);
|
||||
#include <linux/range.h>
|
||||
int get_free_all_memory_range(struct range **rangep, int nodeid);
|
||||
|
||||
|
|
|
@ -748,6 +748,10 @@ u64 __init find_e820_area(u64 start, u64 end, u64 size, u64 align)
|
|||
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
|
||||
*/
|
||||
|
|
|
@ -7,16 +7,14 @@
|
|||
#include <linux/bootmem.h>
|
||||
#include <linux/mm.h>
|
||||
|
||||
#include <asm/e820.h>
|
||||
#include <asm/early_res.h>
|
||||
#include <asm/proto.h>
|
||||
|
||||
/*
|
||||
* Early reserved memory areas.
|
||||
*/
|
||||
/*
|
||||
* 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
|
||||
|
||||
|
@ -180,6 +178,13 @@ void __init reserve_early_overlap_ok(u64 start, u64 end, char *name)
|
|||
__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)
|
||||
{
|
||||
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;
|
||||
end = ex_start;
|
||||
if (start + size < end)
|
||||
mem = find_e820_area(start, end, size,
|
||||
mem = find_fw_memmap_area(start, end, size,
|
||||
sizeof(struct early_res));
|
||||
if (mem == -1ULL) {
|
||||
start = ex_end;
|
||||
end = max_pfn_mapped << PAGE_SHIFT;
|
||||
if (start + size < end)
|
||||
mem = find_e820_area(start, end, size,
|
||||
mem = find_fw_memmap_area(start, end, size,
|
||||
sizeof(struct early_res));
|
||||
}
|
||||
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;
|
||||
#endif
|
||||
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)
|
||||
panic("can not find more space for range free");
|
||||
|
||||
|
|
Loading…
Reference in a new issue