From 85a5b52b960cec095cd23e939e456983d83ad114 Mon Sep 17 00:00:00 2001 From: York Yang Date: Wed, 5 Oct 2016 09:32:46 -0700 Subject: [PATCH] UPSTREAM: soc/intel/fsp_broadwell_de: Remove the enforced fsp1.0 APIs call sequence The enforced FSP 1.0 APIs call was used to work around an fsp1.0 driver issue. As the issue has been addressed in fsp1.0 driver (Change 9780), remove the enforced workaround. Otherwise will see error message 'FSP API NotifyPhase failed' in serial log. Verified on Intel Camelback Mountain CRB and confirmed that the serial log error message regarding the 'FSP API NotifyPhase failed' is gone. BUG=None BRANCH=None TEST=None Signed-off-by: York Yang Reviewed-on: https://review.coreboot.org/16892 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth Change-Id: Iafa1d22e2476769fd841a3ebaa1ab4f9713c6c39 Reviewed-on: https://chromium-review.googlesource.com/396229 Commit-Ready: Furquan Shaikh Tested-by: Furquan Shaikh Reviewed-by: Aaron Durbin --- src/soc/intel/fsp_broadwell_de/chip.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/soc/intel/fsp_broadwell_de/chip.c b/src/soc/intel/fsp_broadwell_de/chip.c index 78649fc796..b8db395350 100644 --- a/src/soc/intel/fsp_broadwell_de/chip.c +++ b/src/soc/intel/fsp_broadwell_de/chip.c @@ -66,21 +66,9 @@ static void enable_dev(device_t dev) } } -static void fsp_notify(void *arg) -{ - FspNotify (*(uint32_t *)arg); -} - -static uint32_t gFspNotifyAfterPciEnumeration = EnumInitPhaseAfterPciEnumeration; -static uint32_t gFspNotifyReadtToBoot = EnumInitPhaseReadyToBoot; -static BOOT_STATE_CALLBACK(bscb_fspnotify1, fsp_notify, &gFspNotifyAfterPciEnumeration); -static BOOT_STATE_CALLBACK(bscb_fspnotify2, fsp_notify, &gFspNotifyReadtToBoot); - /* Called at BS_DEV_INIT_CHIPS time -- very early. Just after BS_PRE_DEVICE. */ static void soc_init(void *chip_info) { - boot_state_sched_on_exit(&bscb_fspnotify1, BS_DEV_RESOURCES); - boot_state_sched_on_exit(&bscb_fspnotify2, BS_PAYLOAD_LOAD); broadwell_de_init_pre_device(); }