[coreboot-gerrit] [S] Change in coreboot[master]: amdfwtool: Add entry RIB whose subprog equals 1

[Paul Fagerburg (Code Review)]

Paul Fagerburg has submitted this change. ( https://review.coreboot.org/c/coreboot/+/72507 )

Change subject: amdfwtool: Add entry RIB whose subprog equals 1
......................................................................

amdfwtool: Add entry RIB whose subprog equals 1

For the PHX, it uses subprog 0.
For the PHX2, it uses subprog 1.

Change-Id: Ib013f264fc9940ad95e559fe19bba72c06a19625
Signed-off-by: Zheng Bao 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/72507
Tested-by: build bot (Jenkins) 
Reviewed-by: Felix Held 
---
M util/amdfwtool/amdfwtool.c
M util/amdfwtool/data_parse.c
2 files changed, 22 insertions(+), 2 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 2937264..f4fd6ee 100644
--- a/util/amdfwtool/amdfwtool.c
+++ b/util/amdfwtool/amdfwtool.c
@@ -329,7 +329,8 @@
    { .type = AMD_FW_PSP_SMUSCS, .level = PSP_BOTH | PSP_LVL2_AB },
    { .type = AMD_FW_DMCUB, .level = PSP_LVL2 | PSP_LVL2_AB },
    { .type = AMD_FW_PSP_BOOTLOADER_AB, .level = PSP_LVL2 | PSP_LVL2_AB },
-	{ .type = AMD_RIB, .level = PSP_LVL2 | PSP_LVL2_AB },
+	{ .type = AMD_RIB, .subprog = 0, .level = PSP_LVL2 | PSP_LVL2_AB },
+	{ .type = AMD_RIB, .subprog = 1, .level = PSP_LVL2 | PSP_LVL2_AB },
    { .type = AMD_FW_MPDMA_TF, .level = PSP_BOTH | PSP_BOTH_AB },
    { .type = AMD_TA_IKEK, .level = PSP_BOTH | PSP_LVL2_AB, .skip_hashing = true },
    { .type = AMD_FW_GMI3_PHY, .level = PSP_BOTH | PSP_BOTH_AB },
diff --git a/util/amdfwtool/data_parse.c b/util/amdfwtool/data_parse.c
index 8a336d9..8c22dc5 100644
--- a/util/amdfwtool/data_parse.c
+++ b/util/amdfwtool/data_parse.c
@@ -411,9 +411,12 @@
    } else if (strcmp(fw_name, "PSP_MPIOFW_FILE") == 0) {
    	fw_type = AMD_FW_MPIO;
    	subprog = 0;
-	} else if (strcmp(fw_name, "PSP_RIB_FILE") == 0) {
+	} else if (strcmp(fw_name, "PSP_RIB_FILE_SUB0") == 0) {
    	fw_type = AMD_RIB;
    	subprog = 0;
+	} else if (strcmp(fw_name, "PSP_RIB_FILE_SUB1") == 0) {
+		fw_type = AMD_RIB;
+		subprog = 1;
    } else if (strcmp(fw_name, "FEATURE_TABLE_FILE") == 0) {
    	fw_type = AMD_FW_FCFG_TABLE;
    	subprog = 0;