diff options
| author | Jon Murphy <jpmurphy@google.com> | 2023-09-05 10:37:05 -0600 |
|---|---|---|
| committer | Karthik Ramasubramanian <kramasub@google.com> | 2023-09-18 16:20:09 +0000 |
| commit | 24604810252c8af7b7f350485f57a646718a5157 (patch) | |
| tree | f4a1607df0a43278c5bd7166b02fed36d1affddb /src/mainboard | |
| parent | 277db94ebbb635f93cce426af2450ad0581485d4 (diff) | |
drivers/tpm: Make temp test value naming consistent
Make naming convention consistent across all functions return values.
BUG=b:296439237
TEST=Boot to OS on Skyrim
BRANCH=None
Change-Id: If86805b39048800276ab90b7687644ec2a0d4bee
Signed-off-by: Jon Murphy <jpmurphy@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/77536
Reviewed-by: Yu-Ping Wu <yupingso@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Karthik Ramasubramanian <kramasub@google.com>
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
Diffstat (limited to 'src/mainboard')
| -rw-r--r-- | src/mainboard/facebook/fbg1701/romstage.c | 10 | ||||
| -rw-r--r-- | src/mainboard/google/brya/mainboard.c | 8 | ||||
| -rw-r--r-- | src/mainboard/google/dedede/mainboard.c | 8 | ||||
| -rw-r--r-- | src/mainboard/google/volteer/mainboard.c | 8 |
4 files changed, 17 insertions, 17 deletions
diff --git a/src/mainboard/facebook/fbg1701/romstage.c b/src/mainboard/facebook/fbg1701/romstage.c index 7a31309a06..19cf867e79 100644 --- a/src/mainboard/facebook/fbg1701/romstage.c +++ b/src/mainboard/facebook/fbg1701/romstage.c @@ -73,7 +73,7 @@ static const uint8_t crtm_version[] = int mb_crtm(void) { - int status = TPM_E_IOERROR; + int rc = TPM_E_IOERROR; TCG_PCR_EVENT2_HDR tcgEventHdr; /* Use FirmwareVersion string to represent CRTM version. */ @@ -84,13 +84,13 @@ int mb_crtm(void) tcgEventHdr.eventSize = sizeof(crtm_version); printk(BIOS_DEBUG, "%s: EventSize - %u\n", __func__, tcgEventHdr.eventSize); - status = mboot_hash_extend_log(0, (uint8_t *)crtm_version, + 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); + if (rc) { + printk(BIOS_DEBUG, "Measure CRTM Version returned 0x%x\n", rc); } - return status; + return rc; } #endif diff --git a/src/mainboard/google/brya/mainboard.c b/src/mainboard/google/brya/mainboard.c index 966f19eef4..a4603371af 100644 --- a/src/mainboard/google/brya/mainboard.c +++ b/src/mainboard/google/brya/mainboard.c @@ -34,11 +34,11 @@ static void mainboard_smbios_strings(struct device *dev, struct smbios_type11 *t void mainboard_update_soc_chip_config(struct soc_intel_alderlake_config *config) { - int ret; + int rc; - 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/mainboard/google/dedede/mainboard.c b/src/mainboard/google/dedede/mainboard.c index cc0137dda2..444eef8be7 100644 --- a/src/mainboard/google/dedede/mainboard.c +++ b/src/mainboard/google/dedede/mainboard.c @@ -14,11 +14,11 @@ static void mainboard_update_soc_chip_config(void) { struct soc_intel_jasperlake_config *cfg = config_of_soc(); - int ret; + int rc; - 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/mainboard/google/volteer/mainboard.c b/src/mainboard/google/volteer/mainboard.c index 4b15e1be04..7409a5bb35 100644 --- a/src/mainboard/google/volteer/mainboard.c +++ b/src/mainboard/google/volteer/mainboard.c @@ -82,7 +82,7 @@ static void mainboard_enable(struct device *dev) void mainboard_update_soc_chip_config(struct soc_intel_tigerlake_config *cfg) { - int ret; + int rc; if (!CONFIG(TPM_GOOGLE_CR50) || !CONFIG(SPI_TPM)) { /* * Negotiation of long interrupt pulses is only supported via SPI. I2C is only @@ -93,9 +93,9 @@ void mainboard_update_soc_chip_config(struct soc_intel_tigerlake_config *cfg) return; } - 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; } |