sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

amdfwtool: Change&Record the current table in integration function

Browse Source 
Align with the function integrating PSP FWs. And it is the integration
function's responsibility.

TEST=Identical test on all AMD platforms

Change-Id: I1a98614f3a5756a462b01085e9565b52cf9a9343
Signed-off-by: Zheng Bao <fishbaozi@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/78280
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
This commit is contained in:
Zheng Bao
2023-10-09 17:36:08 +08:00
committed by Felix Held
parent e35c502a57
commit a640b123f5
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
util/amdfwtool/amdfwtool.c
View File

@@ -1088,7 +1088,6 @@ static void *new_bios_dir(context *ctx, bool multi)
ptr = BUFF_CURRENT(*ctx); ptr = BUFF_CURRENT(*ctx);
((bios_directory_hdr *) ptr)->additional_info = 0; ((bios_directory_hdr *) ptr)->additional_info = 0;
((bios_directory_hdr *) ptr)->additional_info_fields.address_mode = ctx->address_mode; ((bios_directory_hdr *) ptr)->additional_info_fields.address_mode = ctx->address_mode;
ctx->current_table = ctx->current;
adjust_current_pointer(ctx, adjust_current_pointer(ctx,
sizeof(bios_directory_hdr) + MAX_BIOS_ENTRIES * sizeof(bios_directory_entry), sizeof(bios_directory_hdr) + MAX_BIOS_ENTRIES * sizeof(bios_directory_entry),
1); 1);
@@ -1179,6 +1178,7 @@ static void integrate_bios_firmwares(context *ctx,
int apob_idx; int apob_idx;
uint32_t size; uint32_t size;
uint64_t source; uint64_t source;
uint32_t current_table_save;
/* This function can create a primary table, a secondary table, or a /* This function can create a primary table, a secondary table, or a
* flattened table which contains all applicable types. These if-else * flattened table which contains all applicable types. These if-else
@@ -1196,6 +1196,8 @@ static void integrate_bios_firmwares(context *ctx,
else else
level = BDT_BOTH; level = BDT_BOTH;
current_table_save = ctx->current_table;
ctx->current_table = (char *)biosdir - ctx->rom;
adjust_current_pointer(ctx, 0, TABLE_ALIGNMENT); adjust_current_pointer(ctx, 0, TABLE_ALIGNMENT);
for (i = 0, count = 0; fw_table[i].type != AMD_BIOS_INVALID; i++) { for (i = 0, count = 0; fw_table[i].type != AMD_BIOS_INVALID; i++) {
@@ -1396,6 +1398,7 @@ static void integrate_bios_firmwares(context *ctx,
} }
fill_dir_header(biosdir, count, cookie, ctx, cb_config); fill_dir_header(biosdir, count, cookie, ctx, cb_config);
ctx->current_table = current_table_save;
} }
static int set_efs_table(uint8_t soc_id, amd_cb_config *cb_config, static int set_efs_table(uint8_t soc_id, amd_cb_config *cb_config,