GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util/amdfwtool/amdfwread: Update relative_offset function 

* AMD_ADDR_PHYSICAL refers to physical address in the memory map
* AMD_ADDR_REL_BIOS is relative to the start of the BIOS image
* AMD_ADDR_REL_TAB is relative to the start of concerned PSP or BIOS
tables

Update the relative_offset implementation accordingly. Though
AMD_ADDR_REL_SLOT is defined it is not used. Removing that to simplify
the relative_offset implementation so that it can be used for both PSP
and BIOS firmware tables. Hence update the relative_offset function
signature as well.

BUG=None
TEST=Build and use amdfwread to read the Soft-fuse bits from Guybrush
BIOS image. Observed no changes before and after the changes.

Change-Id: I74603dd08eda87393c14b746c4435eaf2bb34126
Signed-off-by: Karthikeyan Ramasubramanian <kramasub@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/66572
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Raul Rangel <rrangel@chromium.org>
This commit is contained in:
Karthikeyan Ramasubramanian 2022-08-08 22:14:27 -06:00 committed by Raul Rangel
parent e33377250c
commit 852c5dc101
1 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
util/amdfwtool/amdfwread.c
View File

@ -10,6 +10,7 @@
/* An address can be relative to the image/file start but it can also be the address when /* An address can be relative to the image/file start but it can also be the address when
* the image is mapped at 0xff000000. Used to ensure that we only attempt to read within * the image is mapped at 0xff000000. Used to ensure that we only attempt to read within
* the limits of the file. */ * the limits of the file. */
#define SPI_ROM_BASE 0xff000000
#define FILE_REL_MASK 0xffffff #define FILE_REL_MASK 0xffffff
#define ERR(...) fprintf(stderr, __VA_ARGS__) #define ERR(...) fprintf(stderr, __VA_ARGS__)
@ -24,28 +25,35 @@ const uint32_t fw_header_offsets[] = {
}; };
/* Converts addresses to be relative to the start of the file */ /* Converts addresses to be relative to the start of the file */
static uint64_t relative_offset(const psp_directory_header *header, uint32_t header_offset, static uint64_t relative_offset(uint32_t header_offset, uint64_t addr, uint64_t mode)
const psp_directory_entry *entry, size_t entry_index)
{ {
amd_addr_mode mode = header->additional_info_fields.address_mode;
if (mode == AMD_ADDR_REL_BIOS) {
/* Entry address mode override directory mode with this value */
mode = entry->address_mode;
}
switch (mode) { switch (mode) {
case AMD_ADDR_REL_BIOS: /* Since this utility operates on the BIOS file, physical address is converted
return entry->addr + header_offset; relative to the start of the BIOS file. */
case AMD_ADDR_PHYSICAL:
if (addr < SPI_ROM_BASE || addr > (SPI_ROM_BASE + FILE_REL_MASK)) {
ERR("Invalid address(%lx) or mode(%lx)\n", addr, mode);
/* TODO: fix amdfwtool to program the right address/mode. In guybrush,
* lots of addresses are marked as physical, but they are relative to
* BIOS. Until that is fixed, just leave an error message. */
// exit(1);
}
return addr & FILE_REL_MASK;
case AMD_ADDR_REL_SLOT: case AMD_ADDR_REL_BIOS:
return entry->addr + header_offset + sizeof(psp_directory_header) + if (addr > FILE_REL_MASK) {
entry_index * sizeof(psp_directory_entry); ERR("Invalid address(%lx) or mode(%lx)\n", addr, mode);
exit(1);
}
return addr & FILE_REL_MASK;
case AMD_ADDR_REL_TAB:
return addr + header_offset;
default: default:
break; ERR("Unsupported mode %lu\n", mode);
exit(1);
} }
return entry->addr & FILE_REL_MASK;
} }
static int read_fw_header(FILE *fw, uint32_t offset, embedded_firmware *fw_header) static int read_fw_header(FILE *fw, uint32_t offset, embedded_firmware *fw_header)
@ -120,9 +128,10 @@ static int read_soft_fuse(FILE *fw, const embedded_firmware *fw_header)
for (size_t i = 0; i < num_current_entries; i++) { for (size_t i = 0; i < num_current_entries; i++) {
uint32_t type = current_entries[i].type; uint32_t type = current_entries[i].type;
uint64_t mode = current_entries[i].address_mode;
uint64_t addr = current_entries[i].addr;
if (type == AMD_PSP_FUSE_CHAIN) { if (type == AMD_PSP_FUSE_CHAIN) {
uint64_t mode = current_entries[i].address_mode;
uint64_t addr = current_entries[i].addr;
uint64_t fuse = mode << 62 | addr; uint64_t fuse = mode << 62 | addr;
printf("Soft-fuse:0x%lx\n", fuse); printf("Soft-fuse:0x%lx\n", fuse);
@ -132,8 +141,7 @@ static int read_soft_fuse(FILE *fw, const embedded_firmware *fw_header)
if (l2_dir_offset != 0) if (l2_dir_offset != 0)
return 1; return 1;
l2_dir_offset = relative_offset(&header, psp_offset, l2_dir_offset = relative_offset(psp_offset, addr, mode);
&current_entries[i], i);
} }
} }