diff options
| author | Aaron Durbin <adurbin@chromium.org> | 2015-03-16 17:30:09 -0500 |
|---|---|---|
| committer | Aaron Durbin <adurbin@google.com> | 2015-03-18 16:41:43 +0100 |
| commit | 9ef9d85976fcfc5f4c8c273eaf3377fdd6e5c24d (patch) | |
| tree | e33c2670ea0188d24bd0dd4b979a18fe1075820f /src/arch | |
| parent | b335c3de424c6d80e229c0a79d1e47fd602bfaaa (diff) | |
| download | coreboot-9ef9d85976fcfc5f4c8c273eaf3377fdd6e5c24d.tar.xz | |
bootstate: use structure pointers for scheduling callbacks
The GCC 4.9.2 update showed that the boot_state_init_entry
structures were being padded and assumed to be aligned in to an
increased size. The bootstate scheduler for static entries,
boot_state_schedule_static_entries(), was then calculating the
wrong values within the array. To fix this just use a pointer to
the boot_state_init_entry structure that needs to be scheduled.
In addition to the previous issue noted above, the .bs_init
section was sitting in the read only portion of the image while
the fields within it need to be writable. Also, the
boot_state_schedule_static_entries() was using symbol comparison
to terminate a loop which in C can lead the compiler to always
evaluate the loop at least once since the language spec indicates
no 2 symbols can be the same value.
Change-Id: I6dc5331c2979d508dde3cd5c3332903d40d8048b
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/8699
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/arch')
| -rw-r--r-- | src/arch/arm/ramstage.ld | 1 | ||||
| -rw-r--r-- | src/arch/arm64/ramstage.ld | 2 | ||||
| -rw-r--r-- | src/arch/riscv/ramstage.ld | 1 | ||||
| -rw-r--r-- | src/arch/x86/ramstage.ld | 1 |
4 files changed, 5 insertions, 0 deletions
diff --git a/src/arch/arm/ramstage.ld b/src/arch/arm/ramstage.ld index 5469509b8e..5e0607d9a7 100644 --- a/src/arch/arm/ramstage.ld +++ b/src/arch/arm/ramstage.ld @@ -64,6 +64,7 @@ SECTIONS ecpu_drivers = . ; _bs_init_begin = .; KEEP(*(.bs_init)); + LONG(0); _bs_init_end = .; *(.rodata) *(.rodata.*) diff --git a/src/arch/arm64/ramstage.ld b/src/arch/arm64/ramstage.ld index de13fcc519..784e62da92 100644 --- a/src/arch/arm64/ramstage.ld +++ b/src/arch/arm64/ramstage.ld @@ -69,6 +69,8 @@ SECTIONS ecpu_drivers = . ; _bs_init_begin = .; KEEP(*(.bs_init)); + LONG(0); + LONG(0); _bs_init_end = .; *(.rodata) *(.rodata.*) diff --git a/src/arch/riscv/ramstage.ld b/src/arch/riscv/ramstage.ld index 5d9ba3ea5c..2e97a7e6ee 100644 --- a/src/arch/riscv/ramstage.ld +++ b/src/arch/riscv/ramstage.ld @@ -69,6 +69,7 @@ SECTIONS ecpu_drivers = . ; _bs_init_begin = .; *(.bs_init) + LONG(0); _bs_init_end = .; *(.rodata) *(.rodata.*) diff --git a/src/arch/x86/ramstage.ld b/src/arch/x86/ramstage.ld index 0843be7906..9c43bd7937 100644 --- a/src/arch/x86/ramstage.ld +++ b/src/arch/x86/ramstage.ld @@ -62,6 +62,7 @@ SECTIONS ecpu_drivers = . ; _bs_init_begin = .; KEEP(*(.bs_init)); + LONG(0); _bs_init_end = .; *(.rodata) |