commit cce6d13aa733d9224dd538f60fed691e2fb2780b
author Jon Murphy <jpmurphy@google.com> Wed Sep 20 10:43:07 2023 -0600
committer Felix Held <felix-coreboot@felixheld.de> Fri Sep 22 18:41:35 2023 +0000
tree b0b2e4abf00113bc6d6b2420fe0ae7a28b2fe90c
parent ddfe71953841a950a63fd1aa22e25624812c7a28

security/tpm: Remove unnecessary tss_common.h

Remove the unnecessary tss_common.h header from the repo.
tss_errors.h is a more appropriate place for the TPM_SUCCESS
value, and the other define is only used by tpm_common.c and
can be placed there.

BUG=b:296439237
TEST=Builds

Change-Id: I99cf90f244a75c1eeab5e9e1500e05c24ae0a8e5
Signed-off-by: Jon Murphy <jpmurphy@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/78033
Reviewed-by: Tim Van Patten <timvp@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>

src/security/tpm/tss.h

diff --git a/src/security/tpm/tss.h b/src/security/tpm/tss.h
index a85503d..fa8cf52 100644
--- a/src/security/tpm/tss.h
+++ b/src/security/tpm/tss.h
@@ -12,7 +12,6 @@
 #include <types.h>
 #include <vb2_sha.h>
 
-#include <security/tpm/tss/common/tss_common.h>
 #include <security/tpm/tss_errors.h>
 #include <security/tpm/tss/vendor/cr50/cr50.h>
 

src/security/tpm/tss/common/tss_common.h

diff --git a/src/security/tpm/tss/common/tss_common.h b/src/security/tpm/tss/common/tss_common.h
deleted file mode 100644
index 419e429..0000000
--- a/src/security/tpm/tss/common/tss_common.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#ifndef TCG_TSS_COMMON_H_
-#define TCG_TSS_COMMON_H_
-
-#include <stdint.h>
-
-#define TPM_PCR_MINIMUM_DIGEST_SIZE 20
-#define TPM_SUCCESS ((uint32_t)0x00000000)
-
-#endif /* TCG_TSS_COMMON_H_ */

src/security/tpm/tss/tcg-1.2/tss_structures.h

diff --git a/src/security/tpm/tss/tcg-1.2/tss_structures.h b/src/security/tpm/tss/tcg-1.2/tss_structures.h
index 689bb4b..65b48f8 100644
--- a/src/security/tpm/tss/tcg-1.2/tss_structures.h
+++ b/src/security/tpm/tss/tcg-1.2/tss_structures.h
@@ -8,7 +8,7 @@
 #define TCG1_TSS_STRUCTURES_H_
 
 #include <stdint.h>
-#include "../common/tss_common.h"
+#include <security/tpm/tss_errors.h>
 
 #define TPM_MAX_COMMAND_SIZE 4096
 #define TPM_LARGE_ENOUGH_COMMAND_SIZE 256  /* saves space in the firmware */

src/security/tpm/tss/tcg-2.0/tss_structures.h

diff --git a/src/security/tpm/tss/tcg-2.0/tss_structures.h b/src/security/tpm/tss/tcg-2.0/tss_structures.h
index cb02830..a73f4c4 100644
--- a/src/security/tpm/tss/tcg-2.0/tss_structures.h
+++ b/src/security/tpm/tss/tcg-2.0/tss_structures.h
@@ -8,7 +8,7 @@
  * constants and structures needed for functions used in coreboot.
  */
 #include <types.h>
-#include "../common/tss_common.h"
+#include <security/tpm/tss_errors.h>
 
 /* This should be plenty for what firmware needs. */
 #define TPM_BUFFER_SIZE 256

src/security/tpm/tss_errors.h

diff --git a/src/security/tpm/tss_errors.h b/src/security/tpm/tss_errors.h
index 49a7405..b28210c 100644
--- a/src/security/tpm/tss_errors.h
+++ b/src/security/tpm/tss_errors.h
@@ -15,6 +15,7 @@
 #define TPM_E_BASE 0x0
 #define TPM_E_NON_FATAL 0x800
 
+#define TPM_SUCCESS                 ((uint32_t)0x00000000)
 #define TPM_E_AREA_LOCKED           ((uint32_t)0x0000003c)
 #define TPM_E_BADINDEX              ((uint32_t)0x00000002)
 #define TPM_E_BAD_PRESENCE          ((uint32_t)0x0000002d)

src/security/vboot/tpm_common.c

diff --git a/src/security/vboot/tpm_common.c b/src/security/vboot/tpm_common.c
index ad333c6..05685ad 100644
--- a/src/security/vboot/tpm_common.c
+++ b/src/security/vboot/tpm_common.c
@@ -7,6 +7,7 @@
 
 #define TPM_PCR_BOOT_MODE "VBOOT: boot mode"
 #define TPM_PCR_GBB_HWID_NAME "VBOOT: GBB HWID"
+#define TPM_PCR_MINIMUM_DIGEST_SIZE 20
 
 uint32_t vboot_setup_tpm(struct vb2_context *ctx)
 {