mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-09-21 23:21:58 +00:00
x86: Override calculate_relocation_address to use the e820 map
Because calculate_relocation_address now uses the e820 map, it will be able to avoid addresses over 32 bits and regions that are at high addresses but not big enough for U-Boot. It also means we can remove the hack which limitted U-Boot's idea of the size of memory to less than 4GB. Also take into account the space needed for the heap and stack, so we avoid picking a very small region those areas might overlap with something it shouldn't. Signed-off-by: Gabe Black <gabeblack@chromium.org> Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
d65297b64d
commit
112a575e49
2 changed files with 56 additions and 7 deletions
|
@ -27,8 +27,9 @@
|
||||||
#include <asm/e820.h>
|
#include <asm/e820.h>
|
||||||
#include <asm/u-boot-x86.h>
|
#include <asm/u-boot-x86.h>
|
||||||
#include <asm/global_data.h>
|
#include <asm/global_data.h>
|
||||||
#include <asm/arch-coreboot/sysinfo.h>
|
#include <asm/processor.h>
|
||||||
#include <asm/arch-coreboot/tables.h>
|
#include <asm/arch/sysinfo.h>
|
||||||
|
#include <asm/arch/tables.h>
|
||||||
|
|
||||||
DECLARE_GLOBAL_DATA_PTR;
|
DECLARE_GLOBAL_DATA_PTR;
|
||||||
|
|
||||||
|
@ -51,6 +52,58 @@ unsigned install_e820_map(unsigned max_entries, struct e820entry *entries)
|
||||||
return num_entries;
|
return num_entries;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This function looks for the highest region of memory lower than 4GB which
|
||||||
|
* has enough space for U-Boot where U-Boot is aligned on a page boundary. It
|
||||||
|
* overrides the default implementation found elsewhere which simply picks the
|
||||||
|
* end of ram, wherever that may be. The location of the stack, the relocation
|
||||||
|
* address, and how far U-Boot is moved by relocation are set in the global
|
||||||
|
* data structure.
|
||||||
|
*/
|
||||||
|
int calculate_relocation_address(void)
|
||||||
|
{
|
||||||
|
const uint64_t uboot_size = (uintptr_t)&__bss_end -
|
||||||
|
(uintptr_t)&__text_start;
|
||||||
|
const uint64_t total_size = uboot_size + CONFIG_SYS_MALLOC_LEN +
|
||||||
|
CONFIG_SYS_STACK_SIZE;
|
||||||
|
uintptr_t dest_addr = 0;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
for (i = 0; i < lib_sysinfo.n_memranges; i++) {
|
||||||
|
struct memrange *memrange = &lib_sysinfo.memrange[i];
|
||||||
|
/* Force U-Boot to relocate to a page aligned address. */
|
||||||
|
uint64_t start = roundup(memrange->base, 1 << 12);
|
||||||
|
uint64_t end = memrange->base + memrange->size;
|
||||||
|
|
||||||
|
/* Ignore non-memory regions. */
|
||||||
|
if (memrange->type != CB_MEM_RAM)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
/* Filter memory over 4GB. */
|
||||||
|
if (end > 0xffffffffULL)
|
||||||
|
end = 0x100000000ULL;
|
||||||
|
/* Skip this region if it's too small. */
|
||||||
|
if (end - start < total_size)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
/* Use this address if it's the largest so far. */
|
||||||
|
if (end - uboot_size > dest_addr)
|
||||||
|
dest_addr = end;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* If no suitable area was found, return an error. */
|
||||||
|
if (!dest_addr)
|
||||||
|
return 1;
|
||||||
|
|
||||||
|
dest_addr -= uboot_size;
|
||||||
|
dest_addr &= ~((1 << 12) - 1);
|
||||||
|
gd->relocaddr = dest_addr;
|
||||||
|
gd->reloc_off = dest_addr - (uintptr_t)&__text_start;
|
||||||
|
gd->start_addr_sp = dest_addr - CONFIG_SYS_MALLOC_LEN;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
int dram_init_f(void)
|
int dram_init_f(void)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
@ -60,10 +113,6 @@ int dram_init_f(void)
|
||||||
struct memrange *memrange = &lib_sysinfo.memrange[i];
|
struct memrange *memrange = &lib_sysinfo.memrange[i];
|
||||||
unsigned long long end = memrange->base + memrange->size;
|
unsigned long long end = memrange->base + memrange->size;
|
||||||
|
|
||||||
/* Ignore memory over 4GB, we can't use it. */
|
|
||||||
if (memrange->base > 0xffffffff)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
if (memrange->type == CB_MEM_RAM && end > ram_size)
|
if (memrange->type == CB_MEM_RAM && end > ram_size)
|
||||||
ram_size = end;
|
ram_size = end;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1100,7 +1100,7 @@ gr_cpci_ax2000 sparc leon3 - gaisler
|
||||||
gr_ep2s60 sparc leon3 - gaisler
|
gr_ep2s60 sparc leon3 - gaisler
|
||||||
grsim sparc leon3 - gaisler
|
grsim sparc leon3 - gaisler
|
||||||
gr_xc3s_1500 sparc leon3 - gaisler
|
gr_xc3s_1500 sparc leon3 - gaisler
|
||||||
coreboot-x86 x86 x86 coreboot chromebook-x86 coreboot coreboot:SYS_TEXT_BASE=0xFC0000
|
coreboot-x86 x86 x86 coreboot chromebook-x86 coreboot coreboot:SYS_TEXT_BASE=0x01110000
|
||||||
eNET x86 x86 eNET - sc520 eNET:SYS_TEXT_BASE=0x38040000
|
eNET x86 x86 eNET - sc520 eNET:SYS_TEXT_BASE=0x38040000
|
||||||
eNET_SRAM x86 x86 eNET - sc520 eNET:SYS_TEXT_BASE=0x19000000
|
eNET_SRAM x86 x86 eNET - sc520 eNET:SYS_TEXT_BASE=0x19000000
|
||||||
# Target ARCH CPU Board name Vendor SoC Options
|
# Target ARCH CPU Board name Vendor SoC Options
|
||||||
|
|
Loading…
Reference in a new issue