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

vboot: Add option to skip TPM resume on S3 resume 

Change-Id: Ie4a98cc8af0dbcf09c7ace79668949ace5938c12
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/1752
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
This commit is contained in:
Stefan Reinauer 2012-09-19 11:10:15 -07:00 committed by Ronald G. Minnich
parent 6866c08129
commit c7fe280a29
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/vendorcode/google/chromeos/Kconfig
View File

@ -65,3 +65,12 @@ config FLASHMAP_OFFSET
Offset of flash map in firmware image Offset of flash map in firmware image
endmenu endmenu
config NO_TPM_RESUME
bool
default n
depends on CHROMEOS
help
On some boards the TPM stays powered up in S3. On those
boards, booting Windows will break if the TPM resume command
is sent during an S3 resume.

6
src/vendorcode/google/chromeos/vboot.c
View File

@ -39,6 +39,11 @@
#define TPM_E_NEEDS_SELFTEST ((u32)(TPM_E_NON_FATAL + 1)) #define TPM_E_NEEDS_SELFTEST ((u32)(TPM_E_NON_FATAL + 1))
#define TPM_E_DOING_SELFTEST ((u32)(TPM_E_NON_FATAL + 2)) #define TPM_E_DOING_SELFTEST ((u32)(TPM_E_NON_FATAL + 2))
#if CONFIG_NO_TPM_RESUME
static void init_vboot(int bootmode)
{
}
#else
static const struct { static const struct {
u8 buffer[12]; u8 buffer[12];
} tpm_resume_cmd = { } tpm_resume_cmd = {
@ -229,6 +234,7 @@ static void init_vboot(int bootmode)
printk(BIOS_ERR, "TPM: Error code 0x%x. Hard reset!\n", result); printk(BIOS_ERR, "TPM: Error code 0x%x. Hard reset!\n", result);
hard_reset(); hard_reset();
} }
#endif
void init_chromeos(int bootmode) void init_chromeos(int bootmode)
{ {