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>
diff --git a/src/lib/hardwaremain.c b/src/lib/hardwaremain.c
index 32162eb..d16aa09 100644
--- a/src/lib/hardwaremain.c
+++ b/src/lib/hardwaremain.c
@@ -432,18 +432,16 @@
static void boot_state_schedule_static_entries(void)
{
- extern struct boot_state_init_entry _bs_init_begin;
- extern struct boot_state_init_entry _bs_init_end;
- struct boot_state_init_entry *cur;
+ extern struct boot_state_init_entry *_bs_init_begin[];
+ struct boot_state_init_entry **slot;
- cur = &_bs_init_begin;
+ for (slot = &_bs_init_begin[0]; *slot != NULL; slot++) {
+ struct boot_state_init_entry *cur = *slot;
- while (cur != &_bs_init_end) {
if (cur->when == BS_ON_ENTRY)
boot_state_sched_on_entry(&cur->bscb, cur->state);
else
boot_state_sched_on_exit(&cur->bscb, cur->state);
- cur++;
}
}