scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2025-11-24 02:05:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

vboot_api_kernel: Add new EcVbootDone API

Browse Source 
Add a new post-EC software sync API VbExEcVbootDone() to take actions
which normally need to happen after EC verification / sysjump.

BUG=chromium:537269
TEST=Manual on Glados. Set CHG_MW thresh to 20000, BAT_PCT to 50. Verify
that LIMIT_POWER host event is set until Zinger negotiates to 20V. Also
verify that we do not proceed with boot when Donette is plugged.
BRANCH=None
CQ-DEPEND=CL:307885,CL:309523

Change-Id: I77e6000aa8a44e3aca4fb5982e5b5f5191774989
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/307952
Commit-Ready: Shawn N <shawnn@chromium.org>
Tested-by: Shawn N <shawnn@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
This commit is contained in:
Shawn Nematbakhsh
2015-10-21 14:31:02 -07:00
committed by chrome-bot
parent faa8c7f622
commit b491bc8bb1
3 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
firmware/include/vboot_api.h
View File

@@ -925,6 +925,19 @@ VbError_t VbExEcProtectRW(int devidx);
enum VbEcBootMode_t {VB_EC_NORMAL, VB_EC_DEVELOPER, VB_EC_RECOVERY }; enum VbEcBootMode_t {VB_EC_NORMAL, VB_EC_DEVELOPER, VB_EC_RECOVERY };
VbError_t VbExEcEnteringMode(int devidx, enum VbEcBootMode_t mode); VbError_t VbExEcEnteringMode(int devidx, enum VbEcBootMode_t mode);
/**
* Perform EC post-verification / updating / jumping actions.
*
* This routine is called to perform certain actions that must wait until
* after the EC resides in its `final` image (the image the EC will
* run for the duration of boot). These actions include verifying that
* enough power is available to continue with boot.
*
* @param in_recovery 1 if recovery mode is selected by the AP, 0 otherwise.
* @return VBERROR_... error, VBERROR_SUCCESS on success.
*/
VbError_t VbExEcVbootDone(int in_recovery);
/*****************************************************************************/ /*****************************************************************************/
/* Misc */ /* Misc */

5
firmware/lib/vboot_api_kernel.c
View File

@@ -1047,6 +1047,11 @@ VbError_t VbSelectAndLoadKernel(VbCommonParams *cparams,
} }
} }
/* EC verification (and possibily updating / jumping) is done */
retval = VbExEcVbootDone(!!shared->recovery_reason);
if (retval != VBERROR_SUCCESS)
goto VbSelectAndLoadKernel_exit;
/* Read kernel version from the TPM. Ignore errors in recovery mode. */ /* Read kernel version from the TPM. Ignore errors in recovery mode. */
tpm_status = RollbackKernelRead(&shared->kernel_version_tpm); tpm_status = RollbackKernelRead(&shared->kernel_version_tpm);
if (0 != tpm_status) { if (0 != tpm_status) {

5
firmware/stub/vboot_api_stub.c
View File

@@ -159,6 +159,11 @@ VbError_t VbExEcEnteringMode(int devidx, enum VbEcBootMode_t mode)
return VBERROR_SUCCESS; return VBERROR_SUCCESS;
} }
VbError_t VbExEcVbootDone(int in_recovery)
{
return VBERROR_SUCCESS;
}
enum VbEcBootMode_t VbGetMode(void) enum VbEcBootMode_t VbGetMode(void)
{ {
return vboot_mode; return vboot_mode;