[S] Change in coreboot[main]: amdfwtool: Add combo_index into context

[Bao Zheng (Code Review)]

Attention is currently required from: Zheng Bao.

Hello Zheng Bao,

I'd like you to do a code review.
Please visit

https://review.coreboot.org/c/coreboot/+/85590?usp=email

to review the following change.

Change subject: amdfwtool: Add combo_index into context
......................................................................

amdfwtool: Add combo_index into context

It will be checked in function in later change.

Change-Id: I4b026b0630a18d1f46bff98ffe5f11e7f930d7a8
Signed-off-by: Zheng Bao 
---
M util/amdfwtool/amdfwtool.c
M util/amdfwtool/amdfwtool.h
2 files changed, 14 insertions(+), 14 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/90/85590/1

diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c
index c742242..3e0aba4 100644
--- a/util/amdfwtool/amdfwtool.c
+++ b/util/amdfwtool/amdfwtool.c
@@ -1705,7 +1705,6 @@
 int main(int argc, char **argv)
 {
    int retval = 0;
-	int combo_index = 0;
    int targetfd;
    context ctx = { 0 };
    uint32_t romsig_offset;
@@ -1796,17 +1795,17 @@
    		ctx.bhd_combo_dir = new_combo_dir(&ctx, BHD2_COOKIE);
    }

-	combo_index = 0;
+	ctx.combo_index = 0;
    if (cb_config.config)
    	cb_config.combo_config[0] = cb_config.config;

do {
    	if (cb_config.use_combo && cb_config.debug)
-			printf("Processing %dth combo entry\n", combo_index);
+			printf("Processing %dth combo entry\n", ctx.combo_index);

/* The pspdir level 1 is special. For new combo layout, all the combo entries
    	   share one pspdir L1. It should not be cleared at each iteration. */
-		if (!cb_config.combo_new_rab || combo_index == 0) {
+		if (!cb_config.combo_new_rab || ctx.combo_index == 0) {
    		ctx.pspdir = NULL;
    		ctx.pspdir_bak = NULL;
    	}
@@ -1823,14 +1822,14 @@
    	 *  and make it clear this will not affect non-combo
    	 *  case.
    	 */
-		if (cb_config.use_combo && combo_index > 0) {
+		if (cb_config.use_combo && ctx.combo_index > 0) {
    		/* Restore the table as clean data. */
    		memcpy(amd_psp_fw_table, ctx.amd_psp_fw_table_clean,
    			sizeof(amd_psp_fw_table));
    		memcpy(amd_bios_table, ctx.amd_bios_table_clean,
    			sizeof(amd_bios_table));
-			assert_fw_entry(combo_index, MAX_COMBO_ENTRIES, &ctx);
-			open_process_config(cb_config.combo_config[combo_index], &cb_config);
+			assert_fw_entry(ctx.combo_index, MAX_COMBO_ENTRIES, &ctx);
+			open_process_config(cb_config.combo_config[ctx.combo_index], &cb_config);

/* In most cases, the address modes are same. */
    		if (cb_config.need_ish)
@@ -1840,7 +1839,7 @@
    		else
    			ctx.address_mode = AMD_ADDR_PHYSICAL;

-			register_apcb_combo(&cb_config, combo_index, &ctx);
+			register_apcb_combo(&cb_config, ctx.combo_index, &ctx);
    	}

if (cb_config.multi_level) {
@@ -1858,7 +1857,7 @@
    			}
    			integrate_bios_levels(&ctx, &cb_config);
    		}
-			if (!cb_config.combo_new_rab || combo_index == 0)
+			if (!cb_config.combo_new_rab || ctx.combo_index == 0)
    			integrate_psp_firmwares(&ctx,
    				amd_psp_fw_table, PSP_COOKIE, &cb_config);
    		integrate_psp_levels(&ctx, &cb_config);
@@ -1868,13 +1867,13 @@
    				amd_psp_fw_table, PSP_COOKIE, &cb_config);
    	}

-		if (!cb_config.use_combo || (cb_config.combo_new_rab && combo_index == 0)) {
+		if (!cb_config.use_combo || (cb_config.combo_new_rab && ctx.combo_index == 0)) {
    		/* For new combo layout, there is only 1 PSP level 1 directory. */
    		fill_psp_directory_to_efs(ctx.amd_romsig_ptr, ctx.pspdir, &ctx, &cb_config);
    		fill_psp_bak_directory_to_efs(ctx.amd_romsig_ptr, ctx.pspdir_bak, &ctx, &cb_config);
    	} else if (cb_config.use_combo && !cb_config.combo_new_rab) {
    		fill_psp_directory_to_efs(ctx.amd_romsig_ptr, ctx.psp_combo_dir, &ctx, &cb_config);
-			add_combo_entry(ctx.psp_combo_dir, ctx.pspdir, combo_index, &ctx, &cb_config);
+			add_combo_entry(ctx.psp_combo_dir, ctx.pspdir, ctx.combo_index, &ctx, &cb_config);
    	}

if (have_bios_tables(amd_bios_table) && !cb_config.recovery_ab) {
@@ -1899,13 +1898,13 @@
    			 */
    			fill_bios_directory_to_efs(ctx.amd_romsig_ptr, ctx.bhd_combo_dir,
    				&ctx, &cb_config);
-				add_combo_entry(ctx.bhd_combo_dir, ctx.biosdir, combo_index, &ctx, &cb_config);
+				add_combo_entry(ctx.bhd_combo_dir, ctx.biosdir, ctx.combo_index, &ctx, &cb_config);
    		}
    	}
    	if (cb_config.debug)
    		dump_image_addresses(&ctx);
-	} while (cb_config.use_combo && ++combo_index < MAX_COMBO_ENTRIES &&
-					cb_config.combo_config[combo_index] != NULL);
+	} while (cb_config.use_combo && ++ctx.combo_index < MAX_COMBO_ENTRIES &&
+					cb_config.combo_config[ctx.combo_index] != NULL);

targetfd = open(cb_config.output, O_RDWR | O_CREAT | O_TRUNC, 0666);
    if (targetfd >= 0) {
diff --git a/util/amdfwtool/amdfwtool.h b/util/amdfwtool/amdfwtool.h
index f87fbf5..3c773f7 100644
--- a/util/amdfwtool/amdfwtool.h
+++ b/util/amdfwtool/amdfwtool.h
@@ -447,6 +447,7 @@
    uint32_t current;	/* pointer within flash & proxy buffer */
    uint32_t current_pointer_saved;
    uint32_t current_table;
+	uint32_t combo_index;
    void *amd_psp_fw_table_clean;
    void *amd_bios_table_clean;
    struct _combo_apcb {