aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarthikeyan Ramasubramanian <kramasub@chromium.org>2022-05-03 18:16:34 -0600
committerFelix Held <felix-coreboot@felixheld.de>2022-05-05 14:48:31 +0000
commit0ab04d285149d7bf5df433dd9d1759a364fddcc0 (patch)
tree7aa83455278d610ca1d88dc1c0790d37896b4856
parentf9734fc1420a7f3fc7adde26415dfb692e15c314 (diff)
util/amdfwtool: Add IKEK key for Trusted Application
This binary file is required for use by Trusted Applications that execute in PSP. BUG=b:229947314 TEST=Build and boot to OS in Skyrim. Change-Id: I2d05792cfd98fa9c38f5deef1ac3282625983eeb Signed-off-by: Karthikeyan Ramasubramanian <kramasub@google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/64040 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Raul Rangel <rrangel@chromium.org> Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
-rw-r--r--util/amdfwtool/amdfwtool.c1
-rw-r--r--util/amdfwtool/amdfwtool.h1
-rw-r--r--util/amdfwtool/data_parse.c3
3 files changed, 5 insertions, 0 deletions
diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c
index 3273b7284e..c58d1e9fc0 100644
--- a/util/amdfwtool/amdfwtool.c
+++ b/util/amdfwtool/amdfwtool.c
@@ -265,6 +265,7 @@ amd_fw_entry amd_psp_fw_table[] = {
{ .type = AMD_FW_SPIROM_CFG, .level = PSP_LVL2 | PSP_LVL2_AB },
{ .type = AMD_RPMC_NVRAM, .level = PSP_LVL2 | PSP_LVL2_AB },
{ .type = AMD_FW_PSP_BOOTLOADER_AB, .level = PSP_LVL2 | PSP_LVL2_AB },
+ { .type = AMD_TA_IKEK, .level = PSP_BOTH | PSP_LVL2_AB },
{ .type = AMD_ABL0, .level = PSP_BOTH | PSP_LVL2_AB },
{ .type = AMD_ABL1, .level = PSP_BOTH | PSP_LVL2_AB },
{ .type = AMD_ABL2, .level = PSP_BOTH | PSP_LVL2_AB },
diff --git a/util/amdfwtool/amdfwtool.h b/util/amdfwtool/amdfwtool.h
index cc0a3b135b..0bef43a6cd 100644
--- a/util/amdfwtool/amdfwtool.h
+++ b/util/amdfwtool/amdfwtool.h
@@ -58,6 +58,7 @@ typedef enum _amd_fw_type {
AMD_FW_SPIROM_CFG = 0x5c,
AMD_FW_DMCUB = 0x71,
AMD_FW_PSP_BOOTLOADER_AB = 0x73,
+ AMD_TA_IKEK = 0x8d,
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 a080eecfa8..14c1567321 100644
--- a/util/amdfwtool/data_parse.c
+++ b/util/amdfwtool/data_parse.c
@@ -328,6 +328,9 @@ static uint8_t find_register_fw_filename_psp_dir(char *fw_name, char *filename,
} else {
fw_type = AMD_FW_SKIP;
}
+ } else if (strcmp(fw_name, "TA_IKEK_FILE") == 0) {
+ fw_type = AMD_TA_IKEK;
+ subprog = 0;
} else {
fw_type = AMD_FW_INVALID;
/* TODO: Add more */