Change in coreboot[master]: Revert "security/vboot: Add NVRAM counter for TPM 2.0"

[Raul Rangel (Code Review)]

Raul Rangel has submitted this change. ( https://review.coreboot.org/c/coreboot/+/60030 )

Change subject: Revert "security/vboot: Add NVRAM counter for TPM 2.0"
......................................................................

Revert "security/vboot: Add NVRAM counter for TPM 2.0"

This reverts commit 7dce19080889955576f8fd197658077aced96a96.

Reason for revert: Unable to boot in factory mode

Change-Id: I1b51010080164c6e28d77a932f77c10006fd4153
Signed-off-by: Tim Wawrzynczak 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/60030
Tested-by: build bot (Jenkins) 
Reviewed-by: Julius Werner 
Reviewed-by: Raul Rangel 
Reviewed-by: Karthik Ramasubramanian 
---
M src/security/vboot/antirollback.h
M src/security/vboot/secdata_tpm.c
2 files changed, 0 insertions(+), 29 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Julius Werner: Looks good to me, approved
  Raul Rangel: Looks good to me, approved
  Karthik Ramasubramanian: Looks good to me, approved

diff --git a/src/security/vboot/antirollback.h b/src/security/vboot/antirollback.h
index 71605fa..75bfcdc 100644
--- a/src/security/vboot/antirollback.h
+++ b/src/security/vboot/antirollback.h
@@ -28,7 +28,6 @@
 /* 0x100d: Hash of MRC_CACHE training data for non-recovery boot */
 #define MRC_RW_HASH_NV_INDEX            0x100d
 #define HASH_NV_SIZE                    VB2_SHA256_DIGEST_SIZE
-#define ENT_ROLLBACK_COUNTER_INDEX      0x100e
 /* Widevine Secure Counter space */
 #define WIDEVINE_COUNTER_NV_INDEX(n)	(0x3000 + (n))
 #define NUM_WIDEVINE_COUNTERS		4
diff --git a/src/security/vboot/secdata_tpm.c b/src/security/vboot/secdata_tpm.c
index 6d8e281..847a959 100644
--- a/src/security/vboot/secdata_tpm.c
+++ b/src/security/vboot/secdata_tpm.c
@@ -116,17 +116,6 @@
    .TPMA_NV_WRITE_STCLEAR = 1,
 };

-const static TPMA_NV rw_counter_attributes = {
-	.TPMA_NV_AUTHWRITE = 1,
-	.TPMA_NV_AUTHREAD = 1,
-	.TPMA_NV_PPREAD = 1,
-	.TPMA_NV_PPWRITE = 1,
-	.TPMA_NV_PLATFORMCREATE = 1,
-	.TPMA_NV_COUNTER = 1,
-	.TPMA_NV_NO_DA = 1,
-	.TPMA_NV_WRITE_STCLEAR = 1,
-};
-
 static const TPMA_NV fwmp_attr = {
    .TPMA_NV_PLATFORMCREATE = 1,
    .TPMA_NV_OWNERWRITE = 1,
@@ -353,15 +342,6 @@
    return rv;
 }

-static uint32_t enterprise_rollback_create_counter(void)
-{
-	/*
-	 * No need to increment the counter to initialize, this can be done later.
-	 */
-	return tlcl_define_space(ENT_ROLLBACK_COUNTER_INDEX, /*size=*/8,
-				 rw_counter_attributes, NULL, 0);
-}
-
 static uint32_t setup_widevine_counter_spaces(void)
 {
    uint32_t index, rv;
@@ -408,14 +388,6 @@
    			   CONFIG(MAINBOARD_HAS_I2C_TPM_CR50))))
    	RETURN_ON_FAILURE(setup_zte_spaces());

-	/*
-	 * On TPM 2.0, create a counter that survives TPM clear. This allows to
-	 * securely lock data during enterprise rollback by binding to this
-	 * counter's value.
-	 */
-	if (CONFIG(CHROMEOS))
-		RETURN_ON_FAILURE(enterprise_rollback_create_counter());
-
    /* Define widevine counter space. No need to increment/write to the secure counters
       and are expected to be incremented during the first use. */
    if (CONFIG(VBOOT_DEFINE_WIDEVINE_COUNTERS))