diff options
| author | Caveh Jalali <caveh@google.com> | 2017-05-12 16:46:41 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-06-28 03:09:49 -0700 |
| commit | 3dd580298b42d9d77e1f37733e4df2b6d5c302c6 (patch) | |
| tree | 4b637f49b5e9c40bb0657ef8f88beb721465d468 /firmware/lib/ec_sync_all.c | |
| parent | 074697374b452d44450d0108d598ad001dc2d90d (diff) | |
| download | vboot-3dd580298b42d9d77e1f37733e4df2b6d5c302c6.tar.gz | |
call depthcharge hooks for auxiliary FW update.
this adds calls to depthcharge (using callbacks) to do auxiliary
firmware updates. in particular, this is intended to trigger TCPC
updates, but other programmables could also be updated.
no firmware updates take place until a board file has actually
registered a firmware update "driver". board file updates to follow.
TEST="COV=1 make" passes.
depthcharge boots on snappy.
with additional follow-on CLs, we can update the ps8751.
the companion depthcharge changes are here:
https://chromium-review.googlesource.com/c/498150/
the working design doc is here:
https://docs.google.com/a/google.com/document/d/1uzS0b3O3Us1QI2Sx7LDkjEfHmuhYB2BolrAoNwCVoc0/edit?usp=sharing
these features depend on vboot API updates:
CQ-DEPEND=CL:498150
BUG=b:35586896
BRANCH=none
Change-Id: If0d634eab08b429a8e7e80f5fe11eab3705bba0f
Signed-off-by: Caveh Jalali <caveh@google.com>
Reviewed-on: https://chromium-review.googlesource.com/505260
Reviewed-by: Stefan Reinauer <reinauer@chromium.org>
Diffstat (limited to 'firmware/lib/ec_sync_all.c')
| -rw-r--r-- | firmware/lib/ec_sync_all.c | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/firmware/lib/ec_sync_all.c b/firmware/lib/ec_sync_all.c index f0e4291c..af06b0ec 100644 --- a/firmware/lib/ec_sync_all.c +++ b/firmware/lib/ec_sync_all.c @@ -21,10 +21,17 @@ VbError_t ec_sync_all(struct vb2_context *ctx, struct VbCommonParams *cparams) { VbSharedDataHeader *shared = (VbSharedDataHeader *)cparams->shared_data_blob; + VbAuxFwUpdateSeverity_t fw_update; + VbError_t rv; + + rv = ec_sync_check_aux_fw(ctx, cparams, &fw_update); + if (rv) + return rv; /* Do EC sync phase 1; this determines if we need an update */ VbError_t phase1_rv = ec_sync_phase1(ctx, cparams); - int need_wait_screen = ec_will_update_slowly(ctx, cparams); + int need_wait_screen = ec_will_update_slowly(ctx, cparams) || + (fw_update == VB_AUX_FW_SLOW_UPDATE); /* * Check if we need to reboot to load the VGA Option ROM before we can @@ -57,11 +64,20 @@ VbError_t ec_sync_all(struct vb2_context *ctx, struct VbCommonParams *cparams) * Do EC sync phase 2; this applies the update and/or jumps to the * correct EC image. */ - VbError_t rv = ec_sync_phase2(ctx, cparams); + rv = ec_sync_phase2(ctx, cparams); if (rv) return rv; /* + * Do software sync for devices tunneled throught the EC. + */ + if (fw_update != VB_AUX_FW_NO_UPDATE) { + rv = VbExUpdateAuxFw(); + if (rv) + return rv; + } + + /* * Reboot to unload VGA Option ROM if: * - we displayed the wait screen * - the system has slow EC update flag set @@ -77,7 +93,7 @@ VbError_t ec_sync_all(struct vb2_context *ctx, struct VbCommonParams *cparams) return VBERROR_VGA_OPROM_MISMATCH; } - /* Do EC sync phase 3; this completes synd and handles battery cutoff */ + /* Do EC sync phase 3; this completes sync and handles battery cutoff */ rv = ec_sync_phase3(ctx, cparams); if (rv) return rv; |