Michael Walle has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/43126 )
Change subject: libpayload: arm64: silence libpayload main entry ......................................................................
libpayload: arm64: silence libpayload main entry
No other architecture in libpayload outputs anything in the main entry routing. 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 --- M payloads/libpayload/arch/arm64/exception.c M payloads/libpayload/arch/arm64/main.c 2 files changed, 1 insertion(+), 23 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/26/43126/1
diff --git a/payloads/libpayload/arch/arm64/exception.c b/payloads/libpayload/arch/arm64/exception.c index 94e7990..21ed1c2 100644 --- a/payloads/libpayload/arch/arm64/exception.c +++ b/payloads/libpayload/arch/arm64/exception.c @@ -32,7 +32,6 @@
u64 exception_stack[2*KiB] __attribute__((aligned(16))); u64 *exception_stack_end = exception_stack + ARRAY_SIZE(exception_stack); -extern unsigned int test_exc;
struct exception_handler_info { @@ -111,13 +110,7 @@ /* Few words below SP in case we need state from a returned function. */ dump_stack(state->sp - 32, 512);
- if (test_exc) { - state->elr += 4; - test_exc = 0; - printf("returning back now\n"); - } - else - halt(); + halt(); }
void exception_init(void) diff --git a/payloads/libpayload/arch/arm64/main.c b/payloads/libpayload/arch/arm64/main.c index 1311a86..374c8b1 100644 --- a/payloads/libpayload/arch/arm64/main.c +++ b/payloads/libpayload/arch/arm64/main.c @@ -35,19 +35,6 @@ /** The argv value to pass to main() */ 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 * Desc: We need to setup and enable MMU before we can go to scan coreboot @@ -126,10 +113,8 @@ console_init(); #endif
- printf("ARM64: Libpayload %s\n",__func__); exception_init();
- test_exception(); /* * Any other system init that has to happen before the * user gets control goes here.
Hello Julius Werner,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/43126
to look at the new patch set (#2).
Change subject: libpayload: arm64: silence libpayload main entry ......................................................................
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 --- M payloads/libpayload/arch/arm64/exception.c M payloads/libpayload/arch/arm64/main.c 2 files changed, 1 insertion(+), 23 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/26/43126/2
Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/43126 )
Change subject: libpayload: arm64: silence libpayload main entry ......................................................................
Patch Set 2: Code-Review+2
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/43126 )
Change subject: libpayload: arm64: silence libpayload main entry ......................................................................
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 --- M payloads/libpayload/arch/arm64/exception.c M payloads/libpayload/arch/arm64/main.c 2 files changed, 1 insertion(+), 23 deletions(-)
Approvals: build bot (Jenkins): Verified Julius Werner: Looks good to me, approved
diff --git a/payloads/libpayload/arch/arm64/exception.c b/payloads/libpayload/arch/arm64/exception.c index 94e7990..21ed1c2 100644 --- a/payloads/libpayload/arch/arm64/exception.c +++ b/payloads/libpayload/arch/arm64/exception.c @@ -32,7 +32,6 @@
u64 exception_stack[2*KiB] __attribute__((aligned(16))); u64 *exception_stack_end = exception_stack + ARRAY_SIZE(exception_stack); -extern unsigned int test_exc;
struct exception_handler_info { @@ -111,13 +110,7 @@ /* Few words below SP in case we need state from a returned function. */ dump_stack(state->sp - 32, 512);
- if (test_exc) { - state->elr += 4; - test_exc = 0; - printf("returning back now\n"); - } - else - halt(); + halt(); }
void exception_init(void) diff --git a/payloads/libpayload/arch/arm64/main.c b/payloads/libpayload/arch/arm64/main.c index 1311a86..374c8b1 100644 --- a/payloads/libpayload/arch/arm64/main.c +++ b/payloads/libpayload/arch/arm64/main.c @@ -35,19 +35,6 @@ /** The argv value to pass to main() */ 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 * Desc: We need to setup and enable MMU before we can go to scan coreboot @@ -126,10 +113,8 @@ console_init(); #endif
- printf("ARM64: Libpayload %s\n",__func__); exception_init();
- test_exception(); /* * Any other system init that has to happen before the * user gets control goes here.
-
Julius Werner (Code Review) -
Michael Walle (Code Review)
-
Patrick Georgi (Code Review)