diff options
Diffstat (limited to 'src/soc')
| -rw-r--r-- | src/soc/intel/apollolake/chip.c | 5 | ||||
| -rw-r--r-- | src/soc/intel/quark/chip.c | 6 | ||||
| -rw-r--r-- | src/soc/intel/skylake/chip_fsp20.c | 8 |
3 files changed, 16 insertions, 3 deletions
diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c index 12aea77289..ef5908cc36 100644 --- a/src/soc/intel/apollolake/chip.c +++ b/src/soc/intel/apollolake/chip.c @@ -25,6 +25,7 @@ #include <device/pci.h> #include <fsp/api.h> #include <fsp/util.h> +#include <romstage_handoff.h> #include <soc/iomap.h> #include <soc/cpu.h> #include <soc/intel/common/vbt.h> @@ -259,6 +260,7 @@ static void set_power_limits(void) static void soc_init(void *data) { struct global_nvs_t *gnvs; + struct romstage_handoff *handoff; /* Save VBT info and mapping */ vbt = vbt_get(&vbt_rdev); @@ -267,7 +269,8 @@ static void soc_init(void *data) * default policy that doesn't honor boards' requirements. */ itss_snapshot_irq_polarities(GPIO_IRQ_START, GPIO_IRQ_END); - fsp_silicon_init(); + handoff = romstage_handoff_find_or_add(); + fsp_silicon_init(handoff->s3_resume); /* Restore GPIO IRQ polarities back to previous settings. */ itss_restore_irq_polarities(GPIO_IRQ_START, GPIO_IRQ_END); diff --git a/src/soc/intel/quark/chip.c b/src/soc/intel/quark/chip.c index 77fb1fda0c..150df1272c 100644 --- a/src/soc/intel/quark/chip.c +++ b/src/soc/intel/quark/chip.c @@ -17,6 +17,7 @@ #include <assert.h> #include <console/console.h> #include <device/device.h> +#include <romstage_handoff.h> #include <soc/ramstage.h> #include <soc/reg_access.h> @@ -101,6 +102,8 @@ static const struct reg_script thermal_init_script[] = { static void chip_init(void *chip_info) { + struct romstage_handoff *handoff; + /* Validate the temperature settings */ ASSERT(PLATFORM_CATASTROPHIC_TRIP_CELSIUS <= 255); ASSERT(PLATFORM_CATASTROPHIC_TRIP_CELSIUS @@ -117,7 +120,8 @@ static void chip_init(void *chip_info) | TS_LOCK_AUX_TRIP_PT_REGS_ENABLE)); /* Perform silicon specific init. */ - fsp_silicon_init(); + handoff = romstage_handoff_find_or_add(); + fsp_silicon_init(handoff->s3_resume); } static void pci_domain_set_resources(device_t dev) diff --git a/src/soc/intel/skylake/chip_fsp20.c b/src/soc/intel/skylake/chip_fsp20.c index 49569d9617..582cdbf31d 100644 --- a/src/soc/intel/skylake/chip_fsp20.c +++ b/src/soc/intel/skylake/chip_fsp20.c @@ -25,6 +25,7 @@ #include <device/pci.h> #include <fsp/api.h> #include <fsp/util.h> +#include <romstage_handoff.h> #include <soc/acpi.h> #include <soc/interrupt.h> #include <soc/irq.h> @@ -34,8 +35,13 @@ void soc_init_pre_device(void *chip_info) { + struct romstage_handoff *handoff; + + /* Get S3 status to pass to silicon init. */ + handoff = romstage_handoff_find_or_add(); + /* Perform silicon specific init. */ - fsp_silicon_init(); + fsp_silicon_init(handoff->s3_resume); } static void pci_domain_set_resources(device_t dev) |