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/include/bootstate.h b/src/include/bootstate.h
index 202acf7..8b5e4be 100644
--- a/src/include/bootstate.h
+++ b/src/include/bootstate.h
@@ -22,6 +22,9 @@
#if !defined(__SMM__) && !defined(__PRE_RAM__)
#include <string.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <stdint.h>
/* Control debugging of the boot state machine. */
#define BOOT_STATE_DEBUG 0
@@ -157,6 +160,10 @@
boot_state_t state);
int boot_state_sched_on_exit(struct boot_state_callback *bscb,
boot_state_t state);
+/* Schedule an array of entries of size num. */
+struct boot_state_init_entry;
+void boot_state_sched_entries(struct boot_state_init_entry *entries,
+ size_t num);
/* Block/Unblock the (state, seq) pair from transitioning. Returns 0 on
* success < 0 when the phase of the (state,seq) has already ran. */
@@ -180,15 +187,16 @@
#define BOOT_STATE_INIT_ATTR __attribute__ ((used,section (".bs_init")))
-#define BOOT_STATE_INIT_ENTRIES(name_) \
- static struct boot_state_init_entry name_[] BOOT_STATE_INIT_ATTR
-
-#define BOOT_STATE_INIT_ENTRY(state_, when_, func_, arg_) \
- { \
- .state = state_, \
- .when = when_, \
- .bscb = BOOT_STATE_CALLBACK_INIT(func_, arg_), \
- }
+#define BOOT_STATE_INIT_ENTRY(state_, when_, func_, arg_) \
+ static struct boot_state_init_entry func_ ##_## state_ ##_## when_ = \
+ { \
+ .state = state_, \
+ .when = when_, \
+ .bscb = BOOT_STATE_CALLBACK_INIT(func_, arg_), \
+ }; \
+ static struct boot_state_init_entry * \
+ bsie_ ## func_ ##_## state_ ##_## when_ BOOT_STATE_INIT_ATTR = \
+ & func_ ##_## state_ ##_## when_;
#endif
#endif /* BOOTSTATE_H */