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

util/amdfwtool: Use enum values for address mode

Browse source 
Replace hardcoded values of address mode with its corresponding
enum value to increase code readability.

Change-Id: Ib2d97f36aa19235a312558e397f97e2607476e61
Signed-off-by: Michał Żygowski <michal.zygowski@3mdeb.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/90391
Reviewed-by: Patrick Rudolph <patrick.rudolph@9elements.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Michał Żygowski 2025-12-05 11:26:48 +01:00 • committed by Matt DeVillier
commit 472b2928f3
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
util/amdfwtool/amdfwread.c
View file

@ -269,7 +269,7 @@ static int amdfw_bios_dir_walk(FILE *fw, uint32_t bios_offset, uint32_t cookie,
size_t num_current_entries = 0;
bios_directory_hdr header;
uint32_t l2_dir_offset = 0;
uint64_t dir_mode = 0;
uint64_t dir_mode = AMD_ADDR_PHYSICAL;
char indent[MAX_INDENTATION_LEN] = {0};
if (read_bios_directory(fw, bios_offset, cookie, &header,
@ -287,7 +287,7 @@ static int amdfw_bios_dir_walk(FILE *fw, uint32_t bios_offset, uint32_t cookie,
uint64_t mode = current_entries[i].address_mode;
uint64_t addr = current_entries[i].source;
if (dir_mode < 2)
if (dir_mode < AMD_ADDR_REL_TAB)
mode = dir_mode;
if (type == AMD_BIOS_APOB || type == AMD_BIOS_PSP_SHARED_MEM)
@ -386,7 +386,7 @@ static int amdfw_psp_dir_walk(FILE *fw, uint32_t psp_offset, uint32_t cookie, ui
uint32_t bios_dir_offset = 0;
uint32_t ish_dir_offset = 0;
ish_directory_table ish_dir;
uint64_t dir_mode = 0;
uint64_t dir_mode = AMD_ADDR_PHYSICAL;
char indent[MAX_INDENTATION_LEN] = {0};
if (read_psp_directory(fw, psp_offset, cookie, &header,
@ -404,7 +404,8 @@ static int amdfw_psp_dir_walk(FILE *fw, uint32_t psp_offset, uint32_t cookie, ui
uint64_t mode = current_entries[i].address_mode;
uint64_t addr = current_entries[i].addr;
uint32_t dir_size = 0;
if (dir_mode < 2)
if (dir_mode < AMD_ADDR_REL_TAB)
mode = dir_mode;
if (type == AMD_PSP_FUSE_CHAIN)

2
util/amdfwtool/amdfwtool.c
View file

@ -1088,7 +1088,7 @@ static void integrate_psp_firmwares(context *ctx,
pspdir->entries[count].rsvd = 0;
pspdir->entries[count].size = 0xFFFFFFFF;
pspdir->entries[count].addr = fw_table[i].other;
pspdir->entries[count].address_mode = 0;
pspdir->entries[count].address_mode = AMD_ADDR_PHYSICAL;
count++;
} else if (fw_table[i].type == AMD_FW_PSP_NVRAM ||
fw_table[i].type == AMD_RPMC_NVRAM) {