<p>Philipp Deppenwiese <strong>merged</strong> this change.</p><p><a href="https://review.coreboot.org/28749">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  build bot (Jenkins): Verified
  Aaron Durbin: Looks good to me, approved
  Furquan Shaikh: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">tpm2/tlcl_send_startup: correct TPM2_Startup error logic<br><br>BUG=b:114018226<br>TEST=compile coreboot<br><br>Change-Id: Iffad582d5c19252dde1c9dc97fc7fd145944a3b3<br>Signed-off-by: Joel Kitching <kitching@google.com><br>Reviewed-on: https://review.coreboot.org/28749<br>Tested-by: build bot (Jenkins) <no-reply@coreboot.org><br>Reviewed-by: Aaron Durbin <adurbin@chromium.org><br>Reviewed-by: Furquan Shaikh <furquan@google.com><br>---<br>M src/security/tpm/tss/tcg-2.0/tss.c<br>1 file changed, 6 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/security/tpm/tss/tcg-2.0/tss.c b/src/security/tpm/tss/tcg-2.0/tss.c</span><br><span>index 7db746f..e6ec57c 100644</span><br><span>--- a/src/security/tpm/tss/tcg-2.0/tss.c</span><br><span>+++ b/src/security/tpm/tss/tcg-2.0/tss.c</span><br><span>@@ -61,14 +61,13 @@</span><br><span>   startup.startup_type = type;</span><br><span>         response = tpm_process_command(TPM2_Startup, &startup);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (response && response->hdr.tpm_code &&</span><br><span style="color: hsl(0, 100%, 40%);">-        (response->hdr.tpm_code != TPM_RC_INITIALIZE)) {</span><br><span style="color: hsl(0, 100%, 40%);">-         printk(BIOS_INFO, "%s: Startup return code is %x\n",</span><br><span style="color: hsl(0, 100%, 40%);">-                 __func__, response->hdr.tpm_code);</span><br><span style="color: hsl(0, 100%, 40%);">-            return TPM_E_IOERROR;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (response && (response->hdr.tpm_code == 0 ||</span><br><span style="color: hsl(120, 100%, 40%);">+                     response->hdr.tpm_code == TPM_RC_INITIALIZE)) {</span><br><span style="color: hsl(120, 100%, 40%);">+           return TPM_SUCCESS;</span><br><span>  }</span><br><span style="color: hsl(0, 100%, 40%);">-       return TPM_SUCCESS;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+   printk(BIOS_INFO, "%s: Startup return code is %x\n",</span><br><span style="color: hsl(120, 100%, 40%);">+               __func__, response->hdr.tpm_code);</span><br><span style="color: hsl(120, 100%, 40%);">+  return TPM_E_IOERROR;</span><br><span> }</span><br><span> </span><br><span> uint32_t tlcl_resume(void)</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/28749">change 28749</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/28749"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: Iffad582d5c19252dde1c9dc97fc7fd145944a3b3 </div>
<div style="display:none"> Gerrit-Change-Number: 28749 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: Joel Kitching <kitching@google.com> </div>
<div style="display:none"> Gerrit-Reviewer: Aaron Durbin <adurbin@chromium.org> </div>
<div style="display:none"> Gerrit-Reviewer: Andrey Pronin <apronin@chromium.org> </div>
<div style="display:none"> Gerrit-Reviewer: Furquan Shaikh <furquan@google.com> </div>
<div style="display:none"> Gerrit-Reviewer: Joel Kitching <kitching@google.com> </div>
<div style="display:none"> Gerrit-Reviewer: Julius Werner <jwerner@chromium.org> </div>
<div style="display:none"> Gerrit-Reviewer: Paul Menzel <paulepanter@users.sourceforge.net> </div>
<div style="display:none"> Gerrit-Reviewer: Philipp Deppenwiese <zaolin.daisuki@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org> </div>