Attention is currently required from: Zheng Bao. Hello Zheng Bao,
I'd like you to do a code review. Please visit
https://review.coreboot.org/c/coreboot/+/57064
to review the following change.
Change subject: amdfwtool: Remove some duplicate binaries/entries in PSP table ......................................................................
amdfwtool: Remove some duplicate binaries/entries in PSP table
Based on test on Cezanne, these duplicated FWs can be removed from level 1 entry.
Please refer the previous change, https://review.coreboot.org/c/coreboot/+/57063 which can make the Picasso platform, which only has one level, not change.
BUG=b:195329409
Change-Id: Ia81b8a85792d1565445803100bdb01c3436e5698 Signed-off-by: Zheng Bao fishbaozi@gmail.com --- M util/amdfwtool/amdfwtool.c 1 file changed, 16 insertions(+), 16 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/64/57064/1
diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c index 8f9acf1..40c43e9 100644 --- a/util/amdfwtool/amdfwtool.c +++ b/util/amdfwtool/amdfwtool.c @@ -222,8 +222,8 @@ amd_fw_entry amd_psp_fw_table[] = { { .type = AMD_FW_PSP_PUBKEY, .level = PSP_BOTH }, { .type = AMD_FW_PSP_BOOTLOADER, .level = PSP_BOTH }, - { .type = AMD_FW_PSP_SMU_FIRMWARE, .subprog = 0, .level = PSP_BOTH }, - { .type = AMD_FW_PSP_RECOVERY, .level = PSP_LVL1 }, + { .type = AMD_FW_PSP_SMU_FIRMWARE, .subprog = 0, .level = PSP_LVL2 }, +/* { .type = AMD_FW_PSP_RECOVERY, .level = PSP_LVL1 },*/ { .type = AMD_FW_PSP_RTM_PUBKEY, .level = PSP_BOTH }, { .type = AMD_FW_PSP_SECURED_OS, .level = PSP_LVL2 }, { .type = AMD_FW_PSP_NVRAM, .level = PSP_LVL2 }, @@ -234,7 +234,7 @@ { .type = AMD_FW_PSP_SMU_FIRMWARE2, .subprog = 2, .level = PSP_BOTH }, { .type = AMD_FW_PSP_SMU_FIRMWARE, .subprog = 1, .level = PSP_BOTH }, { .type = AMD_FW_PSP_SMU_FIRMWARE2, .subprog = 1, .level = PSP_BOTH }, - { .type = AMD_FW_PSP_SMU_FIRMWARE2, .level = PSP_BOTH }, + { .type = AMD_FW_PSP_SMU_FIRMWARE2, .level = PSP_LVL2 }, { .type = AMD_FW_PSP_SMUSCS, .level = PSP_BOTH }, { .type = AMD_PSP_FUSE_CHAIN, .level = PSP_LVL2 }, { .type = AMD_DEBUG_UNLOCK, .level = PSP_LVL2 }, @@ -250,8 +250,8 @@ { .type = AMD_DRIVER_ENTRIES, .level = PSP_LVL2 }, { .type = AMD_FW_KVM_IMAGE, .level = PSP_LVL2}, { .type = AMD_S0I3_DRIVER, .level = PSP_LVL2 }, - { .type = AMD_VBIOS_BTLOADER, .level = PSP_BOTH }, - { .type = AMD_FW_TOS_SEC_POLICY, .level = PSP_BOTH }, + { .type = AMD_VBIOS_BTLOADER, .level = PSP_LVL2 }, + { .type = AMD_FW_TOS_SEC_POLICY, .level = PSP_LVL2 }, { .type = AMD_FW_USB_PHY, .level = PSP_LVL2 }, { .type = AMD_FW_DRTM_TA, .level = PSP_LVL2 }, { .type = AMD_FW_KEYDB_BL, .level = PSP_BOTH }, @@ -260,7 +260,7 @@ { .type = AMD_FW_DMCU_ISR, .level = PSP_LVL2 }, { .type = AMD_RPMC_NVRAM, .level = PSP_LVL2 }, { .type = AMD_FW_PSP_BOOTLOADER_AB, .level = PSP_LVL2 }, - { .type = AMD_ABL0, .level = PSP_BOTH }, + { .type = AMD_ABL0, .level = PSP_LVL2 }, { .type = AMD_ABL1, .level = PSP_BOTH }, { .type = AMD_ABL2, .level = PSP_BOTH }, { .type = AMD_ABL3, .level = PSP_BOTH }, @@ -285,7 +285,7 @@
amd_bios_entry amd_bios_table[] = { { .type = AMD_BIOS_RTM_PUBKEY, .inst = 0, .level = BDT_BOTH }, - { .type = AMD_BIOS_APCB, .inst = 0, .level = BDT_BOTH }, + { .type = AMD_BIOS_APCB, .inst = 0, .level = BDT_LVL2 }, { .type = AMD_BIOS_APCB, .inst = 1, .level = BDT_BOTH }, { .type = AMD_BIOS_APCB, .inst = 2, .level = BDT_BOTH }, { .type = AMD_BIOS_APCB, .inst = 3, .level = BDT_BOTH }, @@ -301,7 +301,7 @@ { .type = AMD_BIOS_APCB, .inst = 13, .level = BDT_BOTH }, { .type = AMD_BIOS_APCB, .inst = 14, .level = BDT_BOTH }, { .type = AMD_BIOS_APCB, .inst = 15, .level = BDT_BOTH }, - { .type = AMD_BIOS_APCB_BK, .inst = 0, .level = BDT_BOTH }, + { .type = AMD_BIOS_APCB_BK, .inst = 0, .level = BDT_LVL2 }, { .type = AMD_BIOS_APCB_BK, .inst = 1, .level = BDT_BOTH }, { .type = AMD_BIOS_APCB_BK, .inst = 2, .level = BDT_BOTH }, { .type = AMD_BIOS_APCB_BK, .inst = 3, .level = BDT_BOTH }, @@ -317,14 +317,14 @@ { .type = AMD_BIOS_APCB_BK, .inst = 13, .level = BDT_BOTH }, { .type = AMD_BIOS_APCB_BK, .inst = 14, .level = BDT_BOTH }, { .type = AMD_BIOS_APCB_BK, .inst = 15, .level = BDT_BOTH }, - { .type = AMD_BIOS_APOB, .level = BDT_BOTH }, + { .type = AMD_BIOS_APOB, .level = BDT_LVL2 }, { .type = AMD_BIOS_BIN, - .reset = 1, .copy = 1, .zlib = 1, .level = BDT_BOTH }, + .reset = 1, .copy = 1, .zlib = 1, .level = BDT_LVL2 }, { .type = AMD_BIOS_APOB_NV, .level = BDT_LVL2 }, - { .type = AMD_BIOS_PMUI, .inst = 1, .subpr = 0, .level = BDT_BOTH }, - { .type = AMD_BIOS_PMUD, .inst = 1, .subpr = 0, .level = BDT_BOTH }, - { .type = AMD_BIOS_PMUI, .inst = 4, .subpr = 0, .level = BDT_BOTH }, - { .type = AMD_BIOS_PMUD, .inst = 4, .subpr = 0, .level = BDT_BOTH }, + { .type = AMD_BIOS_PMUI, .inst = 1, .subpr = 0, .level = BDT_LVL2 }, + { .type = AMD_BIOS_PMUD, .inst = 1, .subpr = 0, .level = BDT_LVL2 }, + { .type = AMD_BIOS_PMUI, .inst = 4, .subpr = 0, .level = BDT_LVL2 }, + { .type = AMD_BIOS_PMUD, .inst = 4, .subpr = 0, .level = BDT_LVL2 }, { .type = AMD_BIOS_PMUI, .inst = 1, .subpr = 1, .level = BDT_BOTH }, { .type = AMD_BIOS_PMUD, .inst = 1, .subpr = 1, .level = BDT_BOTH }, { .type = AMD_BIOS_PMUI, .inst = 4, .subpr = 1, .level = BDT_BOTH }, @@ -333,7 +333,7 @@ { .type = AMD_BIOS_UCODE, .inst = 1, .level = BDT_LVL2 }, { .type = AMD_BIOS_UCODE, .inst = 2, .level = BDT_LVL2 }, { .type = AMD_BIOS_MP2_CFG, .level = BDT_LVL2 }, - { .type = AMD_BIOS_PSP_SHARED_MEM, .inst = 0, .level = BDT_BOTH }, + { .type = AMD_BIOS_PSP_SHARED_MEM, .inst = 0, .level = BDT_LVL2 }, { .type = AMD_BIOS_INVALID }, };
@@ -745,7 +745,7 @@ int i;
for (i = 0 ; table[i].type != AMD_BIOS_INVALID; i++) { - if (table[i].level & BDT_LVL1 && table[i].filename) + if (table[i].level & BDT_BOTH && table[i].filename) return 1; } return 0;