sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

security/vboot/sync_ec: Add timestamps

Browse Source 
Add 4 new timestamps to the EC software sync flow:
1) Beginning of EC software sync
2) EC finished calculating Vboot hash
3) EC is no longer requesting power limiting
4) End of EC software sync

BUG=none
BRANCH=none
TEST=verified timestamps show up in cbmem log

Change-Id: I6e5703c146b5ec27d01700fdb39cb3d2092ea8a8
Signed-off-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36209
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
This commit is contained in:
Tim Wawrzynczak
2019-10-25 14:59:43 -06:00
committed by Patrick Georgi
parent d6fc557b93
commit f9e74991d3
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/commonlib/include/commonlib/timestamp_serialized.h
View File

@ -79,6 +79,10 @@ enum timestamp_id {
TS_END_TPMPCR = 512, TS_END_TPMPCR = 512,
TS_START_TPMLOCK = 513, TS_START_TPMLOCK = 513,
TS_END_TPMLOCK = 514, TS_END_TPMLOCK = 514,
TS_START_EC_SYNC = 515,
TS_EC_HASH_READY = 516,
TS_EC_POWER_LIMIT_WAIT = 517,
TS_END_EC_SYNC = 518,
TS_START_COPYVPD = 550, TS_START_COPYVPD = 550,
TS_END_COPYVPD_RO = 551, TS_END_COPYVPD_RO = 551,
TS_END_COPYVPD_RW = 552, TS_END_COPYVPD_RW = 552,
@ -202,6 +206,11 @@ static const struct timestamp_id_to_name {
{ TS_END_COPYVPD_RO, "finished loading Chrome OS VPD (RO)" }, { TS_END_COPYVPD_RO, "finished loading Chrome OS VPD (RO)" },
{ TS_END_COPYVPD_RW, "finished loading Chrome OS VPD (RW)" }, { TS_END_COPYVPD_RW, "finished loading Chrome OS VPD (RW)" },
{ TS_START_EC_SYNC, "starting EC software sync" },
{ TS_EC_HASH_READY, "EC vboot hash ready" },
{ TS_EC_POWER_LIMIT_WAIT, "waiting for EC to allow higher power draw" },
{ TS_END_EC_SYNC, "finished EC software sync" },
{ TS_DC_START, "depthcharge start" }, { TS_DC_START, "depthcharge start" },
{ TS_RO_PARAMS_INIT, "RO parameter init" }, { TS_RO_PARAMS_INIT, "RO parameter init" },
{ TS_RO_VB_INIT, "RO vboot init" }, { TS_RO_VB_INIT, "RO vboot init" },

19
src/security/vboot/ec_sync.c
View File

@ -20,6 +20,7 @@
#include <security/vboot/vbnv.h> #include <security/vboot/vbnv.h>
#include <security/vboot/vboot_common.h> #include <security/vboot/vboot_common.h>
#include <timer.h> #include <timer.h>
#include <timestamp.h>
#include <vb2_api.h> #include <vb2_api.h>
#define _EC_FILENAME(select, suffix) \ #define _EC_FILENAME(select, suffix) \
@ -51,6 +52,8 @@ void vboot_sync_ec(void)
vb2_error_t retval = VB2_SUCCESS; vb2_error_t retval = VB2_SUCCESS;
struct vb2_context *ctx; struct vb2_context *ctx;
timestamp_add_now(TS_START_EC_SYNC);
ctx = vboot_get_context(); ctx = vboot_get_context();
ctx->flags |= VB2_CONTEXT_EC_SYNC_SUPPORTED; ctx->flags |= VB2_CONTEXT_EC_SYNC_SUPPORTED;
@ -61,6 +64,8 @@ void vboot_sync_ec(void)
printk(BIOS_ERR, "EC software sync failed (%#x), rebooting\n", retval); printk(BIOS_ERR, "EC software sync failed (%#x), rebooting\n", retval);
vboot_reboot(); vboot_reboot();
} }
timestamp_add_now(TS_END_EC_SYNC);
} }
/* Convert firmware image type into a flash offset */ /* Convert firmware image type into a flash offset */
@ -138,6 +143,8 @@ static vb2_error_t ec_hash_image(enum vb2_firmware_selection select,
} while (resp.status == EC_VBOOT_HASH_STATUS_BUSY && } while (resp.status == EC_VBOOT_HASH_STATUS_BUSY &&
!stopwatch_expired(&sw)); !stopwatch_expired(&sw));
timestamp_add_now(TS_EC_HASH_READY);
if (resp.status != EC_VBOOT_HASH_STATUS_DONE) { if (resp.status != EC_VBOOT_HASH_STATUS_DONE) {
printk(BIOS_ERR, "%s: Hash status not done: %d\n", __func__, printk(BIOS_ERR, "%s: Hash status not done: %d\n", __func__,
resp.status); resp.status);
@ -415,7 +422,6 @@ vb2_error_t vb2ex_ec_vboot_done(struct vb2_context *ctx)
int limit_power = 0; int limit_power = 0;
bool message_printed = false; bool message_printed = false;
struct stopwatch sw; struct stopwatch sw;
vb2_error_t rv = VB2_SUCCESS;
int in_recovery = !!(ctx->flags & VB2_CONTEXT_RECOVERY_MODE); int in_recovery = !!(ctx->flags & VB2_CONTEXT_RECOVERY_MODE);
/* /*
@ -425,15 +431,16 @@ vb2_error_t vb2ex_ec_vboot_done(struct vb2_context *ctx)
if (in_recovery) if (in_recovery)
return VB2_SUCCESS; return VB2_SUCCESS;
timestamp_add_now(TS_EC_POWER_LIMIT_WAIT);
stopwatch_init_msecs_expire(&sw, LIMIT_POWER_WAIT_TIMEOUT_MS); stopwatch_init_msecs_expire(&sw, LIMIT_POWER_WAIT_TIMEOUT_MS);
/* Ensure we have enough power to continue booting */ /* Ensure we have enough power to continue booting. */
while (1) { while (1) {
if (google_chromeec_read_limit_power_request(&limit_power)) { if (google_chromeec_read_limit_power_request(&limit_power)) {
printk(BIOS_ERR, "Failed to check EC limit power" printk(BIOS_ERR, "Failed to check EC limit power"
"flag.\n"); "flag.\n");
rv = VB2_ERROR_UNKNOWN; return VB2_ERROR_UNKNOWN;
break;
} }
if (!limit_power || stopwatch_expired(&sw)) if (!limit_power || stopwatch_expired(&sw))
@ -451,13 +458,13 @@ vb2_error_t vb2ex_ec_vboot_done(struct vb2_context *ctx)
if (limit_power) { if (limit_power) {
printk(BIOS_INFO, printk(BIOS_INFO,
"EC requests limited power usage. Request shutdown.\n"); "EC requests limited power usage. Request shutdown.\n");
rv = VBERROR_SHUTDOWN_REQUESTED; return VBERROR_SHUTDOWN_REQUESTED;
} else { } else {
printk(BIOS_INFO, "Waited %luus to clear limit power flag.\n", printk(BIOS_INFO, "Waited %luus to clear limit power flag.\n",
stopwatch_duration_usecs(&sw)); stopwatch_duration_usecs(&sw));
} }
return rv; return VB2_SUCCESS;
} }
/* /*