leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86: Refactor relocation to prepare for 64-bit

Browse Source 
Move the core relocation code into a separate function so that the checking
code can be used for 64-bit relocation also.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Simon Glass 2017-01-16 07:03:53 -07:00 committed by Bin Meng
parent 6bda55a38c
commit dc7e21339e
1 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
arch/x86/lib/relocate.c
View File

@ -47,38 +47,18 @@ int clear_bss(void)
return 0; return 0;
} }
/* static void do_elf_reloc_fixups32(unsigned int text_base, uintptr_t size,
* This function has more error checking than you might expect. Please see Elf32_Rel *re_src, Elf32_Rel *re_end)
* the commit message for more informaiton.
*/
int do_elf_reloc_fixups(void)
{ {
Elf32_Rel *re_src = (Elf32_Rel *)(&__rel_dyn_start);
Elf32_Rel *re_end = (Elf32_Rel *)(&__rel_dyn_end);
Elf32_Addr *offset_ptr_rom, *last_offset = NULL; Elf32_Addr *offset_ptr_rom, *last_offset = NULL;
Elf32_Addr *offset_ptr_ram; Elf32_Addr *offset_ptr_ram;
unsigned int text_base = 0;
/* The size of the region of u-boot that runs out of RAM. */
uintptr_t size = (uintptr_t)&__bss_end - (uintptr_t)&__text_start;
if (gd->flags & GD_FLG_SKIP_RELOC)
return 0;
if (re_src == re_end)
panic("No relocation data");
#ifdef CONFIG_SYS_TEXT_BASE
text_base = CONFIG_SYS_TEXT_BASE;
#else
panic("No CONFIG_SYS_TEXT_BASE");
#endif
do { do {
/* Get the location from the relocation entry */ /* Get the location from the relocation entry */
offset_ptr_rom = (Elf32_Addr *)re_src->r_offset; offset_ptr_rom = (Elf32_Addr *)(uintptr_t)re_src->r_offset;
/* Check that the location of the relocation is in .text */ /* Check that the location of the relocation is in .text */
if (offset_ptr_rom >= (Elf32_Addr *)text_base && if (offset_ptr_rom >= (Elf32_Addr *)(uintptr_t)text_base &&
offset_ptr_rom > last_offset) { offset_ptr_rom > last_offset) {
/* Switch to the in-RAM version */ /* Switch to the in-RAM version */
@ -103,6 +83,33 @@ int do_elf_reloc_fixups(void)
last_offset = offset_ptr_rom; last_offset = offset_ptr_rom;
} while (++re_src < re_end); } while (++re_src < re_end);
}
/*
* This function has more error checking than you might expect. Please see
* this commit message for more information:
* 62f7970a x86: Add error checking to x86 relocation code
*/
int do_elf_reloc_fixups(void)
{
void *re_src = (void *)(&__rel_dyn_start);
void *re_end = (void *)(&__rel_dyn_end);
uint text_base;
/* The size of the region of u-boot that runs out of RAM. */
uintptr_t size = (uintptr_t)&__bss_end - (uintptr_t)&__text_start;
if (gd->flags & GD_FLG_SKIP_RELOC)
return 0;
if (re_src == re_end)
panic("No relocation data");
#ifdef CONFIG_SYS_TEXT_BASE
text_base = CONFIG_SYS_TEXT_BASE;
#else
panic("No CONFIG_SYS_TEXT_BASE");
#endif
do_elf_reloc_fixups32(text_base, size, re_src, re_end);
return 0; return 0;
} }