From 3c0399f84a55c9b9341a62d405c58ccfb0989b0a Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Wed, 20 Jul 2016 14:58:45 -0500 Subject: [PATCH] UPSTREAM: soc/intel/apollolake: die() when FSP silicon init fails The reset requests are handled in the FSP 2.0 wrapper, but the current code doesn't check any non-successful return values. Provide parity with the memory init path which die()s under those circumstances. BUG=None BRANCH=None TEST=None Change-Id: I9df61323f742b4e94294321e3ca3ab58a68ca4dd Original-Signed-off-by: Aaron Durbin Original-Reviewed-on: https://review.coreboot.org/15766 Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Andrey Petrov Original-Reviewed-by: Furquan Shaikh Original-Reviewed-by: Paul Menzel Signed-off-by: Aaron Durbin Reviewed-on: https://chromium-review.googlesource.com/362687 Reviewed-by: Furquan Shaikh --- src/soc/intel/apollolake/chip.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c index 60cdb50753..c71e59a26c 100644 --- a/src/soc/intel/apollolake/chip.c +++ b/src/soc/intel/apollolake/chip.c @@ -201,7 +201,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(); + if (fsp_silicon_init() != FSP_SUCCESS) + die("FSP silicon init failed. Giving up."); /* Restore GPIO IRQ polarities back to previous settings. */ itss_restore_irq_polarities(GPIO_IRQ_START, GPIO_IRQ_END);