erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

treewide: convert to %#x hex prints

Browse source 
Convert hex print values to use the %#x qualifier to print 0x{value}.

BUG=b:296439237
TEST=build and boot to Skyrim
BRANCH=None

Change-Id: I0d1ac4b920530635fb758c5165a6a99c11b414c8
Signed-off-by: Jon Murphy <jpmurphy@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/78183
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Reviewed-by: Karthik Ramasubramanian <kramasub@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Jon Murphy 2023-09-26 21:05:37 -06:00 • committed by Raul Rangel
commit 53fc667943
21 changed files with 63 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/security/vboot/mrc_cache_hash_tpm.c
View file

@ -41,7 +41,7 @@ void mrc_cache_update_hash(uint32_t index, const uint8_t *data, size_t size)
return;
}
printk(BIOS_INFO, "MRC: TPM MRC hash idx 0x%x updated successfully.\n", index);
printk(BIOS_INFO, "MRC: TPM MRC hash idx %#x updated successfully.\n", index);
}
int mrc_cache_verify_hash(uint32_t index, const uint8_t *data, size_t size)
@ -67,7 +67,7 @@ int mrc_cache_verify_hash(uint32_t index, const uint8_t *data, size_t size)
return 0;
}
printk(BIOS_INFO, "MRC: Hash idx 0x%x comparison successful.\n", index);
printk(BIOS_INFO, "MRC: Hash idx %#x comparison successful.\n", index);
return 1;
}

16
src/security/vboot/secdata_tpm.c
View file

@ -436,8 +436,8 @@ uint32_t antirollback_lock_space_firmware(void)
uint32_t antirollback_read_space_mrc_hash(uint32_t index, uint8_t *data, uint32_t size)
{
if (size != HASH_NV_SIZE) {
VBDEBUG("TPM: Incorrect buffer size for hash idx 0x%x. "
"(Expected=0x%x Actual=0x%x).\n", index, HASH_NV_SIZE,
VBDEBUG("TPM: Incorrect buffer size for hash idx %#x. "
"(Expected=%#x Actual=%#x).\n", index, HASH_NV_SIZE,
size);
return TPM_CB_READ_FAILURE;
}
@ -450,8 +450,8 @@ uint32_t antirollback_write_space_mrc_hash(uint32_t index, const uint8_t *data,
uint32_t rc;
if (size != HASH_NV_SIZE) {
VBDEBUG("TPM: Incorrect buffer size for hash idx 0x%x. "
"(Expected=0x%x Actual=0x%x).\n", index, HASH_NV_SIZE,
VBDEBUG("TPM: Incorrect buffer size for hash idx %#x. "
"(Expected=%#x Actual=%#x).\n", index, HASH_NV_SIZE,
size);
return TPM_CB_WRITE_FAILURE;
}
@ -486,8 +486,8 @@ static uint32_t read_space_vbios_hash(uint8_t *data)
uint32_t antirollback_read_space_vbios_hash(uint8_t *data, uint32_t size)
{
if (size != HASH_NV_SIZE) {
VBDEBUG("TPM: Incorrect buffer size for hash idx 0x%x. "
"(Expected=0x%x Actual=0x%x).\n", VBIOS_CACHE_NV_INDEX, HASH_NV_SIZE,
VBDEBUG("TPM: Incorrect buffer size for hash idx %#x. "
"(Expected=%#x Actual=%#x).\n", VBIOS_CACHE_NV_INDEX, HASH_NV_SIZE,
size);
return TPM_CB_READ_FAILURE;
}
@ -500,8 +500,8 @@ uint32_t antirollback_write_space_vbios_hash(const uint8_t *data, uint32_t size)
uint32_t rc;
if (size != HASH_NV_SIZE) {
VBDEBUG("TPM: Incorrect buffer size for hash idx 0x%x. "
"(Expected=0x%x Actual=0x%x).\n", VBIOS_CACHE_NV_INDEX, HASH_NV_SIZE,
VBDEBUG("TPM: Incorrect buffer size for hash idx %#x. "
"(Expected=%#x Actual=%#x).\n", VBIOS_CACHE_NV_INDEX, HASH_NV_SIZE,
size);
return TPM_CB_WRITE_FAILURE;
}

4
src/security/vboot/vbios_cache_hash_tpm.c
View file

@ -41,7 +41,7 @@ void vbios_cache_update_hash(const uint8_t *data, size_t size)
return;
}
printk(BIOS_INFO, "VBIOS_CACHE: TPM NV idx 0x%x updated successfully.\n",
printk(BIOS_INFO, "VBIOS_CACHE: TPM NV idx %#x updated successfully.\n",
VBIOS_CACHE_NV_INDEX);
}
@ -68,7 +68,7 @@ enum cb_err vbios_cache_verify_hash(const uint8_t *data, size_t size)
return CB_ERR;
}
printk(BIOS_INFO, "VBIOS_CACHE: Hash idx 0x%x comparison successful.\n",
printk(BIOS_INFO, "VBIOS_CACHE: Hash idx %#x comparison successful.\n",
VBIOS_CACHE_NV_INDEX);
return CB_SUCCESS;

6
src/security/vboot/vboot_logic.c
View file

@ -318,7 +318,7 @@ void verstage_main(void)
* For any other error code, save context if needed and reboot.
*/
if (rv == VB2_ERROR_API_PHASE1_RECOVERY) {
printk(BIOS_INFO, "Recovery requested (%x)\n", rv);
printk(BIOS_INFO, "Recovery requested (%#x)\n", rv);
vboot_save_data(ctx);
extend_pcrs(ctx); /* ignore failures */
goto verstage_main_exit;
@ -376,7 +376,7 @@ void verstage_main(void)
timestamp_add_now(TS_TPMLOCK_START);
rv = antirollback_lock_space_firmware();
if (rv) {
printk(BIOS_INFO, "Failed to lock TPM (%x)\n", rv);
printk(BIOS_INFO, "Failed to lock TPM (%#x)\n", rv);
vboot_fail_and_reboot(ctx, VB2_RECOVERY_RO_TPM_L_ERROR, 0);
}
timestamp_add_now(TS_TPMLOCK_END);
@ -385,7 +385,7 @@ void verstage_main(void)
if (CONFIG(VBOOT_HAS_REC_HASH_SPACE)) {
rv = antirollback_lock_space_mrc_hash(MRC_REC_HASH_NV_INDEX);
if (rv) {
printk(BIOS_INFO, "Failed to lock rec hash space(%x)\n", rv);
printk(BIOS_INFO, "Failed to lock rec hash space(%#x)\n", rv);
vboot_fail_and_reboot(ctx, VB2_RECOVERY_RO_TPM_REC_HASH_L_ERROR, rv);
}
}