amdfwtool: Add HW IPCFG file whose subprog is 1

And rename PSP_HW_IPCFG_FILE to PSP_HW_IPCFG_FILE_SUB0

Change-Id: Ia1ab8482074105de367905be2b4b0418066823d2
Signed-off-by: Zheng Bao <fishbaozi@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/73531
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Fred Reitberger <reitbergerfred@gmail.com>

8 files changed, 12 insertions, 8 deletions

diff --git a/src/mainboard/google/guybrush/variants/baseboard/amdfw.cfg b/src/mainboard/google/guybrush/variants/baseboard/amdfw.cfg
index 408ac5f827..edacb6d141 100644
--- a/src/mainboard/google/guybrush/variants/baseboard/amdfw.cfg
+++ b/src/mainboard/google/guybrush/variants/baseboard/amdfw.cfg
@@ -14,7 +14,7 @@ PSP_SMUFW1_SUB0_FILE		TypeId0x08_SmuFirmware_CZN.csbin		L2
 PSPSECUREDEBUG_FILE		TypeId0x09_SecureDebugUnlockKey_CZN.stkn
 PSP_SMUFW2_SUB0_FILE		TypeId0x12_SmuFirmware2_CZN.csbin
 PSP_SEC_DEBUG_FILE		TypeId0x13_PspEarlyUnlock_CZN.sbin
-PSP_HW_IPCFG_FILE		TypeId0x20_HwIpCfg_CZN_A0.sbin
+PSP_HW_IPCFG_FILE_SUB0		TypeId0x20_HwIpCfg_CZN_A0.sbin
 PSP_IKEK_FILE			TypeId0x21_PspIkek_CZN.bin
 PSP_SECG0_FILE			TypeId0x24_SecurePolicyL0_CZN.sbin
 AMD_DRIVER_ENTRIES		TypeId0x28_PspSystemDriver_CZN.sbin
diff --git a/src/mainboard/google/skyrim/amdfw.cfg b/src/mainboard/google/skyrim/amdfw.cfg
index 90eceb3d7a..118d7c1483 100644
--- a/src/mainboard/google/skyrim/amdfw.cfg
+++ b/src/mainboard/google/skyrim/amdfw.cfg
@@ -12,7 +12,7 @@ PSP_SMUFW1_SUB0_FILE       TypeId0x08_SmuFirmware_MDN.sbin
 PSPSECUREDEBUG_FILE        TypeId0x09_Mendocino-SDU.stkn
 PSP_SMUFW2_SUB0_FILE       TypeId0x12_SmuFirmware2_MDN.sbin
 PSP_SEC_DEBUG_FILE         TypeId0x13_PspEarlyUnlock_MDN.sbin
-PSP_HW_IPCFG_FILE          TypeId0x20_HwIpCfg_MDN.sbin
+PSP_HW_IPCFG_FILE_SUB0     TypeId0x20_HwIpCfg_MDN.sbin
 PSP_IKEK_FILE              TypeId0x21_PspiKek_MDN.bin
 PSP_SECG0_FILE             TypeId0x24_SecPolicy_MDN.sbin
 PSP_MP2FW0_FILE            TypeId0x25_Mp2Fw_MDN.sbin
diff --git a/src/soc/amd/cezanne/fw.cfg b/src/soc/amd/cezanne/fw.cfg
index 36b45caa34..8988c84c9d 100644
--- a/src/soc/amd/cezanne/fw.cfg
+++ b/src/soc/amd/cezanne/fw.cfg
@@ -16,7 +16,7 @@ PSPSECUREDEBUG_FILE     TypeId0x09_SecureDebugUnlockKey_CZN.stkn
 PSPTRUSTLETS_FILE       TypeId0x0C_FtpmDrv_CZN.csbin
 PSP_SMUFW2_SUB0_FILE    TypeId0x12_SmuFirmware2_CZN.csbin
 PSP_SEC_DEBUG_FILE      TypeId0x13_PspEarlyUnlock_CZN.sbin
-PSP_HW_IPCFG_FILE       TypeId0x20_HwIpCfg_CZN_A0.sbin
+PSP_HW_IPCFG_FILE_SUB0  TypeId0x20_HwIpCfg_CZN_A0.sbin
 PSP_IKEK_FILE           TypeId0x21_PspIkek_CZN.bin Lxb
 PSP_SECG0_FILE          TypeId0x24_SecurePolicyL0_CZN.sbin
 PSP_MP2FW0_FILE         TypeId0x25_Mp2Fw_CZN.sbin
diff --git a/src/soc/amd/glinda/fw.cfg b/src/soc/amd/glinda/fw.cfg
index 11908df200..a689a7f0e0 100644
--- a/src/soc/amd/glinda/fw.cfg
+++ b/src/soc/amd/glinda/fw.cfg
@@ -12,7 +12,7 @@ PSPSECUREDEBUG_FILE        TypeId0x09_SDU.stkn
 PSPTRUSTLETS_FILE          TypeId0x0C_FtpmDrv.csbin
 PSP_SMUFW2_SUB0_FILE       TypeId0x12_SmuFirmware2.sbin
 PSP_SEC_DEBUG_FILE         TypeId0x13_PspEarlyUnlock.sbin
-PSP_HW_IPCFG_FILE          TypeId0x20_HwIpCfg.sbin
+PSP_HW_IPCFG_FILE_SUB0     TypeId0x20_HwIpCfg.sbin
 PSP_IKEK_FILE              TypeId0x21_PspiKek.bin
 PSP_SECG0_FILE             TypeId0x24_SecPolicy.sbin
 PSP_MP2FW0_FILE            TypeId0x25_Mp2Fw.sbin
diff --git a/src/soc/amd/mendocino/fw.cfg b/src/soc/amd/mendocino/fw.cfg
index cf3a446932..c5d5d86519 100644
--- a/src/soc/amd/mendocino/fw.cfg
+++ b/src/soc/amd/mendocino/fw.cfg
@@ -13,7 +13,7 @@ PSPSECUREDEBUG_FILE        TypeId0x09_Mendocino-SDU.stkn
 PSPTRUSTLETS_FILE          TypeId0x0C_FtpmDrv_MDN.csbin
 PSP_SMUFW2_SUB0_FILE       TypeId0x12_SmuFirmware2_MDN.sbin
 PSP_SEC_DEBUG_FILE         TypeId0x13_PspEarlyUnlock_MDN.sbin
-PSP_HW_IPCFG_FILE          TypeId0x20_HwIpCfg_MDN.sbin
+PSP_HW_IPCFG_FILE_SUB0     TypeId0x20_HwIpCfg_MDN.sbin
 PSP_IKEK_FILE              TypeId0x21_PspiKek_MDN.bin
 PSP_SECG0_FILE             TypeId0x24_SecPolicy_MDN.sbin
 PSP_MP2FW0_FILE            TypeId0x25_Mp2Fw_MDN.sbin
diff --git a/src/soc/amd/phoenix/fw.cfg b/src/soc/amd/phoenix/fw.cfg
index 4ee4cd497d..73a6ffd9de 100644
--- a/src/soc/amd/phoenix/fw.cfg
+++ b/src/soc/amd/phoenix/fw.cfg
@@ -12,7 +12,7 @@ PSPSECUREDEBUG_FILE        TypeId0x09_SDU.stkn
 PSPTRUSTLETS_FILE          TypeId0x0C_FtpmDrv.csbin
 PSP_SMUFW2_SUB0_FILE       TypeId0x12_SmuFirmware2.sbin
 PSP_SEC_DEBUG_FILE         TypeId0x13_PspEarlyUnlock.sbin
-PSP_HW_IPCFG_FILE          TypeId0x20_HwIpCfg.sbin
+PSP_HW_IPCFG_FILE_SUB0     TypeId0x20_HwIpCfg.sbin
 PSP_IKEK_FILE              TypeId0x21_PspiKek.bin
 PSP_SECG0_FILE             TypeId0x24_SecPolicy.sbin
 PSP_MP2FW0_FILE            TypeId0x25_Mp2Fw.sbin
diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c
index 53cfa77863..e53e5dc0b3 100644
--- a/util/amdfwtool/amdfwtool.c
+++ b/util/amdfwtool/amdfwtool.c
@@ -279,7 +279,8 @@ amd_fw_entry amd_psp_fw_table[] = {
 	{ .type = AMD_DEBUG_DRIVER, .level = PSP_BOTH | PSP_LVL2_AB },
 	{ .type = AMD_INTERFACE_DRIVER, .level = PSP_BOTH | PSP_LVL2_AB },
 	{ .type = AMD_DEBUG_UNLOCK, .level = PSP_LVL2 | PSP_LVL2_AB },
-	{ .type = AMD_HW_IPCFG, .level = PSP_LVL2 | PSP_LVL2_AB },
+	{ .type = AMD_HW_IPCFG, .subprog = 0, .level = PSP_LVL2 | PSP_LVL2_AB },
+	{ .type = AMD_HW_IPCFG, .subprog = 1, .level = PSP_LVL2 | PSP_LVL2_AB },
 	{ .type = AMD_WRAPPED_IKEK, .level = PSP_BOTH | PSP_LVL2_AB, .skip_hashing = true },
 	{ .type = AMD_TOKEN_UNLOCK, .level = PSP_BOTH | PSP_LVL2_AB },
 	{ .type = AMD_SEC_GASKET, .subprog = 0, .level = PSP_BOTH | PSP_LVL2_AB },
diff --git a/util/amdfwtool/data_parse.c b/util/amdfwtool/data_parse.c
index 2f338309ed..8b6ecb70d1 100644
--- a/util/amdfwtool/data_parse.c
+++ b/util/amdfwtool/data_parse.c
@@ -179,9 +179,12 @@ static uint8_t find_register_fw_filename_psp_dir(char *fw_name, char *filename,
 	} else if (strcmp(fw_name, "PSP_SMUFW1_SUB0_FILE") == 0) {
 		fw_type = AMD_FW_PSP_SMU_FIRMWARE;
 		subprog = 0;
-	} else if (strcmp(fw_name, "PSP_HW_IPCFG_FILE") == 0) {
+	} else if (strcmp(fw_name, "PSP_HW_IPCFG_FILE_SUB0") == 0) {
 		fw_type = AMD_HW_IPCFG;
 		subprog = 0;
+	} else if (strcmp(fw_name, "PSP_HW_IPCFG_FILE_SUB1") == 0) {
+		fw_type = AMD_HW_IPCFG;
+		subprog = 1;
 	} else if (strcmp(fw_name, "PSP_SMUFW1_SUB1_FILE") == 0) {
 		fw_type = AMD_FW_PSP_SMU_FIRMWARE;
 		subprog = 1;