GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vboot: Stop creating backup space in TPM 

There is no code which uses the backup space in TPM created for vboot
nvram.

All chromebooks currently supported at the trunk store vboot nvram
in flash directly or as a backup.

BUG=chrome-os-partner:47915
BRANCH=none
TEST=emerge-samus coreboot

Change-Id: I9445dfd822826d668b3bfed8ca50dc9386f2b2b0
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: 5cee2d54c96ad7952af2a2c1f773ba09c5248f41
Original-Change-Id: Ied0cec0ed489df3b39f6b9afd3941f804557944f
Original-Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/395507
Original-Reviewed-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://review.coreboot.org/16997
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Martin Roth <martinroth@google.com>
This commit is contained in:
Daisuke Nojiri 2016-10-07 13:59:36 -07:00 committed by Patrick Georgi
parent 165af1c5c2
commit 03bf301d82
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/antirollback.h
View File

@ -17,8 +17,8 @@ enum vb2_pcr_digest;
/* TPM NVRAM location indices. */ /* TPM NVRAM location indices. */
#define FIRMWARE_NV_INDEX 0x1007 #define FIRMWARE_NV_INDEX 0x1007
#define KERNEL_NV_INDEX 0x1008 #define KERNEL_NV_INDEX 0x1008
/* This is just an opaque space for backup purposes */ /* 0x1009 used to be used as a backup space. Think of conflicts if you
#define BACKUP_NV_INDEX 0x1009 * want to use 0x1009 for something else. */
/* Structure definitions for TPM spaces */ /* Structure definitions for TPM spaces */

5
src/vboot/secdata_tpm.c
View File

@ -245,11 +245,6 @@ static uint32_t _factory_initialize_tpm(struct vb2_context *ctx)
VBDEBUG("TPM: Clearing owner\n"); VBDEBUG("TPM: Clearing owner\n");
RETURN_ON_FAILURE(tpm_clear_and_reenable()); RETURN_ON_FAILURE(tpm_clear_and_reenable());
/* Define the backup space. No need to initialize it, though. */
RETURN_ON_FAILURE(safe_define_space(BACKUP_NV_INDEX,
TPM_NV_PER_PPWRITE,
VB2_NVDATA_SIZE));
/* Define and initialize the kernel space */ /* Define and initialize the kernel space */
RETURN_ON_FAILURE(safe_define_space(KERNEL_NV_INDEX, RETURN_ON_FAILURE(safe_define_space(KERNEL_NV_INDEX,
TPM_NV_PER_PPWRITE, TPM_NV_PER_PPWRITE,