<p>Youness Alaoui has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/23680">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">intel/fsp: Fix TPM initialization when vboot is disabled<br><br>A change introduced by commit fe4983e5 [1] in order to prevent<br>re-initialization of the TPM if already setup in verstage<br>had the wrong logic in the if statement, causing the TPM<br>to never be initialized if vboot is disabled.<br><br>The RESUME_PATH_SAME_AS_BOOT config is enabled by default for<br>ARCH_X86 and therefore the if statement would be false. The<br>behavior that was intended was probably meant to use an OR<br>instead of an AND.<br><br>[1] https://review.coreboot.org/#/c/coreboot/+/14106/<br><br>Change-Id: Ic43d1aa31a296386c7eab6d997f9b701e9ea0fe5<br>Signed-off-by: Youness Alaoui <youness.alaoui@puri.sm><br>---<br>M src/drivers/intel/fsp1_1/romstage.c<br>1 file changed, 2 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/80/23680/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/drivers/intel/fsp1_1/romstage.c b/src/drivers/intel/fsp1_1/romstage.c</span><br><span>index 69ea786..6c80ce7 100644</span><br><span>--- a/src/drivers/intel/fsp1_1/romstage.c</span><br><span>+++ b/src/drivers/intel/fsp1_1/romstage.c</span><br><span>@@ -172,8 +172,8 @@</span><br><span>        * in verstage and used to verify romstage.</span><br><span>   */</span><br><span>  if (IS_ENABLED(CONFIG_LPC_TPM) &&</span><br><span style="color: hsl(0, 100%, 40%);">-           !IS_ENABLED(CONFIG_RESUME_PATH_SAME_AS_BOOT) &&</span><br><span style="color: hsl(0, 100%, 40%);">-         !IS_ENABLED(CONFIG_VBOOT_STARTS_IN_BOOTBLOCK))</span><br><span style="color: hsl(120, 100%, 40%);">+        (!IS_ENABLED(CONFIG_RESUME_PATH_SAME_AS_BOOT) ||</span><br><span style="color: hsl(120, 100%, 40%);">+       !IS_ENABLED(CONFIG_VBOOT_STARTS_IN_BOOTBLOCK)))</span><br><span>                 init_tpm(params->power_state->prev_sleep_state ==</span><br><span>                       ACPI_S3);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/23680">change 23680</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/23680"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ic43d1aa31a296386c7eab6d997f9b701e9ea0fe5 </div>
<div style="display:none"> Gerrit-Change-Number: 23680 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Youness Alaoui <snifikino@gmail.com> </div>