[coreboot-gerrit] Change in coreboot[master]: trogdor: QCSDI loading depends on VB2_GBB_FLAG_FAFT_KEY_OVERIDE setting

[mturney mturney (Code Review)]

Hello [e-mail],

I'd like you to do a code review. Please visit

https://review.coreboot.org/c/coreboot/+/36518

to review the following change.

Change subject: trogdor: QCSDI loading depends on VB2_GBB_FLAG_FAFT_KEY_OVERIDE setting
......................................................................

trogdor: QCSDI loading depends on VB2_GBB_FLAG_FAFT_KEY_OVERIDE setting

Change-Id: I63f35c94bc6c60934ace5fe0fd9176443059b354
Signed-off-by: Ashwin Kumar 
---
M src/soc/qualcomm/common/qclib.c
M src/soc/qualcomm/sc7180/Makefile.inc
2 files changed, 15 insertions(+), 10 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/18/36518/1

diff --git a/src/soc/qualcomm/common/qclib.c b/src/soc/qualcomm/common/qclib.c
index ac80a76..7f3dfa8 100644
--- a/src/soc/qualcomm/common/qclib.c
+++ b/src/soc/qualcomm/common/qclib.c
@@ -26,6 +26,7 @@
 #include <soc/mmu_common.h>
 #include <soc/qclib_common.h>
 #include <soc/symbols_common.h>
+#include <security/vboot/gbb.h>

struct qclib_cb_if_table qclib_cb_if_table = {
    .magic = QCLIB_MAGIC_NUMBER,
@@ -158,19 +159,22 @@
    		QCLIB_GA_ENABLE_UART_LOGGING;

if (CONFIG(QC_SDI_ENABLE)) {
-		struct prog qcsdi =
-			PROG_INIT(PROG_REFCODE, CONFIG_CBFS_PREFIX "/qcsdi");
+		if(!(gbb_is_flag_set(VB2_GBB_FLAG_FAFT_KEY_OVERIDE))) { 
+			struct prog qcsdi = 
+				PROG_INIT(PROG_REFCODE, 
+					CONFIG_CBFS_PREFIX "/qcsdi");

-		/* Attempt to load QCSDI elf */
-		if (prog_locate(&qcsdi))
-			goto fail;
+			/* Attempt to load QCSDI elf */
+			if (prog_locate(&qcsdi))
+				goto fail;

-		if (cbfs_prog_stage_load(&qcsdi))
-			goto fail;
+			if (cbfs_prog_stage_load(&qcsdi))
+				goto fail;

-		qclib_add_if_table_entry(QCLIB_TE_QCSDI, prog_entry(&qcsdi),
-				   prog_size(&qcsdi), 0);
-		printk(BIOS_INFO, "qcsdi.entry[%p]\n", qcsdi.entry);
+			qclib_add_if_table_entry(QCLIB_TE_QCSDI,
+				prog_entry(&qcsdi), prog_size(&qcsdi), 0);
+			printk(BIOS_INFO, "qcsdi.entry[%p]\n", qcsdi.entry);
+		}
    }

dump_te_table();
diff --git a/src/soc/qualcomm/sc7180/Makefile.inc b/src/soc/qualcomm/sc7180/Makefile.inc
index 66cb35c..695ab88 100644
--- a/src/soc/qualcomm/sc7180/Makefile.inc
+++ b/src/soc/qualcomm/sc7180/Makefile.inc
@@ -40,6 +40,7 @@
 romstage-y += qcom_qup_se.c
 romstage-$(CONFIG_DRIVERS_UART) += uart.c
 romstage-$(CONFIG_SC7180_QSPI) += qspi.c
+romstage-$(CONFIG_QC_SDI_ENABLE) += ../../../security/vboot/gbb.c

################################################################################
 ramstage-y += soc.c