diff options
| -rw-r--r-- | src/boot/hardwaremain.c | 6 | ||||
| -rw-r--r-- | src/boot/selfboot.c | 5 | ||||
| -rw-r--r-- | src/cpu/x86/lapic/lapic_cpu_init.c | 19 | ||||
| -rw-r--r-- | src/include/lib.h | 4 | ||||
| -rw-r--r-- | src/lib/stack.c | 14 |
5 files changed, 18 insertions, 30 deletions
diff --git a/src/boot/hardwaremain.c b/src/boot/hardwaremain.c index c90742e190..95dd988e16 100644 --- a/src/boot/hardwaremain.c +++ b/src/boot/hardwaremain.c @@ -137,12 +137,6 @@ void hardwaremain(int boot_complete) if (! payload) die("Could not find a payload\n"); - printk(BIOS_DEBUG, "Got a payload\n"); - /* Before we go off to run the payload, see if - * we stayed within our bounds. - */ - checkstack(&_estack, 0); - selfboot(lb_mem, payload); printk(BIOS_EMERG, "Boot failed"); } diff --git a/src/boot/selfboot.c b/src/boot/selfboot.c index fd5b382764..2556a14d6e 100644 --- a/src/boot/selfboot.c +++ b/src/boot/selfboot.c @@ -519,6 +519,11 @@ int selfboot(struct lb_memory *mem, struct cbfs_payload *payload) timestamp_add_now(TS_SELFBOOT_JUMP); #endif + /* Before we go off to run the payload, see if + * we stayed within our bounds. + */ + checkstack(_estack, 0); + /* Jump to kernel */ jmp_to_elf_entry((void*)entry, bounce_buffer, bounce_size); return 1; diff --git a/src/cpu/x86/lapic/lapic_cpu_init.c b/src/cpu/x86/lapic/lapic_cpu_init.c index 6c01d8c3a1..621990c0e5 100644 --- a/src/cpu/x86/lapic/lapic_cpu_init.c +++ b/src/cpu/x86/lapic/lapic_cpu_init.c @@ -22,6 +22,7 @@ #include <cpu/x86/lapic.h> #include <delay.h> +#include <lib.h> #include <string.h> #include <console/console.h> #include <arch/hlt.h> @@ -240,7 +241,6 @@ volatile unsigned int secondary_cpu_index; int start_cpu(device_t cpu) { - extern unsigned char _estack[]; struct cpu_info *info; unsigned long stack_end; unsigned long stack_base; @@ -503,21 +503,8 @@ static void wait_other_cpus_stop(struct bus *cpu_bus) } } printk(BIOS_DEBUG, "All AP CPUs stopped (%ld loops)\n", loopcount); - for(i = 1; i <= last_cpu_index; i++){ - unsigned long *stack = stacks[i]; - int lowest; - int maxstack = (CONFIG_STACK_SIZE - sizeof(struct cpu_info)) - /sizeof(*stack) - 1; - if (stack[0] != 0xDEADBEEF) - printk(BIOS_ERR, "CPU%d overran its stack\n", i); - for(lowest = 0; lowest < maxstack; lowest++) - if (stack[lowest] != 0xDEADBEEF) - break; - printk(BIOS_SPEW, "CPU%d: stack allocated from %p to %p:", i, - stack, &stack[maxstack]); - printk(BIOS_SPEW, "lowest stack address was %p\n", - &stack[lowest]); - } + for(i = 1; i <= last_cpu_index; i++) + checkstack((void *)stacks[i] + CONFIG_STACK_SIZE, i); } #endif /* CONFIG_SMP */ diff --git a/src/include/lib.h b/src/include/lib.h index b2f38a828f..9d8108532c 100644 --- a/src/include/lib.h +++ b/src/include/lib.h @@ -41,10 +41,10 @@ int ram_check_nodie(unsigned long start, unsigned long stop); void quick_ram_check(void); /* Defined in src/lib/stack.c */ -int checkstack(void *top_of_stack, int stacksize); +int checkstack(void *top_of_stack, int core); /* currently defined by a ldscript */ -extern u8 _estack; +extern unsigned char _estack[]; /* Defined in romstage.c */ #if CONFIG_CPU_AMD_GEODE_LX diff --git a/src/lib/stack.c b/src/lib/stack.c index 3f04b63828..0a6637f256 100644 --- a/src/lib/stack.c +++ b/src/lib/stack.c @@ -35,15 +35,17 @@ int checkstack(void *top_of_stack, int core) return -1; } - for(i = 0; i < CONFIG_STACK_SIZE/sizeof(stack[0]); i++){ + for(i = 1; i < CONFIG_STACK_SIZE/sizeof(stack[0]); i++){ if (stack[i] == 0xDEADBEEF) continue; - printk(BIOS_SPEW, "CPU%d: stack from %p to %p:", - core, - stack, + printk(BIOS_SPEW, "CPU%d: stack: %p - %p, ", + core, stack, &stack[CONFIG_STACK_SIZE/sizeof(stack[0])]); - printk(BIOS_SPEW, "Lowest stack address %p\n", &stack[i]); - return -1; + printk(BIOS_SPEW, "lowest used address %p, ", &stack[i]); + printk(BIOS_SPEW, "stack used: %ld bytes\n", + (unsigned long)&stack[CONFIG_STACK_SIZE / + sizeof(stack[0])] - (unsigned long)&stack[i]); + return 0; } return 0; |