summaryrefslogtreecommitdiff
path: root/src/soc/intel/broadwell
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2015-03-16 17:30:09 -0500
committerAaron Durbin <adurbin@google.com>2015-03-18 16:41:43 +0100
commit9ef9d85976fcfc5f4c8c273eaf3377fdd6e5c24d (patch)
treee33c2670ea0188d24bd0dd4b979a18fe1075820f /src/soc/intel/broadwell
parentb335c3de424c6d80e229c0a79d1e47fd602bfaaa (diff)
downloadcoreboot-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/soc/intel/broadwell')
-rw-r--r--src/soc/intel/broadwell/elog.c4
-rw-r--r--src/soc/intel/broadwell/finalize.c8
-rw-r--r--src/soc/intel/broadwell/spi.c4
3 files changed, 4 insertions, 12 deletions
diff --git a/src/soc/intel/broadwell/elog.c b/src/soc/intel/broadwell/elog.c
index a6a2813728..79484a9606 100644
--- a/src/soc/intel/broadwell/elog.c
+++ b/src/soc/intel/broadwell/elog.c
@@ -133,6 +133,4 @@ static void pch_log_state(void *unused)
pch_log_wake_source(ps);
}
-BOOT_STATE_INIT_ENTRIES(pch_log) = {
- BOOT_STATE_INIT_ENTRY(BS_DEV_INIT, BS_ON_ENTRY, pch_log_state, NULL)
-};
+BOOT_STATE_INIT_ENTRY(BS_DEV_INIT, BS_ON_ENTRY, pch_log_state, NULL);
diff --git a/src/soc/intel/broadwell/finalize.c b/src/soc/intel/broadwell/finalize.c
index 67cba66db7..4f7a5181ab 100644
--- a/src/soc/intel/broadwell/finalize.c
+++ b/src/soc/intel/broadwell/finalize.c
@@ -119,9 +119,5 @@ static void broadwell_finalize(void *unused)
post_code(POST_OS_BOOT);
}
-BOOT_STATE_INIT_ENTRIES(finalize) = {
- BOOT_STATE_INIT_ENTRY(BS_OS_RESUME, BS_ON_ENTRY,
- broadwell_finalize, NULL),
- BOOT_STATE_INIT_ENTRY(BS_PAYLOAD_LOAD, BS_ON_EXIT,
- broadwell_finalize, NULL),
-};
+BOOT_STATE_INIT_ENTRY(BS_OS_RESUME, BS_ON_ENTRY, broadwell_finalize, NULL);
+BOOT_STATE_INIT_ENTRY(BS_PAYLOAD_LOAD, BS_ON_EXIT, broadwell_finalize, NULL);
diff --git a/src/soc/intel/broadwell/spi.c b/src/soc/intel/broadwell/spi.c
index 4710271070..0069d10ea2 100644
--- a/src/soc/intel/broadwell/spi.c
+++ b/src/soc/intel/broadwell/spi.c
@@ -315,9 +315,7 @@ static void spi_init_cb(void *unused)
spi_init();
}
-BOOT_STATE_INIT_ENTRIES(spi_init_bscb) = {
- BOOT_STATE_INIT_ENTRY(BS_DEV_INIT, BS_ON_ENTRY, spi_init_cb, NULL),
-};
+BOOT_STATE_INIT_ENTRY(BS_DEV_INIT, BS_ON_ENTRY, spi_init_cb, NULL);
int spi_claim_bus(struct spi_slave *slave)
{