diff options
Diffstat (limited to 'firmware/lib/ec_sync.c')
| -rw-r--r-- | firmware/lib/ec_sync.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/firmware/lib/ec_sync.c b/firmware/lib/ec_sync.c index 35fae2de..77b5741e 100644 --- a/firmware/lib/ec_sync.c +++ b/firmware/lib/ec_sync.c @@ -348,12 +348,12 @@ VbError_t ec_sync_phase1(struct vb2_context *ctx, VbCommonParams *cparams) /* Reasons not to do sync at all */ if (!(shared->flags & VBSD_EC_SOFTWARE_SYNC)) return VBERROR_SUCCESS; - if (cparams->gbb->flags & GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC) + if (sd->gbb_flags & VB2_GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC) return VBERROR_SUCCESS; #ifdef PD_SYNC - const int do_pd_sync = !(cparams->gbb->flags & - GBB_FLAG_DISABLE_PD_SOFTWARE_SYNC); + const int do_pd_sync = !(sd->gbb_flags & + VB2_GBB_FLAG_DISABLE_PD_SOFTWARE_SYNC); #else const int do_pd_sync = 0; #endif @@ -425,7 +425,7 @@ static int ec_sync_allowed(struct vb2_context *ctx, VbCommonParams *cparams) /* Reasons not to do sync at all */ if (!(shared->flags & VBSD_EC_SOFTWARE_SYNC)) return 0; - if (cparams->gbb->flags & GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC) + if (sd->gbb_flags & VB2_GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC) return 0; if (sd->recovery_reason) return 0; @@ -436,9 +436,11 @@ VbError_t ec_sync_check_aux_fw(struct vb2_context *ctx, VbCommonParams *cparams, VbAuxFwUpdateSeverity_t *severity) { + struct vb2_shared_data *sd = vb2_get_sd(ctx); + /* If we're not updating the EC, skip aux fw syncs as well */ if (!ec_sync_allowed(ctx, cparams) || - (cparams->gbb->flags & GBB_FLAG_DISABLE_PD_SOFTWARE_SYNC)) { + (sd->gbb_flags & VB2_GBB_FLAG_DISABLE_PD_SOFTWARE_SYNC)) { *severity = VB_AUX_FW_NO_UPDATE; return VBERROR_SUCCESS; } @@ -457,7 +459,8 @@ VbError_t ec_sync_phase2(struct vb2_context *ctx, VbCommonParams *cparams) #ifdef PD_SYNC /* Handle updates and jumps for PD */ - if (!(cparams->gbb->flags & GBB_FLAG_DISABLE_PD_SOFTWARE_SYNC)) { + struct vb2_shared_data *sd = vb2_get_sd(ctx); + if (!(sd->gbb_flags & VB2_GBB_FLAG_DISABLE_PD_SOFTWARE_SYNC)) { retval = sync_one_ec(ctx, 1, cparams); if (retval != VBERROR_SUCCESS) return retval; |