Change in coreboot[master]: amdfwtool: Change the some FW's level for A/B recovery

[Felix Held (Code Review)]

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/62329 )

Change subject: amdfwtool: Change the some FW's level for A/B recovery
......................................................................

amdfwtool: Change the some FW's level for A/B recovery

The Pubkey(0), PSP bootloader(1) and IKEK(0x21) should be put to
level 2 only for A/B recovery for Sabrina, which is going to be the
long term and A/B recovery layout only. So the amdfwtool should be
changed for Sabrina.

The old levels of these 3 FWs are for Cezanne, which doesn't use AB
recovery now. Just set the specific field levels in generic Cezanne
folder for demo. Leave the fw.cfg in Guybrush unchanged.

Change-Id: I11092b52927b2c526a5be719104ba39a790b6fa8
Signed-off-by: Zheng Bao 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/62329
Tested-by: build bot (Jenkins) 
Reviewed-by: Felix Held 
Reviewed-by: Jason Glenesk 
---
M src/soc/amd/cezanne/fw.cfg
M util/amdfwtool/amdfwtool.c
2 files changed, 6 insertions(+), 6 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Felix Held: Looks good to me, approved
  Jason Glenesk: Looks good to me, but someone else must approve

diff --git a/src/soc/amd/cezanne/fw.cfg b/src/soc/amd/cezanne/fw.cfg
index 565ab7a..b733c45 100644
--- a/src/soc/amd/cezanne/fw.cfg
+++ b/src/soc/amd/cezanne/fw.cfg
@@ -4,9 +4,9 @@

# type                    file
 # PSP
-AMD_PUBKEY_FILE         TypeId0x00_CezannePublicKey.tkn
+AMD_PUBKEY_FILE         TypeId0x00_CezannePublicKey.tkn Lxb
 PSPBTLDR_FILE           TypeId0x01_PspBootLoader_CZN.sbin
-PSPBTLDR_AB_STAGE1_FILE TypeId0x01_PspBootLoader_AB_Stage1_CZN.sbin
+PSPBTLDR_AB_STAGE1_FILE TypeId0x01_PspBootLoader_AB_Stage1_CZN.sbin Lx1
 PSPBTLDR_WL_FILE        TypeId0x01_PspBootLoader_WL_CZN.sbin
 PSPSECUREOS_FILE        TypeId0x02_PspOS_CZN.sbin
 PSPRCVR_FILE            TypeId0x03_PspRecoveryBootLoader_CZN.sbin
@@ -16,7 +16,7 @@
 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_IKEK_FILE           TypeId0x21_PspIkek_CZN.bin
+PSP_IKEK_FILE           TypeId0x21_PspIkek_CZN.bin Lxb
 PSP_SECG0_FILE          TypeId0x24_SecurePolicyL0_CZN.sbin
 PSP_MP2FW0_FILE         TypeId0x25_Mp2Fw_CZN.sbin
 AMD_DRIVER_ENTRIES      TypeId0x28_PspSystemDriver_CZN.sbin
diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c
index f5b73d2..8023595 100644
--- a/util/amdfwtool/amdfwtool.c
+++ b/util/amdfwtool/amdfwtool.c
@@ -221,8 +221,8 @@
 }

amd_fw_entry amd_psp_fw_table[] = {
-	{ .type = AMD_FW_PSP_PUBKEY, .level = PSP_BOTH | PSP_BOTH_AB },
-	{ .type = AMD_FW_PSP_BOOTLOADER, .level = PSP_BOTH | PSP_LVL1_AB },
+	{ .type = AMD_FW_PSP_PUBKEY, .level = PSP_BOTH | PSP_LVL2_AB },
+	{ .type = AMD_FW_PSP_BOOTLOADER, .level = PSP_BOTH | PSP_LVL2_AB },
    { .type = AMD_FW_PSP_SMU_FIRMWARE, .subprog = 0, .level = PSP_BOTH | PSP_LVL2_AB },
    { .type = AMD_FW_PSP_RECOVERY, .level = PSP_LVL1 },
    { .type = AMD_FW_PSP_RTM_PUBKEY, .level = PSP_BOTH },
@@ -240,7 +240,7 @@
    { .type = AMD_PSP_FUSE_CHAIN, .level = PSP_LVL2 | 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_WRAPPED_IKEK, .level = PSP_BOTH | PSP_BOTH_AB },
+	{ .type = AMD_WRAPPED_IKEK, .level = PSP_BOTH | PSP_LVL2_AB },
    { .type = AMD_TOKEN_UNLOCK, .level = PSP_BOTH | PSP_LVL2_AB },
    { .type = AMD_SEC_GASKET, .subprog = 0, .level = PSP_BOTH | PSP_LVL2_AB },
    { .type = AMD_SEC_GASKET, .subprog = 2, .level = PSP_BOTH | PSP_LVL2_AB },