From c4f3a33e4967769bb3b1c7606070364100a6b205 Mon Sep 17 00:00:00 2001 From: Fred Reitberger Date: Tue, 7 Feb 2023 12:12:40 -0500 Subject: [PATCH] util/amdfwtool: Add UMSMU blob support Add PSP blob Type 0xA2 uMsmu support. Signed-off-by: Fred Reitberger Change-Id: Ib38ec03bf20f46774f7438b21d18704cc1ec57fc Reviewed-on: https://review.coreboot.org/c/coreboot/+/72900 Tested-by: build bot (Jenkins) Reviewed-by: ritul guru Reviewed-by: Felix Held --- util/amdfwtool/amdfwtool.c | 1 + util/amdfwtool/amdfwtool.h | 1 + util/amdfwtool/data_parse.c | 3 +++ 3 files changed, 5 insertions(+) diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c index f1b31bee6c..9fe6b9a4c3 100644 --- a/util/amdfwtool/amdfwtool.c +++ b/util/amdfwtool/amdfwtool.c @@ -350,6 +350,7 @@ amd_fw_entry amd_psp_fw_table[] = { { .type = AMD_FW_MINIMSMU, .inst = 0, .level = PSP_BOTH | PSP_LVL2_AB }, { .type = AMD_FW_MINIMSMU, .inst = 1, .level = PSP_BOTH | PSP_LVL2_AB }, { .type = AMD_FW_SRAM_FW_EXT, .level = PSP_LVL2 | PSP_LVL2_AB }, + { .type = AMD_FW_UMSMU, .level = PSP_LVL2 | PSP_LVL2_AB }, { .type = AMD_FW_INVALID }, }; diff --git a/util/amdfwtool/amdfwtool.h b/util/amdfwtool/amdfwtool.h index f30dce6fc2..774c2e4968 100644 --- a/util/amdfwtool/amdfwtool.h +++ b/util/amdfwtool/amdfwtool.h @@ -87,6 +87,7 @@ typedef enum _amd_fw_type { AMD_FW_FCFG_TABLE = 0x98, AMD_FW_MINIMSMU = 0x9a, AMD_FW_SRAM_FW_EXT = 0x9d, + AMD_FW_UMSMU = 0xa2, AMD_FW_IMC = 0x200, /* Large enough to be larger than the top BHD entry type. */ AMD_FW_GEC, AMD_FW_XHCI, diff --git a/util/amdfwtool/data_parse.c b/util/amdfwtool/data_parse.c index f82947531d..696248176a 100644 --- a/util/amdfwtool/data_parse.c +++ b/util/amdfwtool/data_parse.c @@ -392,6 +392,9 @@ static uint8_t find_register_fw_filename_psp_dir(char *fw_name, char *filename, } else if (strcmp(fw_name, "TA_IKEK_FILE") == 0) { fw_type = AMD_TA_IKEK; subprog = 0; + } else if (strcmp(fw_name, "UMSMU_FILE") == 0) { + fw_type = AMD_FW_UMSMU; + subprog = 0; } else if (strcmp(fw_name, "PSP_OEM_ABL_KEY_FILE") == 0) { fw_type = AMD_FW_ABL_PUBKEY; subprog = 0;