Marshall Dawson has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/36111 )
Change subject: drivers/intel/fsp2_0: Make vbt_get() conditional ......................................................................
drivers/intel/fsp2_0: Make vbt_get() conditional
Skip calling vbt_get() if FSP is not supposed to run GOP.
Change-Id: I6b8cd3646ffcd6df39229d4e36b315dfb7a8c859 Signed-off-by: Marshall Dawson marshalldawson3rd@gmail.com --- M src/drivers/intel/fsp2_0/silicon_init.c 1 file changed, 5 insertions(+), 8 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/11/36111/1
diff --git a/src/drivers/intel/fsp2_0/silicon_init.c b/src/drivers/intel/fsp2_0/silicon_init.c index ecc6e96..88ec88a 100644 --- a/src/drivers/intel/fsp2_0/silicon_init.c +++ b/src/drivers/intel/fsp2_0/silicon_init.c @@ -70,15 +70,12 @@ /* Handle any errors returned by FspSiliconInit */ fsp_handle_reset(status); if (status != FSP_SUCCESS) { - if (vbt_get()) { - /* Attempted to initialize graphics. Assume failure - * is related to a video failure. - */ + /* Assume video failure if attempted to initialize graphics */ + if (CONFIG(RUN_FSP_GOP) && vbt_get()) postcode = POST_VIDEO_FAILURE; - } else { - /* Other silicon initialization failed */ - postcode = POST_HW_INIT_FAILURE; - } + else + postcode = POST_HW_INIT_FAILURE; /* else generic */ + printk(BIOS_SPEW, "FspSiliconInit returned 0x%08x\n", status); die_with_post_code(postcode, "FspSiliconInit returned an error!\n");
Martin Roth has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36111 )
Change subject: drivers/intel/fsp2_0: Make vbt_get() conditional ......................................................................
Patch Set 1: Code-Review+2
Martin Roth has submitted this change. ( https://review.coreboot.org/c/coreboot/+/36111 )
Change subject: drivers/intel/fsp2_0: Make vbt_get() conditional ......................................................................
drivers/intel/fsp2_0: Make vbt_get() conditional
Skip calling vbt_get() if FSP is not supposed to run GOP.
Change-Id: I6b8cd3646ffcd6df39229d4e36b315dfb7a8c859 Signed-off-by: Marshall Dawson marshalldawson3rd@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/36111 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Martin Roth martinroth@google.com --- M src/drivers/intel/fsp2_0/silicon_init.c 1 file changed, 5 insertions(+), 8 deletions(-)
Approvals: build bot (Jenkins): Verified Martin Roth: Looks good to me, approved
diff --git a/src/drivers/intel/fsp2_0/silicon_init.c b/src/drivers/intel/fsp2_0/silicon_init.c index ecc6e96..88ec88a 100644 --- a/src/drivers/intel/fsp2_0/silicon_init.c +++ b/src/drivers/intel/fsp2_0/silicon_init.c @@ -70,15 +70,12 @@ /* Handle any errors returned by FspSiliconInit */ fsp_handle_reset(status); if (status != FSP_SUCCESS) { - if (vbt_get()) { - /* Attempted to initialize graphics. Assume failure - * is related to a video failure. - */ + /* Assume video failure if attempted to initialize graphics */ + if (CONFIG(RUN_FSP_GOP) && vbt_get()) postcode = POST_VIDEO_FAILURE; - } else { - /* Other silicon initialization failed */ - postcode = POST_HW_INIT_FAILURE; - } + else + postcode = POST_HW_INIT_FAILURE; /* else generic */ + printk(BIOS_SPEW, "FspSiliconInit returned 0x%08x\n", status); die_with_post_code(postcode, "FspSiliconInit returned an error!\n");
-
Marshall Dawson (Code Review) -
Martin Roth (Code Review)