commit 0ffbd235fea6c7224798f00811246f9efc21afc8
author Mary Ruthven <mruthven@chromium.org> Tue Dec 21 14:00:00 2021
committer Commit Bot <commit-bot@chromium.org> Wed Dec 22 05:35:24 2021
tree 980c6a1e9ba15f7721481dd8df2390549bbff6cf
parent bc3bb265b7315a187ea5e5067f7e50c4469416c7

Enable counter increment support

New coreboot features require TPM to be able to support the NV index
increment command. This patch enables this support.

BUG=b:210930658
TEST=manual
	modify trunksd.conf and tpm_manager.conf to prevent them from
	automatically starting on boot.

	# clear tpm owner
	AP > crossystem clear_tpm_owner_request=1; reboot

	# Attempt to define the index
	AP > tpmc def 0x100e 0x8 0x40014

Change-Id: I9e90cc71a79fd78566b0a25935d918266ba93f86
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/tpm2/+/3352024
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
Auto-Submit: Mary Ruthven <mruthven@chromium.org>
Reviewed-by: Andrey Pronin <apronin@chromium.org>
Tested-by: Mary Ruthven <mruthven@chromium.org>
Commit-Queue: Andrey Pronin <apronin@chromium.org>

Implementation.h

diff --git a/Implementation.h b/Implementation.h
index 767a652..c12188d 100644
--- a/Implementation.h
+++ b/Implementation.h
@@ -215,7 +215,7 @@
 #define    CC_NV_DefineSpace                 CC_SET((CC_S_ALL_MUST | CC_S_COREBOOT))
 #define    CC_NV_Extend                      CC_SET(CC_S_CROS_TCG)
 #define    CC_NV_GlobalWriteLock             CC_SET(CC_S_OPTIONAL)
-#define    CC_NV_Increment                   CC_SET(CC_S_WIN_TCG)
+#define    CC_NV_Increment                   CC_SET((CC_S_ALL_MUST | CC_S_COREBOOT))
 #define    CC_NV_Read                        CC_SET((CC_S_ALL_MUST | CC_S_COREBOOT))
 #define    CC_NV_ReadLock                    CC_SET(CC_S_CROS_TCG)
 #define    CC_NV_ReadPublic                  CC_SET(CC_S_ALL_MUST)