GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libpayload: arm64: silence libpayload main entry 

No other architecture in libpayload outputs anything in the main entry
routine. Let alone an exception test which looks like a real exception
to the normal user and is most likely really misleading. Silence the
startup code.

Change-Id: I6e49f24ad46ce578a4bb111c2d623ca4470a1866
Signed-off-by: Michael Walle <michael@walle.cc>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/43126
Reviewed-by: Julius Werner <jwerner@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Michael Walle 2020-07-03 23:43:57 +02:00 committed by Patrick Georgi
parent 492d55fa46
commit 32b13131c1
2 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
payloads/libpayload/arch/arm64/exception.c
View File

@ -32,7 +32,6 @@
u64 exception_stack[2*KiB] __attribute__((aligned(16))); u64 exception_stack[2*KiB] __attribute__((aligned(16)));
u64 *exception_stack_end = exception_stack + ARRAY_SIZE(exception_stack); u64 *exception_stack_end = exception_stack + ARRAY_SIZE(exception_stack);
extern unsigned int test_exc;
struct exception_handler_info struct exception_handler_info
{ {
@ -111,13 +110,7 @@ void exception_dispatch(struct exception_state *state, int idx)
/* Few words below SP in case we need state from a returned function. */ /* Few words below SP in case we need state from a returned function. */
dump_stack(state->sp - 32, 512); dump_stack(state->sp - 32, 512);
if (test_exc) { halt();
state->elr += 4;
test_exc = 0;
printf("returning back now\n");
}
else
halt();
} }
void exception_init(void) void exception_init(void)

15
payloads/libpayload/arch/arm64/main.c
View File

@ -35,19 +35,6 @@ int main_argc; /**< The argc value to pass to main() */
/** The argv value to pass to main() */ /** The argv value to pass to main() */
char *main_argv[MAX_ARGC_COUNT]; char *main_argv[MAX_ARGC_COUNT];
unsigned int test_exc;
static int test_exception(void)
{
uint64_t *a = (uint64_t *)0xfffffffff0000000ULL;
test_exc = 1;
printf("%llx\n", *a);
return 0;
}
/* /*
* Func: pre_sysinfo_scan_mmu_setup * Func: pre_sysinfo_scan_mmu_setup
* Desc: We need to setup and enable MMU before we can go to scan coreboot * Desc: We need to setup and enable MMU before we can go to scan coreboot
@ -126,10 +113,8 @@ void start_main(void)
console_init(); console_init();
#endif #endif
printf("ARM64: Libpayload %s\n",__func__);
exception_init(); exception_init();
test_exception();
/* /*
* Any other system init that has to happen before the * Any other system init that has to happen before the
* user gets control goes here. * user gets control goes here.