[coreboot-gerrit] Change in coreboot[master]: intel/fsp: Fix TPM initialization when vboot is disabled

[Youness Alaoui (Code Review)]

Youness Alaoui has uploaded this change for review. ( https://review.coreboot.org/23680

Change subject: intel/fsp: Fix TPM initialization when vboot is disabled
......................................................................

intel/fsp: Fix TPM initialization when vboot is disabled

A change introduced by commit fe4983e5 [1] in order to prevent
re-initialization of the TPM if already setup in verstage
had the wrong logic in the if statement, causing the TPM
to never be initialized if vboot is disabled.

The RESUME_PATH_SAME_AS_BOOT config is enabled by default for
ARCH_X86 and therefore the if statement would be false. The
behavior that was intended was probably meant to use an OR
instead of an AND.

[1] https://review.coreboot.org/#/c/coreboot/+/14106/

Change-Id: Ic43d1aa31a296386c7eab6d997f9b701e9ea0fe5
Signed-off-by: Youness Alaoui 
---
M src/drivers/intel/fsp1_1/romstage.c
1 file changed, 2 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/80/23680/1

diff --git a/src/drivers/intel/fsp1_1/romstage.c b/src/drivers/intel/fsp1_1/romstage.c
index 69ea786..6c80ce7 100644
--- a/src/drivers/intel/fsp1_1/romstage.c
+++ b/src/drivers/intel/fsp1_1/romstage.c
@@ -172,8 +172,8 @@
     * in verstage and used to verify romstage.
     */
    if (IS_ENABLED(CONFIG_LPC_TPM) &&
-	    !IS_ENABLED(CONFIG_RESUME_PATH_SAME_AS_BOOT) &&
-	    !IS_ENABLED(CONFIG_VBOOT_STARTS_IN_BOOTBLOCK))
+	    (!IS_ENABLED(CONFIG_RESUME_PATH_SAME_AS_BOOT) ||
+	     !IS_ENABLED(CONFIG_VBOOT_STARTS_IN_BOOTBLOCK)))
    	init_tpm(params->power_state->prev_sleep_state ==
    		 ACPI_S3);
 }