<p>Joel Kitching has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/29026">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">tpm: clean up tpm_setup function flow<br><br>Introduce two helper functions for more readable code.<br><br>BUG=None<br>TEST=None<br><br>Change-Id: Ibea44880683a301e82ee2ba049003c36fcb44eba<br>Signed-off-by: Joel Kitching <kitching@google.com><br>---<br>M src/security/tpm/tspi/tspi.c<br>1 file changed, 37 insertions(+), 25 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/26/29026/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/security/tpm/tspi/tspi.c b/src/security/tpm/tspi/tspi.c</span><br><span>index e882857..73722bd 100644</span><br><span>--- a/src/security/tpm/tspi/tspi.c</span><br><span>+++ b/src/security/tpm/tspi/tspi.c</span><br><span>@@ -64,6 +64,41 @@</span><br><span> }</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static uint32_t tpm_setup_epilogue(uint32_t result)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+   if (result != TPM_SUCCESS)</span><br><span style="color: hsl(120, 100%, 40%);">+            post_code(POST_TPM_FAILURE);</span><br><span style="color: hsl(120, 100%, 40%);">+  else</span><br><span style="color: hsl(120, 100%, 40%);">+          printk(BIOS_INFO, "TPM: setup succeeded\n");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+      return result;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static uint32_t tpm_setup_s3_helper(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+     result = tlcl_resume();</span><br><span style="color: hsl(120, 100%, 40%);">+       switch (result) {</span><br><span style="color: hsl(120, 100%, 40%);">+     case TPM_SUCCESS:</span><br><span style="color: hsl(120, 100%, 40%);">+             break;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+      case TPM_E_INVALID_POSTINIT:</span><br><span style="color: hsl(120, 100%, 40%);">+          /*</span><br><span style="color: hsl(120, 100%, 40%);">+             * We're on a platform where the TPM maintains power</span><br><span style="color: hsl(120, 100%, 40%);">+               * in S3, so it's already initialized.</span><br><span style="color: hsl(120, 100%, 40%);">+             */</span><br><span style="color: hsl(120, 100%, 40%);">+           printk(BIOS_INFO, "TPM: Already initialized.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+           result = TPM_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+         break;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+      default:</span><br><span style="color: hsl(120, 100%, 40%);">+              printk(BIOS_ERR, "TPM: Resume failed (%d).\n", result);</span><br><span style="color: hsl(120, 100%, 40%);">+             break;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+      }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   return result;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*</span><br><span>  * tpm_setup starts the TPM and establishes the root of trust for the</span><br><span>  * anti-rollback mechanism.  SetupTPM can fail for three reasons.  1 A bug. 2 a</span><br><span>@@ -96,25 +131,7 @@</span><br><span> </span><br><span>      /* Handle special init for S3 resume path */</span><br><span>         if (s3flag) {</span><br><span style="color: hsl(0, 100%, 40%);">-           result = tlcl_resume();</span><br><span style="color: hsl(0, 100%, 40%);">-         switch (result) {</span><br><span style="color: hsl(0, 100%, 40%);">-               case TPM_SUCCESS:</span><br><span style="color: hsl(0, 100%, 40%);">-                       break;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-          case TPM_E_INVALID_POSTINIT:</span><br><span style="color: hsl(0, 100%, 40%);">-                    /*</span><br><span style="color: hsl(0, 100%, 40%);">-                       * We're on a platform where the TPM maintains power</span><br><span style="color: hsl(0, 100%, 40%);">-                         * in S3, so it's already initialized.</span><br><span style="color: hsl(0, 100%, 40%);">-                       */</span><br><span style="color: hsl(0, 100%, 40%);">-                     printk(BIOS_INFO, "TPM: Already initialized.\n");</span><br><span style="color: hsl(0, 100%, 40%);">-                     result = TPM_SUCCESS;</span><br><span style="color: hsl(0, 100%, 40%);">-                   break;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-          default:</span><br><span style="color: hsl(0, 100%, 40%);">-                        printk(BIOS_ERR, "TPM: Resume failed.\n");</span><br><span style="color: hsl(0, 100%, 40%);">-                    break;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-          }</span><br><span style="color: hsl(120, 100%, 40%);">+             result = tpm_setup_s3_helper();</span><br><span>              goto out;</span><br><span>    }</span><br><span> </span><br><span>@@ -154,12 +171,7 @@</span><br><span> #endif</span><br><span> </span><br><span> out:</span><br><span style="color: hsl(0, 100%, 40%);">-      if (result != TPM_SUCCESS)</span><br><span style="color: hsl(0, 100%, 40%);">-              post_code(POST_TPM_FAILURE);</span><br><span style="color: hsl(0, 100%, 40%);">-    else</span><br><span style="color: hsl(0, 100%, 40%);">-            printk(BIOS_INFO, "TPM: setup succeeded\n");</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-  return result;</span><br><span style="color: hsl(120, 100%, 40%);">+        return tpm_setup_epilogue(result);</span><br><span> }</span><br><span> </span><br><span> uint32_t tpm_clear_and_reenable(void)</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/29026">change 29026</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/29026"/><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: Ibea44880683a301e82ee2ba049003c36fcb44eba </div>
<div style="display:none"> Gerrit-Change-Number: 29026 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Joel Kitching <kitching@google.com> </div>