summaryrefslogtreecommitdiff
path: root/src/vendorcode
diff options
context:
space:
mode:
Diffstat (limited to 'src/vendorcode')
-rw-r--r--src/vendorcode/eltan/security/mboot/mboot.c100
-rw-r--r--src/vendorcode/google/chromeos/cr50_enable_update.c32
-rw-r--r--src/vendorcode/google/chromeos/cse_board_reset.c8
-rw-r--r--src/vendorcode/google/chromeos/tpm2.c14
4 files changed, 77 insertions, 77 deletions
diff --git a/src/vendorcode/eltan/security/mboot/mboot.c b/src/vendorcode/eltan/security/mboot/mboot.c
index cb371401aa..5fe2060191 100644
--- a/src/vendorcode/eltan/security/mboot/mboot.c
+++ b/src/vendorcode/eltan/security/mboot/mboot.c
@@ -13,14 +13,14 @@
*/
EFI_TCG2_EVENT_ALGORITHM_BITMAP tpm2_get_active_pcrs(void)
{
- int status;
+ int rc;
TPML_PCR_SELECTION Pcrs;
EFI_TCG2_EVENT_ALGORITHM_BITMAP tpmHashAlgorithmBitmap = 0;
uint32_t activePcrBanks = 0;
uint32_t index;
- status = tpm2_get_capability_pcrs(&Pcrs);
- if (status != TPM_SUCCESS) {
+ rc = tpm2_get_capability_pcrs(&Pcrs);
+ if (rc != TPM_SUCCESS) {
tpmHashAlgorithmBitmap = EFI_TCG2_BOOT_HASH_ALG_SHA1;
activePcrBanks = EFI_TCG2_BOOT_HASH_ALG_SHA1;
} else {
@@ -78,11 +78,11 @@ EFI_TCG2_EVENT_ALGORITHM_BITMAP tpm2_get_active_pcrs(void)
int tpm2_get_capability_pcrs(TPML_PCR_SELECTION *Pcrs)
{
TPMS_CAPABILITY_DATA TpmCap;
- int status;
+ int rc;
int index;
- status = tlcl_get_capability(TPM_CAP_PCRS, 0, 1, &TpmCap);
- if (status == TPM_SUCCESS) {
+ rc = tlcl_get_capability(TPM_CAP_PCRS, 0, 1, &TpmCap);
+ if (rc == TPM_SUCCESS) {
Pcrs->count = TpmCap.data.assignedPCR.count;
printk(BIOS_DEBUG, "Pcrs->count = %d\n", Pcrs->count);
for (index = 0; index < Pcrs->count; index++) {
@@ -97,7 +97,7 @@ int tpm2_get_capability_pcrs(TPML_PCR_SELECTION *Pcrs)
Pcrs->pcrSelections[index].sizeofSelect);
}
}
- return status;
+ return rc;
}
/*
@@ -149,7 +149,7 @@ int mboot_hash_extend_log(uint64_t flags, uint8_t *hashData, uint32_t hashDataLe
void invalidate_pcrs(void)
{
int pcr;
- int status;
+ int rc;
TCG_PCR_EVENT2_HDR tcgEventHdr;
uint8_t invalidate = 1;
@@ -161,12 +161,12 @@ void invalidate_pcrs(void)
tcgEventHdr.eventType = EV_NO_ACTION;
tcgEventHdr.eventSize = (uint32_t) sizeof(invalidate);
- status = mboot_hash_extend_log(0, (uint8_t *)&invalidate,
+ rc = mboot_hash_extend_log(0, (uint8_t *)&invalidate,
tcgEventHdr.eventSize, &tcgEventHdr,
(uint8_t *)"Invalidate PCR");
- if (status != TPM_SUCCESS)
+ if (rc != TPM_SUCCESS)
printk(BIOS_DEBUG, "%s: invalidating pcr %d returned"
- " 0x%x\n", __func__, pcr, status);
+ " 0x%x\n", __func__, pcr, rc);
}
}
@@ -230,7 +230,7 @@ void mboot_print_buffer(uint8_t *buffer, uint32_t bufferSize)
int mb_measure_log_worker(const char *name, uint32_t type, uint32_t pcr,
TCG_EVENTTYPE eventType, const char *event_msg)
{
- int status;
+ int rc;
TCG_PCR_EVENT2_HDR tcgEventHdr;
uint8_t *base;
size_t size;
@@ -250,8 +250,8 @@ int mb_measure_log_worker(const char *name, uint32_t type, uint32_t pcr,
if (event_msg)
tcgEventHdr.eventSize = (uint32_t) strlen(event_msg);
- status = mboot_hash_extend_log(0, base, size, &tcgEventHdr, (uint8_t *)event_msg);
- return status;
+ rc = mboot_hash_extend_log(0, base, size, &tcgEventHdr, (uint8_t *)event_msg);
+ return rc;
}
/*
@@ -273,7 +273,7 @@ int mb_measure_log_worker(const char *name, uint32_t type, uint32_t pcr,
__weak int mb_entry(int wake_from_s3)
{
- int status;
+ int rc;
/* Initialize TPM driver. */
printk(BIOS_DEBUG, "%s: tlcl_lib_init\n", __func__);
@@ -284,16 +284,16 @@ __weak int mb_entry(int wake_from_s3)
if (wake_from_s3) {
printk(BIOS_DEBUG, "%s: tlcl_resume\n", __func__);
- status = tlcl_resume();
+ rc = tlcl_resume();
} else {
printk(BIOS_DEBUG, "%s: tlcl_startup\n", __func__);
- status = tlcl_startup();
+ rc = tlcl_startup();
}
- if (status)
- printk(BIOS_ERR, "%s: StartUp failed 0x%x!\n", __func__, status);
+ if (rc)
+ printk(BIOS_ERR, "%s: StartUp failed 0x%x!\n", __func__, rc);
- return status;
+ return rc;
}
/*
@@ -317,25 +317,25 @@ __weak int mb_entry(int wake_from_s3)
__weak int mb_measure(int wake_from_s3)
{
- uint32_t status;
+ uint32_t rc;
- status = mb_entry(wake_from_s3);
- if (status == TPM_SUCCESS) {
+ rc = mb_entry(wake_from_s3);
+ if (rc == TPM_SUCCESS) {
printk(BIOS_DEBUG, "%s: StartUp, successful!\n", __func__);
- status = mb_measure_log_start();
- if (status == TPM_SUCCESS) {
+ rc = mb_measure_log_start();
+ if (rc == TPM_SUCCESS) {
printk(BIOS_DEBUG, "%s: Measuring, successful!\n", __func__);
} else {
invalidate_pcrs();
printk(BIOS_ERR, "%s: Measuring returned 0x%x unsuccessful! PCRs invalidated.\n",
- __func__, status);
+ __func__, rc);
}
} else {
invalidate_pcrs();
printk(BIOS_ERR, "%s: StartUp returned 0x%x, unsuccessful! PCRs invalidated.\n", __func__,
- status);
+ rc);
}
- return status;
+ return rc;
}
/*
@@ -359,7 +359,7 @@ __weak int mb_measure(int wake_from_s3)
*/
__weak int mb_measure_log_start(void)
{
- int status;
+ int rc;
uint32_t i;
if ((tpm2_get_active_pcrs() & EFI_TCG2_BOOT_HASH_ALG_SHA256) == 0x0) {
@@ -368,32 +368,32 @@ __weak int mb_measure_log_start(void)
return TPM_E_IOERROR;
}
- status = mb_crtm();
- if (status != TPM_SUCCESS) {
+ rc = mb_crtm();
+ if (rc != TPM_SUCCESS) {
printk(BIOS_DEBUG, "%s: Fail! CRTM Version can't be measured."
" ABORTING!!!\n", __func__);
- return status;
+ return rc;
}
printk(BIOS_DEBUG, "%s: Success! CRTM Version measured.\n", __func__);
/* Log the items defined by the mainboard */
for (i = 0; i < ARRAY_SIZE(mb_log_list); i++) {
- status = mb_measure_log_worker(
+ rc = mb_measure_log_worker(
mb_log_list[i].cbfs_name,
mb_log_list[i].cbfs_type, mb_log_list[i].pcr,
mb_log_list[i].eventType,
mb_log_list[i].event_msg);
- if (status != TPM_SUCCESS) {
+ if (rc != TPM_SUCCESS) {
printk(BIOS_DEBUG, "%s: Fail! %s can't be measured."
"ABORTING!!!\n", __func__,
mb_log_list[i].cbfs_name);
- return status;
+ return rc;
}
printk(BIOS_DEBUG, "%s: Success! %s measured to pcr"
"%d.\n", __func__, mb_log_list[i].cbfs_name,
mb_log_list[i].pcr);
}
- return status;
+ return rc;
}
static const uint8_t crtm_version[] =
@@ -416,7 +416,7 @@ static const uint8_t crtm_version[] =
**/
__weak int mb_crtm(void)
{
- int status;
+ int rc;
TCG_PCR_EVENT2_HDR tcgEventHdr;
uint8_t hash[VB2_SHA256_DIGEST_SIZE];
uint8_t *msgPtr;
@@ -430,18 +430,18 @@ __weak int mb_crtm(void)
printk(BIOS_DEBUG, "%s: EventSize - %u\n", __func__,
tcgEventHdr.eventSize);
- status = mboot_hash_extend_log(0, (uint8_t *)crtm_version, tcgEventHdr.eventSize,
+ rc = mboot_hash_extend_log(0, (uint8_t *)crtm_version, tcgEventHdr.eventSize,
&tcgEventHdr, (uint8_t *)crtm_version);
- if (status) {
- printk(BIOS_DEBUG, "Measure CRTM Version returned 0x%x\n", status);
- return status;
+ if (rc) {
+ printk(BIOS_DEBUG, "Measure CRTM Version returned 0x%x\n", rc);
+ return rc;
}
- status = get_intel_me_hash(hash);
- if (status) {
- printk(BIOS_DEBUG, "get_intel_me_hash returned 0x%x\n", status);
- status = TPM_E_IOERROR;
- return status;
+ rc = get_intel_me_hash(hash);
+ if (rc) {
+ printk(BIOS_DEBUG, "get_intel_me_hash returned 0x%x\n", rc);
+ rc = TPM_E_IOERROR;
+ return rc;
}
/* Add the me hash */
@@ -453,10 +453,10 @@ __weak int mb_crtm(void)
msgPtr = NULL;
tcgEventHdr.eventSize = 0;
- status = mboot_hash_extend_log(MBOOT_HASH_PROVIDED, hash, sizeof(hash), &tcgEventHdr,
+ rc = mboot_hash_extend_log(MBOOT_HASH_PROVIDED, hash, sizeof(hash), &tcgEventHdr,
msgPtr);
- if (status)
- printk(BIOS_DEBUG, "Add ME hash returned 0x%x\n", status);
+ if (rc)
+ printk(BIOS_DEBUG, "Add ME hash returned 0x%x\n", rc);
- return status;
+ return rc;
}
diff --git a/src/vendorcode/google/chromeos/cr50_enable_update.c b/src/vendorcode/google/chromeos/cr50_enable_update.c
index 551c56a915..155769f545 100644
--- a/src/vendorcode/google/chromeos/cr50_enable_update.c
+++ b/src/vendorcode/google/chromeos/cr50_enable_update.c
@@ -25,27 +25,27 @@ void __weak mainboard_prepare_cr50_reset(void) {}
*/
static int cr50_is_reset_needed(void)
{
- int ret;
+ int rc;
uint8_t tpm_mode;
- ret = tlcl_cr50_get_tpm_mode(&tpm_mode);
+ rc = tlcl_cr50_get_tpm_mode(&tpm_mode);
- if (ret == TPM_E_NO_SUCH_COMMAND) {
+ if (rc == TPM_E_NO_SUCH_COMMAND) {
printk(BIOS_INFO,
"Cr50 does not support TPM mode command\n");
/* Older Cr50 firmware, assume no Cr50 reset is required */
return 0;
}
- if (ret == TPM_E_MUST_REBOOT) {
+ if (rc == TPM_E_MUST_REBOOT) {
/*
* Cr50 indicated a reboot is required to restore TPM
* functionality.
*/
return 1;
- } else if (ret != TPM_SUCCESS) {
+ } else if (rc != TPM_SUCCESS) {
/* TPM command failed, continue booting. */
- printk(BIOS_ERR, "Attempt to get CR50 TPM mode failed: %x\n", ret);
+ printk(BIOS_ERR, "Attempt to get CR50 TPM mode failed: %x\n", rc);
return 0;
}
@@ -70,7 +70,7 @@ static int cr50_is_reset_needed(void)
static void enable_update(void *unused)
{
- int ret;
+ int rc;
int cr50_reset_reqd = 0;
uint8_t num_restored_headers;
@@ -82,23 +82,23 @@ static void enable_update(void *unused)
if (vboot_get_context()->flags & VB2_CONTEXT_FORCE_RECOVERY_MODE)
return;
- ret = tlcl_lib_init();
+ rc = tlcl_lib_init();
- if (ret != VB2_SUCCESS) {
+ if (rc != VB2_SUCCESS) {
printk(BIOS_ERR, "tlcl_lib_init() failed for CR50 update: %x\n",
- ret);
+ rc);
return;
}
timestamp_add_now(TS_TPM_ENABLE_UPDATE_START);
/* Reboot in 1000 ms if necessary. */
- ret = tlcl_cr50_enable_update(CR50_RESET_DELAY_MS,
+ rc = tlcl_cr50_enable_update(CR50_RESET_DELAY_MS,
&num_restored_headers);
- if (ret != TPM_SUCCESS) {
+ if (rc != TPM_SUCCESS) {
printk(BIOS_ERR, "Attempt to enable CR50 update failed: %x\n",
- ret);
+ rc);
return;
}
@@ -142,16 +142,16 @@ static void enable_update(void *unused)
* the mainboard specific code runs.
*/
if (cr50_reset_reqd) {
- ret = tlcl_cr50_immediate_reset(CR50_RESET_DELAY_MS);
+ rc = tlcl_cr50_immediate_reset(CR50_RESET_DELAY_MS);
- if (ret != TPM_SUCCESS) {
+ if (rc != TPM_SUCCESS) {
/*
* Reset request failed due to TPM error, continue
* booting but the current boot will likely end up at
* the recovery screen.
*/
printk(BIOS_ERR, "Attempt to reset CR50 failed: %x\n",
- ret);
+ rc);
return;
}
}
diff --git a/src/vendorcode/google/chromeos/cse_board_reset.c b/src/vendorcode/google/chromeos/cse_board_reset.c
index 9efc4e61f6..7d19408726 100644
--- a/src/vendorcode/google/chromeos/cse_board_reset.c
+++ b/src/vendorcode/google/chromeos/cse_board_reset.c
@@ -13,7 +13,7 @@
void cse_board_reset(void)
{
- int ret;
+ int rc;
struct cr50_firmware_version version;
if (CONFIG(CSE_RESET_CLEAR_EC_AP_IDLE_FLAG))
@@ -21,9 +21,9 @@ void cse_board_reset(void)
if (CONFIG(TPM2) && CONFIG(TPM_GOOGLE_CR50)) {
/* Initialize TPM and get the cr50 firmware version. */
- ret = tlcl_lib_init();
- if (ret != VB2_SUCCESS) {
- printk(BIOS_ERR, "tlcl_lib_init() failed: 0x%x\n", ret);
+ rc = tlcl_lib_init();
+ if (rc != VB2_SUCCESS) {
+ printk(BIOS_ERR, "tlcl_lib_init() failed: 0x%x\n", rc);
return;
}
diff --git a/src/vendorcode/google/chromeos/tpm2.c b/src/vendorcode/google/chromeos/tpm2.c
index 98fd81522b..a28b02eeaf 100644
--- a/src/vendorcode/google/chromeos/tpm2.c
+++ b/src/vendorcode/google/chromeos/tpm2.c
@@ -7,7 +7,7 @@
static void disable_platform_hierarchy(void *unused)
{
- int ret;
+ int rc;
if (!CONFIG(TPM2))
return;
@@ -15,17 +15,17 @@ static void disable_platform_hierarchy(void *unused)
if (!CONFIG(RESUME_PATH_SAME_AS_BOOT))
return;
- ret = tlcl_lib_init();
+ rc = tlcl_lib_init();
- if (ret != VB2_SUCCESS) {
- printk(BIOS_ERR, "tlcl_lib_init() failed: %x\n", ret);
+ if (rc != VB2_SUCCESS) {
+ printk(BIOS_ERR, "tlcl_lib_init() failed: %x\n", rc);
return;
}
- ret = tlcl_disable_platform_hierarchy();
- if (ret != TPM_SUCCESS)
+ rc = tlcl_disable_platform_hierarchy();
+ if (rc != TPM_SUCCESS)
printk(BIOS_ERR, "Platform hierarchy disablement failed: %x\n",
- ret);
+ rc);
}
BOOT_STATE_INIT_ENTRY(BS_OS_RESUME, BS_ON_ENTRY, disable_platform_hierarchy,
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 00:39:04 +0000