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

amdfwtool: Add HW IPCFG file whose subprog is 1

Browse Source 
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>
This commit is contained in:
Zheng Bao 2023-03-07 19:48:11 +08:00 committed by Felix Held
parent 6bd9d959dd
commit 9bb62cb364
8 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mainboard/google/guybrush/variants/baseboard/amdfw.cfg
View File

@ -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

2
src/mainboard/google/skyrim/amdfw.cfg
View File

@ -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

2
src/soc/amd/cezanne/fw.cfg
View File

@ -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

2
src/soc/amd/glinda/fw.cfg
View File

@ -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

2
src/soc/amd/mendocino/fw.cfg
View File

@ -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

2
src/soc/amd/phoenix/fw.cfg
View File

@ -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

3
util/amdfwtool/amdfwtool.c
View File

@ -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 },

5
util/amdfwtool/data_parse.c
View File

@ -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;