commit f97ff0cd503eb254432848e0f6ec6b6c2a15ce47
author Joel Kitching <kitching@google.com> Wed Sep 26 17:52:54 2018 +0800
committer Philipp Deppenwiese <zaolin.daisuki@gmail.com> Fri Oct 05 03:47:22 2018 +0000
tree 310d308b004fa0451ada15dbadbae2143fe3533c
parent 7aa44522f29fd18ed165756887586dc9981445f7

tpm2/tlcl_send_startup: correct TPM2_Startup error logic

BUG=b:114018226
TEST=compile coreboot

Change-Id: Iffad582d5c19252dde1c9dc97fc7fd145944a3b3
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://review.coreboot.org/28749
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>

src/security/tpm/tss/tcg-2.0/tss.c

diff --git a/src/security/tpm/tss/tcg-2.0/tss.c b/src/security/tpm/tss/tcg-2.0/tss.c
index 7db746f..e6ec57c 100644
--- a/src/security/tpm/tss/tcg-2.0/tss.c
+++ b/src/security/tpm/tss/tcg-2.0/tss.c
@@ -61,14 +61,13 @@
 	startup.startup_type = type;
 	response = tpm_process_command(TPM2_Startup, &startup);
 
-	if (response && response->hdr.tpm_code &&
-	    (response->hdr.tpm_code != TPM_RC_INITIALIZE)) {
-		printk(BIOS_INFO, "%s: Startup return code is %x\n",
-		       __func__, response->hdr.tpm_code);
-		return TPM_E_IOERROR;
+	if (response && (response->hdr.tpm_code == 0 ||
+			 response->hdr.tpm_code == TPM_RC_INITIALIZE)) {
+		return TPM_SUCCESS;
 	}
-	return TPM_SUCCESS;
-
+	printk(BIOS_INFO, "%s: Startup return code is %x\n",
+	       __func__, response->hdr.tpm_code);
+	return TPM_E_IOERROR;
 }
 
 uint32_t tlcl_resume(void)