From 1176a7067a89e68bbb1872b234f67bd2f4651051 Mon Sep 17 00:00:00 2001 From: Graeme Russ Date: Tue, 27 Dec 2011 22:46:41 +1100 Subject: x86: Speed up copy-to-RAM and clear BSS operations The implementations of memcpy and memset are now the optimised versions from glibc, so use them instead of simple copy loops -- Changes for v2: - Removed unneeded brackets --- arch/x86/lib/board.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'arch/x86/lib/board.c') diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c index d742fec928..f9eb15bed3 100644 --- a/arch/x86/lib/board.c +++ b/arch/x86/lib/board.c @@ -188,26 +188,19 @@ static int calculate_relocation_address(void) static int copy_uboot_to_ram(void) { - ulong *dst_addr = (ulong *)gd->relocaddr; - ulong *src_addr = (ulong *)&__text_start; - ulong *end_addr = (ulong *)&__data_end; + size_t len = (size_t)&__data_end - (size_t)&__text_start; - while (src_addr < end_addr) - *dst_addr++ = *src_addr++; + memcpy((void *)gd->relocaddr, (void *)&__text_start, len); return 0; } static int clear_bss(void) { - void *bss_start = &__bss_start; - void *bss_end = &__bss_end; + ulong dst_addr = (ulong)&__bss_start + gd->reloc_off; + size_t len = (size_t)&__bss_end - (size_t)&__bss_start; - ulong *dst_addr = (ulong *)(bss_start + gd->reloc_off); - ulong *end_addr = (ulong *)(bss_end + gd->reloc_off); - - while (dst_addr < end_addr) - *dst_addr++ = 0x00000000; + memset((void *)dst_addr, 0x00, len); return 0; } -- cgit From f48dd6fc6cc9fdf15408e98132dc5575a31026cf Mon Sep 17 00:00:00 2001 From: Graeme Russ Date: Sun, 1 Jan 2012 15:06:39 +1100 Subject: x86: Simplify Flash-to-RAM code execution transition Move the relocation offset calculation out of assembler and into C. This also paves the way for the upcoming init sequence simplification by adding the board_init_f_r flash to RAM transitional function -- Changes for v2: - Added commit message - Minor adjustment to new stack address comment --- arch/x86/lib/board.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) (limited to 'arch/x86/lib/board.c') diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c index f9eb15bed3..382ada784b 100644 --- a/arch/x86/lib/board.c +++ b/arch/x86/lib/board.c @@ -253,10 +253,29 @@ void board_init_f(ulong boot_flags) gd->flags |= GD_FLG_RELOC; - /* Enter the relocated U-Boot! */ - relocate_code(gd->start_addr_sp, gd, gd->relocaddr); + /* + * SDRAM is now initialised, U-Boot has been copied into SDRAM, + * the BSS has been cleared etc. The final stack can now be setup + * in SDRAM. Code execution will continue (momentarily) in Flash, + * but with the stack in SDRAM and Global Data in temporary memory + * (CPU cache) + */ + board_init_f_r_trampoline(gd->start_addr_sp); + + /* NOTREACHED - board_init_f_r_trampoline() does not return */ + while (1) + ; +} + +void board_init_f_r(void) +{ + /* + * Transfer execution from Flash to RAM by calculating the address + * of the in-RAM copy of board_init_r() and calling it + */ + (board_init_r + gd->reloc_off)(gd, gd->relocaddr); - /* NOTREACHED - relocate_code() does not return */ + /* NOTREACHED - board_init_r() does not return */ while (1) ; } -- cgit From 240ab5aa2161df500e8950c2a4f392e84324f78a Mon Sep 17 00:00:00 2001 From: Graeme Russ Date: Sun, 1 Jan 2012 15:57:02 +1100 Subject: x86: Rework relocation calculations This commit introduces no functional changes - It simply re-arranges the calculations so that adding to them in future commits will be cleaner -- Changes for v2: - Fixed typo in title - Added commit message --- arch/x86/lib/board.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'arch/x86/lib/board.c') diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c index 382ada784b..6f075b7aa0 100644 --- a/arch/x86/lib/board.c +++ b/arch/x86/lib/board.c @@ -164,24 +164,23 @@ static int calculate_relocation_address(void) ulong text_start = (ulong)&__text_start; ulong bss_end = (ulong)&__bss_end; ulong dest_addr; - ulong rel_offset; - - /* Calculate destination RAM Address and relocation offset */ - dest_addr = gd->ram_size; - dest_addr -= CONFIG_SYS_STACK_SIZE; - dest_addr -= (bss_end - text_start); /* - * Round destination address down to 16-byte boundary to keep - * IDT and GDT 16-byte aligned + * NOTE: All destination address are rounded down to 16-byte + * boundary to satisfy various worst-case alignment + * requirements */ - dest_addr &= ~15; - rel_offset = dest_addr - text_start; + /* Stack is at top of available memory */ + dest_addr = gd->ram_size; + gd->start_addr_sp = dest_addr; - gd->start_addr_sp = gd->ram_size; + /* U-Boot is below the stack */ + dest_addr -= CONFIG_SYS_STACK_SIZE; + dest_addr -= (bss_end - text_start); + dest_addr &= ~15; gd->relocaddr = dest_addr; - gd->reloc_off = rel_offset; + gd->reloc_off = (dest_addr - text_start); return 0; } -- cgit From 9e6c572ff03cda84c88663b23c7157d8b1f275ac Mon Sep 17 00:00:00 2001 From: Graeme Russ Date: Sat, 31 Dec 2011 22:58:15 +1100 Subject: x86: Use fs for global data Use the base address of the 'F' segment as a pointer to the global data structure. By adding the linear address (i.e. the 'D' segment address) as the first word of the global data structure, the address of the global data relative to the 'D' segment can be found simply, for example, by: fs movl 0, %eax This makes the gd 'pointer' writable prior to relocation (by reloading the Global Desctriptor Table) which brings x86 into line with all other arches NOTE: Writing to the gd 'pointer' is expensive (but we only do it twice) but using it to access global data members (read and write) is still fairly cheap -- Changes for v2: - Rebased against changes made to patch #3 - Removed extra indent - Tweaked commit message --- arch/x86/lib/board.c | 56 ++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 17 deletions(-) (limited to 'arch/x86/lib/board.c') diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c index 6f075b7aa0..b64c2d3ca3 100644 --- a/arch/x86/lib/board.c +++ b/arch/x86/lib/board.c @@ -42,20 +42,12 @@ #include #include #include +#include #ifdef CONFIG_BITBANGMII #include #endif -/* - * Pointer to initial global data area - * - * Here we initialize it. - */ -#undef XTRN_DECLARE_GLOBAL_DATA_PTR -#define XTRN_DECLARE_GLOBAL_DATA_PTR /* empty = allocate here */ -DECLARE_GLOBAL_DATA_PTR = (gd_t *) (CONFIG_SYS_INIT_GD_ADDR); - /************************************************************************ * Init Utilities * ************************************************************************ @@ -128,6 +120,7 @@ static int calculate_relocation_address(void); static int copy_uboot_to_ram(void); static int clear_bss(void); static int do_elf_reloc_fixups(void); +static int copy_gd_to_ram(void); init_fnc_t *init_sequence_f[] = { cpu_init_f, @@ -146,6 +139,7 @@ init_fnc_t *init_sequence_f[] = { }; init_fnc_t *init_sequence_r[] = { + copy_gd_to_ram, cpu_init_r, /* basic cpu dependent setup */ board_early_init_r, /* basic board dependent setup */ dram_init, /* configure available RAM banks */ @@ -157,8 +151,6 @@ init_fnc_t *init_sequence_r[] = { NULL, }; -gd_t *gd; - static int calculate_relocation_address(void) { ulong text_start = (ulong)&__text_start; @@ -171,8 +163,18 @@ static int calculate_relocation_address(void) * requirements */ - /* Stack is at top of available memory */ + /* Global Data is at top of available memory */ dest_addr = gd->ram_size; + dest_addr -= GENERATED_GBL_DATA_SIZE; + dest_addr &= ~15; + gd->new_gd_addr = dest_addr; + + /* GDT is below Global Data */ + dest_addr -= X86_GDT_SIZE; + dest_addr &= ~15; + gd->gdt_addr = dest_addr; + + /* Stack is below GDT */ gd->start_addr_sp = dest_addr; /* U-Boot is below the stack */ @@ -279,6 +281,31 @@ void board_init_f_r(void) ; } +static int copy_gd_to_ram(void) +{ + gd_t *ram_gd; + + /* + * Global data is still in temporary memory (the CPU cache). + * calculate_relocation_address() has set gd->new_gd_addr to + * where the global data lives in RAM but getting it there + * safely is a bit tricky due to the 'F-Segment Hack' that + * we need to use for x86 + */ + ram_gd = (gd_t *)gd->new_gd_addr; + memcpy((void *)ram_gd, gd, sizeof(gd_t)); + + /* + * Reload the Global Descriptor Table so FS points to the + * in-RAM copy of Global Data (calculate_relocation_address() + * has already calculated the in-RAM location of the GDT) + */ + ram_gd->gd_addr = (ulong)ram_gd; + init_gd(ram_gd, (u64 *)gd->gdt_addr); + + return 0; +} + void board_init_r(gd_t *id, ulong dest_addr) { #if defined(CONFIG_CMD_NET) @@ -288,15 +315,10 @@ void board_init_r(gd_t *id, ulong dest_addr) ulong size; #endif static bd_t bd_data; - static gd_t gd_data; init_fnc_t **init_fnc_ptr; show_boot_progress(0x21); - /* Global data pointer is now writable */ - gd = &gd_data; - memcpy(gd, id, sizeof(gd_t)); - /* compiler optimization barrier needed for GCC >= 3.4 */ __asm__ __volatile__("" : : : "memory"); -- cgit From 3766bb33a52217a5921c4a0a65a7281859d15bce Mon Sep 17 00:00:00 2001 From: Graeme Russ Date: Sun, 1 Jan 2012 15:49:43 +1100 Subject: x86: Set GD_FLG_RELOC after entering in-RAM copy of U-Boot -- Changes for v2: - None --- arch/x86/lib/board.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/x86/lib/board.c') diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c index b64c2d3ca3..3d82165af3 100644 --- a/arch/x86/lib/board.c +++ b/arch/x86/lib/board.c @@ -252,8 +252,6 @@ void board_init_f(ulong boot_flags) hang(); } - gd->flags |= GD_FLG_RELOC; - /* * SDRAM is now initialised, U-Boot has been copied into SDRAM, * the BSS has been cleared etc. The final stack can now be setup @@ -322,6 +320,8 @@ void board_init_r(gd_t *id, ulong dest_addr) /* compiler optimization barrier needed for GCC >= 3.4 */ __asm__ __volatile__("" : : : "memory"); + gd->flags |= GD_FLG_RELOC; + gd->bd = &bd_data; memset(gd->bd, 0, sizeof(bd_t)); show_boot_progress(0x22); -- cgit From d653244b12dbc4a954e1bdfd04222bbbaf67329c Mon Sep 17 00:00:00 2001 From: Graeme Russ Date: Tue, 27 Dec 2011 22:46:43 +1100 Subject: x86: Create weak init_cache() and default enable_caches() functions -- Changes for v2: - Tweaked commit title --- arch/x86/lib/board.c | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/x86/lib/board.c') diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c index 3d82165af3..56acf35637 100644 --- a/arch/x86/lib/board.c +++ b/arch/x86/lib/board.c @@ -140,6 +140,7 @@ init_fnc_t *init_sequence_f[] = { init_fnc_t *init_sequence_r[] = { copy_gd_to_ram, + init_cache, cpu_init_r, /* basic cpu dependent setup */ board_early_init_r, /* basic board dependent setup */ dram_init, /* configure available RAM banks */ -- cgit From 98f1fa9fd4f468c67b5f4d16077898992d6bae0b Mon Sep 17 00:00:00 2001 From: Graeme Russ Date: Tue, 27 Dec 2011 22:46:42 +1100 Subject: x86: Allow cache before copy to RAM -- Changes for v2: - None --- arch/x86/lib/board.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'arch/x86/lib/board.c') diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c index 56acf35637..a240d26171 100644 --- a/arch/x86/lib/board.c +++ b/arch/x86/lib/board.c @@ -131,16 +131,11 @@ init_fnc_t *init_sequence_f[] = { console_init_f, dram_init_f, calculate_relocation_address, - copy_uboot_to_ram, - clear_bss, - do_elf_reloc_fixups, NULL, }; init_fnc_t *init_sequence_r[] = { - copy_gd_to_ram, - init_cache, cpu_init_r, /* basic cpu dependent setup */ board_early_init_r, /* basic board dependent setup */ dram_init, /* configure available RAM banks */ @@ -269,6 +264,16 @@ void board_init_f(ulong boot_flags) void board_init_f_r(void) { + if (copy_gd_to_ram() != 0) + hang(); + + if (init_cache() != 0) + hang(); + + copy_uboot_to_ram(); + clear_bss(); + do_elf_reloc_fixups(); + /* * Transfer execution from Flash to RAM by calculating the address * of the in-RAM copy of board_init_r() and calling it -- cgit From d13640b7c48cfe73dd738479efb8f5ca230d87bb Mon Sep 17 00:00:00 2001 From: Graeme Russ Date: Fri, 23 Dec 2011 10:16:11 +1100 Subject: x86: Move do_go_exec() out of board.c -- Changes for v2: - None --- arch/x86/lib/board.c | 27 --------------------------- 1 file changed, 27 deletions(-) (limited to 'arch/x86/lib/board.c') diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c index a240d26171..aaffd1b205 100644 --- a/arch/x86/lib/board.c +++ b/arch/x86/lib/board.c @@ -487,33 +487,6 @@ void hang(void) ; } -unsigned long do_go_exec(ulong (*entry)(int, char * const []), - int argc, char * const argv[]) -{ - unsigned long ret = 0; - char **argv_tmp; - - /* - * x86 does not use a dedicated register to pass the pointer to - * the global_data, so it is instead passed as argv[-1]. By using - * argv[-1], the called 'Application' can use the contents of - * argv natively. However, to safely use argv[-1] a new copy of - * argv is needed with the extra element - */ - argv_tmp = malloc(sizeof(char *) * (argc + 1)); - - if (argv_tmp) { - argv_tmp[0] = (char *)gd; - - memcpy(&argv_tmp[1], argv, (size_t)(sizeof(char *) * argc)); - - ret = (entry) (argc, &argv_tmp[1]); - free(argv_tmp); - } - - return ret; -} - void setup_pcat_compatibility(void) __attribute__((weak, alias("__setup_pcat_compatibility"))); -- cgit From 8e18e6e173d1649a623d04c3f71b1e1b03bf6919 Mon Sep 17 00:00:00 2001 From: Graeme Russ Date: Fri, 23 Dec 2011 10:20:55 +1100 Subject: x86: Move setup_pcat_compatibility() out of board.c This function simply does not belong in board.c -- Changes for v2: - Added commit message --- arch/x86/lib/board.c | 7 ------- 1 file changed, 7 deletions(-) (limited to 'arch/x86/lib/board.c') diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c index aaffd1b205..416aa9e5f6 100644 --- a/arch/x86/lib/board.c +++ b/arch/x86/lib/board.c @@ -486,10 +486,3 @@ void hang(void) for (;;) ; } - -void setup_pcat_compatibility(void) - __attribute__((weak, alias("__setup_pcat_compatibility"))); - -void __setup_pcat_compatibility(void) -{ -} -- cgit From b156ff09aad5a54b5a47b940ebc26aeeae56ee07 Mon Sep 17 00:00:00 2001 From: Graeme Russ Date: Fri, 23 Dec 2011 15:57:58 +1100 Subject: x86: Move relocation code out of board.c --- arch/x86/lib/board.c | 69 ++-------------------------------------------------- 1 file changed, 2 insertions(+), 67 deletions(-) (limited to 'arch/x86/lib/board.c') diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c index 416aa9e5f6..bebb347208 100644 --- a/arch/x86/lib/board.c +++ b/arch/x86/lib/board.c @@ -41,7 +41,6 @@ #include #include #include -#include #include #ifdef CONFIG_BITBANGMII @@ -117,9 +116,6 @@ static void display_flash_config(ulong size) typedef int (init_fnc_t) (void); static int calculate_relocation_address(void); -static int copy_uboot_to_ram(void); -static int clear_bss(void); -static int do_elf_reloc_fixups(void); static int copy_gd_to_ram(void); init_fnc_t *init_sequence_f[] = { @@ -183,59 +179,6 @@ static int calculate_relocation_address(void) return 0; } -static int copy_uboot_to_ram(void) -{ - size_t len = (size_t)&__data_end - (size_t)&__text_start; - - memcpy((void *)gd->relocaddr, (void *)&__text_start, len); - - return 0; -} - -static int clear_bss(void) -{ - ulong dst_addr = (ulong)&__bss_start + gd->reloc_off; - size_t len = (size_t)&__bss_end - (size_t)&__bss_start; - - memset((void *)dst_addr, 0x00, len); - - return 0; -} - -static 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; - Elf32_Addr *offset_ptr_ram; - - /* The size of the region of u-boot that runs out of RAM. */ - uintptr_t size = (uintptr_t)&__bss_end - (uintptr_t)&__text_start; - - do { - /* Get the location from the relocation entry */ - offset_ptr_rom = (Elf32_Addr *)re_src->r_offset; - - /* Check that the location of the relocation is in .text */ - if (offset_ptr_rom >= (Elf32_Addr *)CONFIG_SYS_TEXT_BASE) { - - /* Switch to the in-RAM version */ - offset_ptr_ram = (Elf32_Addr *)((ulong)offset_ptr_rom + - gd->reloc_off); - - /* Check that the target points into .text */ - if (*offset_ptr_ram >= CONFIG_SYS_TEXT_BASE && - *offset_ptr_ram < - (CONFIG_SYS_TEXT_BASE + size)) { - *offset_ptr_ram += gd->reloc_off; - } - } - } while (re_src++ < re_end); - - return 0; -} - /* Load U-Boot into RAM, initialize BSS, perform relocation adjustments */ void board_init_f(ulong boot_flags) { @@ -270,17 +213,9 @@ void board_init_f_r(void) if (init_cache() != 0) hang(); - copy_uboot_to_ram(); - clear_bss(); - do_elf_reloc_fixups(); - - /* - * Transfer execution from Flash to RAM by calculating the address - * of the in-RAM copy of board_init_r() and calling it - */ - (board_init_r + gd->reloc_off)(gd, gd->relocaddr); + relocate_code(0, gd, 0); - /* NOTREACHED - board_init_r() does not return */ + /* NOTREACHED - relocate_code() does not return */ while (1) ; } -- cgit From d47ab0ecde1c9a66acbaf421ddd92c888d2ef344 Mon Sep 17 00:00:00 2001 From: Graeme Russ Date: Fri, 23 Dec 2011 16:51:29 +1100 Subject: x86: Split init functions out of board.c This patch moves towards reducing board.c to simply a set of init cores for the three initialisation phases (Flash, Flash/RAM, and RAM), a set of three init function arrays and a init function array processing function --- arch/x86/lib/board.c | 297 +++++++++++++-------------------------------------- 1 file changed, 76 insertions(+), 221 deletions(-) (limited to 'arch/x86/lib/board.c') diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c index bebb347208..89721c7c00 100644 --- a/arch/x86/lib/board.c +++ b/arch/x86/lib/board.c @@ -33,62 +33,12 @@ #include #include -#include #include -#include -#include -#include -#include -#include #include #include -#ifdef CONFIG_BITBANGMII -#include -#endif - -/************************************************************************ - * Init Utilities * - ************************************************************************ - * Some of this code should be moved into the core functions, - * or dropped completely, - * but let's get it working (again) first... - */ -static int init_baudrate(void) -{ - gd->baudrate = getenv_ulong("baudrate", 10, CONFIG_BAUDRATE); - return 0; -} - -static int display_banner(void) -{ - - printf("\n\n%s\n\n", version_string); - - return 0; -} - -static int display_dram_config(void) -{ - int i; - - puts("DRAM Configuration:\n"); - - for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) { - printf("Bank #%d: %08lx ", i, gd->bd->bi_dram[i].start); - print_size(gd->bd->bi_dram[i].size, "\n"); - } - - return 0; -} - -#ifndef CONFIG_SYS_NO_FLASH -static void display_flash_config(ulong size) -{ - puts("Flash: "); - print_size(size, "\n"); -} -#endif +#include +#include /* * Breath some life into the board... @@ -122,7 +72,7 @@ init_fnc_t *init_sequence_f[] = { cpu_init_f, board_early_init_f, env_init, - init_baudrate, + init_baudrate_f, serial_init, console_init_f, dram_init_f, @@ -132,17 +82,81 @@ init_fnc_t *init_sequence_f[] = { }; init_fnc_t *init_sequence_r[] = { - cpu_init_r, /* basic cpu dependent setup */ - board_early_init_r, /* basic board dependent setup */ - dram_init, /* configure available RAM banks */ - interrupt_init, /* set up exceptions */ + init_bd_struct_r, + mem_malloc_init_r, + cpu_init_r, + board_early_init_r, + dram_init, + interrupt_init, timer_init, display_banner, display_dram_config, - +#ifdef CONFIG_SERIAL_MULTI + serial_initialize_r, +#endif +#ifndef CONFIG_SYS_NO_FLASH + flash_init_r, +#endif + env_relocate_r, +#ifdef CONFIG_CMD_NET + init_ip_address_r, +#endif +#ifdef CONFIG_PCI + pci_init_r, +#endif + stdio_init, + jumptable_init_r, + console_init_r, +#ifdef CONFIG_MISC_INIT_R + misc_init_r, +#endif +#if defined(CONFIG_CMD_PCMCIA) && !defined(CONFIG_CMD_IDE) + pci_init_r, +#endif +#if defined(CONFIG_CMD_KGDB) + kgdb_init_r, +#endif + enable_interrupts_r, +#ifdef CONFIG_STATUS_LED + status_led_set_r, +#endif + set_load_addr_r, +#if defined(CONFIG_CMD_NET) + set_bootfile_r, +#endif +#if defined(CONFIG_CMD_IDE) + ide_init_r, +#endif +#if defined(CONFIG_CMD_SCSI) + scsi_init_r, +#endif +#if defined(CONFIG_CMD_DOC) + doc_init_r, +#endif +#ifdef CONFIG_BITBANGMII + bb_miiphy_init_r, +#endif +#if defined(CONFIG_CMD_NET) + eth_initialize_r, +#ifdef CONFIG_RESET_PHY_R + reset_phy_r, +#endif +#endif +#ifdef CONFIG_LAST_STAGE_INIT + last_stage_init, +#endif NULL, }; +static void do_init_loop(init_fnc_t **init_fnc_ptr) +{ + for (; *init_fnc_ptr; ++init_fnc_ptr) { + WATCHDOG_RESET(); + if ((*init_fnc_ptr)() != 0) + hang(); + } +} + static int calculate_relocation_address(void) { ulong text_start = (ulong)&__text_start; @@ -179,17 +193,12 @@ static int calculate_relocation_address(void) return 0; } -/* Load U-Boot into RAM, initialize BSS, perform relocation adjustments */ +/* Perform all steps necessary to get RAM initialised ready for relocation */ void board_init_f(ulong boot_flags) { - init_fnc_t **init_fnc_ptr; - gd->flags = boot_flags; - for (init_fnc_ptr = init_sequence_f; *init_fnc_ptr; ++init_fnc_ptr) { - if ((*init_fnc_ptr)() != 0) - hang(); - } + do_init_loop(init_sequence_f); /* * SDRAM is now initialised, U-Boot has been copied into SDRAM, @@ -247,166 +256,12 @@ static int copy_gd_to_ram(void) void board_init_r(gd_t *id, ulong dest_addr) { -#if defined(CONFIG_CMD_NET) - char *s; -#endif -#ifndef CONFIG_SYS_NO_FLASH - ulong size; -#endif - static bd_t bd_data; - init_fnc_t **init_fnc_ptr; - - show_boot_progress(0x21); + gd->flags |= GD_FLG_RELOC; /* compiler optimization barrier needed for GCC >= 3.4 */ __asm__ __volatile__("" : : : "memory"); - gd->flags |= GD_FLG_RELOC; - - gd->bd = &bd_data; - memset(gd->bd, 0, sizeof(bd_t)); - show_boot_progress(0x22); - - gd->baudrate = CONFIG_BAUDRATE; - - mem_malloc_init((((ulong)dest_addr - CONFIG_SYS_MALLOC_LEN)+3)&~3, - CONFIG_SYS_MALLOC_LEN); - - for (init_fnc_ptr = init_sequence_r; *init_fnc_ptr; ++init_fnc_ptr) { - if ((*init_fnc_ptr)() != 0) - hang(); - } - show_boot_progress(0x23); - -#ifdef CONFIG_SERIAL_MULTI - serial_initialize(); -#endif - -#ifndef CONFIG_SYS_NO_FLASH - /* configure available FLASH banks */ - size = flash_init(); - display_flash_config(size); - show_boot_progress(0x24); -#endif - - show_boot_progress(0x25); - - /* initialize environment */ - env_relocate(); - show_boot_progress(0x26); - - -#ifdef CONFIG_CMD_NET - /* IP Address */ - bd_data.bi_ip_addr = getenv_IPaddr("ipaddr"); -#endif - -#if defined(CONFIG_PCI) - /* - * Do pci configuration - */ - pci_init(); -#endif - - show_boot_progress(0x27); - - - stdio_init(); - - jumptable_init(); - - /* Initialize the console (after the relocation and devices init) */ - console_init_r(); - -#ifdef CONFIG_MISC_INIT_R - /* miscellaneous platform dependent initialisations */ - misc_init_r(); -#endif - -#if defined(CONFIG_CMD_PCMCIA) && !defined(CONFIG_CMD_IDE) - WATCHDOG_RESET(); - puts("PCMCIA:"); - pcmcia_init(); -#endif - -#if defined(CONFIG_CMD_KGDB) - WATCHDOG_RESET(); - puts("KGDB: "); - kgdb_init(); -#endif - - /* enable exceptions */ - enable_interrupts(); - show_boot_progress(0x28); - -#ifdef CONFIG_STATUS_LED - status_led_set(STATUS_LED_BOOT, STATUS_LED_BLINKING); -#endif - - udelay(20); - - /* Initialize from environment */ - load_addr = getenv_ulong("loadaddr", 16, load_addr); -#if defined(CONFIG_CMD_NET) - s = getenv("bootfile"); - - if (s != NULL) - copy_filename(BootFile, s, sizeof(BootFile)); -#endif - - WATCHDOG_RESET(); - -#if defined(CONFIG_CMD_IDE) - WATCHDOG_RESET(); - puts("IDE: "); - ide_init(); -#endif - -#if defined(CONFIG_CMD_SCSI) - WATCHDOG_RESET(); - puts("SCSI: "); - scsi_init(); -#endif - -#if defined(CONFIG_CMD_DOC) - WATCHDOG_RESET(); - puts("DOC: "); - doc_init(); -#endif - -#ifdef CONFIG_BITBANGMII - bb_miiphy_init(); -#endif -#if defined(CONFIG_CMD_NET) - WATCHDOG_RESET(); - puts("Net: "); - eth_initialize(gd->bd); -#endif - -#if (defined(CONFIG_CMD_NET)) && (0) - WATCHDOG_RESET(); -# ifdef DEBUG - puts("Reset Ethernet PHY\n"); -# endif - reset_phy(); -#endif - -#ifdef CONFIG_LAST_STAGE_INIT - WATCHDOG_RESET(); - /* - * Some parts can be only initialized if all others (like - * Interrupts) are up and running (i.e. the PC-style ISA - * keyboard). - */ - last_stage_init(); -#endif - - -#ifdef CONFIG_POST - post_run(NULL, POST_RAM | post_bootmode_get(0)); -#endif - - show_boot_progress(0x29); + do_init_loop(init_sequence_r); /* main_loop() can return to retry autoboot, if so just run it again. */ for (;;) -- cgit From a1d57b7aba85abc787675952b40c550bf3a595f8 Mon Sep 17 00:00:00 2001 From: Graeme Russ Date: Fri, 23 Dec 2011 21:14:22 +1100 Subject: x86: Convert board_init_f_r to a processing loop Create an init function array for board_init_f_r - This finalises the migration to a purely array based initialisation mechanism Also tweak a few comments while we are at it so everything is 'correct' -- Changes for v2: - Renamed to a more apt name - Fix bug in set_reloc_flag_r - Re-instate gd->flags = boot_flags; in board_init_f - Added commit message --- arch/x86/lib/board.c | 186 ++++++++++++++++++++++++--------------------------- 1 file changed, 89 insertions(+), 97 deletions(-) (limited to 'arch/x86/lib/board.c') diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c index 89721c7c00..5f0b62cea6 100644 --- a/arch/x86/lib/board.c +++ b/arch/x86/lib/board.c @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include @@ -43,31 +43,58 @@ /* * Breath some life into the board... * - * Initialize an SMC for serial comms, and carry out some hardware - * tests. + * Getting the board up and running is a three-stage process: + * 1) Execute from Flash, SDRAM Uninitialised + * At this point, there is a limited amount of non-SDRAM memory + * (typically the CPU cache, but can also be SRAM or even a buffer of + * of some peripheral). This limited memory is used to hold: + * - The initial copy of the Global Data Structure + * - A temporary stack + * - A temporary x86 Global Descriptor Table + * - The pre-console buffer (if enabled) * - * The first part of initialization is running from Flash memory; - * its main purpose is to initialize the RAM so that we - * can relocate the monitor code to RAM. + * The following is performed during this phase of execution: + * - Core low-level CPU initialisation + * - Console initialisation + * - SDRAM initialisation + * + * 2) Execute from Flash, SDRAM Initialised + * At this point we copy Global Data from the initial non-SDRAM + * memory and set up the permanent stack in SDRAM. The CPU cache is no + * longer being used as temporary memory, so we can now fully enable + * it. + * + * The following is performed during this phase of execution: + * - Create final stack in SDRAM + * - Copy Global Data from temporary memory to SDRAM + * - Enabling of CPU cache(s), + * - Copying of U-Boot code and data from Flash to RAM + * - Clearing of the BSS + * - ELF relocation adjustments + * + * 3) Execute from SDRAM + * The following is performed during this phase of execution: + * - All remaining initialisation */ /* - * All attempts to come up with a "common" initialization sequence - * that works for all boards and architectures failed: some of the - * requirements are just _too_ different. To get rid of the resulting - * mess of board dependend #ifdef'ed code we now make the whole - * initialization sequence configurable to the user. - * - * The requirements for any new initalization function is simple: it - * receives a pointer to the "global data" structure as it's only - * argument, and returns an integer return code, where 0 means - * "continue" and != 0 means "fatal error, hang the system". + * The requirements for any new initalization function is simple: it is + * a function with no parameters which returns an integer return code, + * where 0 means "continue" and != 0 means "fatal error, hang the system" */ typedef int (init_fnc_t) (void); -static int calculate_relocation_address(void); -static int copy_gd_to_ram(void); - +/* + * init_sequence_f is the list of init functions which are run when U-Boot + * is executing from Flash with a limited 'C' environment. The following + * limitations must be considered when implementing an '_f' function: + * - 'static' variables are read-only + * - Global Data (gd->xxx) is read/write + * - Stack space is limited + * + * The '_f' sequence must, as a minimum, initialise SDRAM. It _should_ + * also initialise the console (to provide early debug output) + */ init_fnc_t *init_sequence_f[] = { cpu_init_f, board_early_init_f, @@ -81,7 +108,39 @@ init_fnc_t *init_sequence_f[] = { NULL, }; +/* + * init_sequence_f_r is the list of init functions which are run when + * U-Boot is executing from Flash with a semi-limited 'C' environment. + * The following limitations must be considered when implementing an + * '_f_r' function: + * - 'static' variables are read-only + * - Global Data (gd->xxx) is read/write + * + * The '_f_r' sequence must, as a minimum, copy U-Boot to RAM (if + * supported). It _should_, if possible, copy global data to RAM and + * initialise the CPU caches (to speed up the relocation process) + */ +init_fnc_t *init_sequence_f_r[] = { + copy_gd_to_ram_f_r, + init_cache_f_r, + copy_uboot_to_ram, + clear_bss, + do_elf_reloc_fixups, + + NULL, +}; + +/* + * init_sequence_r is the list of init functions which are run when U-Boot + * is executing from RAM with a full 'C' environment. There are no longer + * any limitations which must be considered when implementing an '_r' + * function, (i.e.'static' variables are read/write) + * + * If not already done, the '_r' sequence must copy global data to RAM and + * (should) initialise the CPU caches. + */ init_fnc_t *init_sequence_r[] = { + set_reloc_flag_r, init_bd_struct_r, mem_malloc_init_r, cpu_init_r, @@ -157,43 +216,6 @@ static void do_init_loop(init_fnc_t **init_fnc_ptr) } } -static int calculate_relocation_address(void) -{ - ulong text_start = (ulong)&__text_start; - ulong bss_end = (ulong)&__bss_end; - ulong dest_addr; - - /* - * NOTE: All destination address are rounded down to 16-byte - * boundary to satisfy various worst-case alignment - * requirements - */ - - /* Global Data is at top of available memory */ - dest_addr = gd->ram_size; - dest_addr -= GENERATED_GBL_DATA_SIZE; - dest_addr &= ~15; - gd->new_gd_addr = dest_addr; - - /* GDT is below Global Data */ - dest_addr -= X86_GDT_SIZE; - dest_addr &= ~15; - gd->gdt_addr = dest_addr; - - /* Stack is below GDT */ - gd->start_addr_sp = dest_addr; - - /* U-Boot is below the stack */ - dest_addr -= CONFIG_SYS_STACK_SIZE; - dest_addr -= (bss_end - text_start); - dest_addr &= ~15; - gd->relocaddr = dest_addr; - gd->reloc_off = (dest_addr - text_start); - - return 0; -} - -/* Perform all steps necessary to get RAM initialised ready for relocation */ void board_init_f(ulong boot_flags) { gd->flags = boot_flags; @@ -201,10 +223,9 @@ void board_init_f(ulong boot_flags) do_init_loop(init_sequence_f); /* - * SDRAM is now initialised, U-Boot has been copied into SDRAM, - * the BSS has been cleared etc. The final stack can now be setup - * in SDRAM. Code execution will continue (momentarily) in Flash, - * but with the stack in SDRAM and Global Data in temporary memory + * SDRAM and console are now initialised. The final stack can now + * be setup in SDRAM. Code execution will continue in Flash, but + * with the stack in SDRAM and Global Data in temporary memory * (CPU cache) */ board_init_f_r_trampoline(gd->start_addr_sp); @@ -216,51 +237,22 @@ void board_init_f(ulong boot_flags) void board_init_f_r(void) { - if (copy_gd_to_ram() != 0) - hang(); - - if (init_cache() != 0) - hang(); - - relocate_code(0, gd, 0); - - /* NOTREACHED - relocate_code() does not return */ - while (1) - ; -} - -static int copy_gd_to_ram(void) -{ - gd_t *ram_gd; + do_init_loop(init_sequence_f_r); /* - * Global data is still in temporary memory (the CPU cache). - * calculate_relocation_address() has set gd->new_gd_addr to - * where the global data lives in RAM but getting it there - * safely is a bit tricky due to the 'F-Segment Hack' that - * we need to use for x86 + * U-Boot has been copied into SDRAM, the BSS has been cleared etc. + * Transfer execution from Flash to RAM by calculating the address + * of the in-RAM copy of board_init_r() and calling it */ - ram_gd = (gd_t *)gd->new_gd_addr; - memcpy((void *)ram_gd, gd, sizeof(gd_t)); + (board_init_r + gd->reloc_off)(gd, gd->relocaddr); - /* - * Reload the Global Descriptor Table so FS points to the - * in-RAM copy of Global Data (calculate_relocation_address() - * has already calculated the in-RAM location of the GDT) - */ - ram_gd->gd_addr = (ulong)ram_gd; - init_gd(ram_gd, (u64 *)gd->gdt_addr); - - return 0; + /* NOTREACHED - board_init_r() does not return */ + while (1) + ; } void board_init_r(gd_t *id, ulong dest_addr) { - gd->flags |= GD_FLG_RELOC; - - /* compiler optimization barrier needed for GCC >= 3.4 */ - __asm__ __volatile__("" : : : "memory"); - do_init_loop(init_sequence_r); /* main_loop() can return to retry autoboot, if so just run it again. */ -- cgit