[coreboot-gerrit] [XS] Change in coreboot[main]: amdfwtool: Set L2 table size as 0x400

[Felix Held (Code Review)]

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/84194?usp=email )

Change subject: amdfwtool: Set L2 table size as 0x400
......................................................................

amdfwtool: Set L2 table size as 0x400

The Max size of L2 table is 0x400. If we set it to other value, the
the A/B recovery image can not boot on Cezanne/Majolica platform.

The affected boards are Birman, Chausie, Skyrim, Mayan. Other boards
are binary identical. Tested on Skyrim and image can boot.

Change-Id: I2c0af6579dbe2a3a61e1fe9c79d69491fd45a5bb
Signed-off-by: Zheng Bao 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/84194
Reviewed-by: Felix Held 
Tested-by: build bot (Jenkins) 
---
M util/amdfwtool/amdfwtool.c
M util/amdfwtool/amdfwtool.h
2 files changed, 4 insertions(+), 3 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Felix Held: Looks good to me, approved

diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c
index 1fe9923..1d94e06 100644
--- a/util/amdfwtool/amdfwtool.c
+++ b/util/amdfwtool/amdfwtool.c
@@ -870,7 +870,7 @@
    			BUFF_TO_RUN_MODE(*ctx, pspdir2, AMD_ADDR_REL_BIOS);
    	pspdir->entries[count].address_mode =
    			SET_ADDR_MODE(pspdir, AMD_ADDR_REL_BIOS);
-		pspdir->entries[count].size = _MAX(TABLE_ALIGNMENT,
+		pspdir->entries[count].size = _MAX(TABLE_L2_SIZE_MAX,
    			pspdir2->header.num_entries *
    			sizeof(psp_directory_entry) +
    			sizeof(psp_directory_header));
@@ -1216,11 +1216,11 @@

if (cb_config->recovery_ab) {
    	add_psp_firmware_entry(ctx, ctx->pspdir2, ctx->biosdir2,
-			AMD_FW_BIOS_TABLE, TABLE_ALIGNMENT);
+			AMD_FW_BIOS_TABLE, TABLE_L2_SIZE_MAX);
    	if (ctx->pspdir2_b != NULL)
    		add_psp_firmware_entry(ctx, ctx->pspdir2_b,
    			ctx->biosdir2_b, AMD_FW_BIOS_TABLE,
-				TABLE_ALIGNMENT);
+				TABLE_L2_SIZE_MAX);
    } else if (ctx->biosdir2) {
    	current_table_save = ctx->current_table;
    	ctx->current_table = BUFF_TO_RUN_MODE(*ctx, ctx->biosdir, AMD_ADDR_REL_BIOS);
diff --git a/util/amdfwtool/amdfwtool.h b/util/amdfwtool/amdfwtool.h
index b2fd2c0..7ca7d89 100644
--- a/util/amdfwtool/amdfwtool.h
+++ b/util/amdfwtool/amdfwtool.h
@@ -11,6 +11,7 @@

#define ERASE_ALIGNMENT 0x1000U
 #define TABLE_ALIGNMENT 0x1000U
+#define TABLE_L2_SIZE_MAX 0x400U
 #define BLOB_ALIGNMENT 0x100U
 #define TABLE_ERASE_ALIGNMENT _MAX(TABLE_ALIGNMENT, ERASE_ALIGNMENT)
 #define BLOB_ERASE_ALIGNMENT _MAX(BLOB_ALIGNMENT, ERASE_ALIGNMENT)