Issues with parsing AMD images

[Anton-35]

What is these banks 0 ? Why UEFI image is showed twice? When i'm searching the data it is found in both banks. This is misleading.

[NikolajSchlej]

Thanks for reporting, will investigate. CC @Ykidia for awareness.

[NikolajSchlej]

This is certainly a result of borked parsing, attaching the BIOS image for further investigation.

UM3504DAAS.312.zip

[NikolajSchlej]

Found the sources of the official AMD tool that is used for building all those fancy PSP-related structures: https://github.com/openSIL/AGCL-R/blob/0a60473007604550bd0fb708cc1a820240d1bc51/AgesaModulePkg/AMDTools/NewPspKit/PspDirectoryTool/BuildPspDirectory.py

[NikolajSchlej]

Result of running PSPTool on the image attached above

Warning: Input  file is 0x2000800, will assume ROM size of 32M
Warning: Unknown zen_generation_id=b'\x02\r\xbc'
Warning: Unknown zen_generation_id=b'\x02\r\xbc'
Warning: Unknown zen_generation_id=b'\x02\r\xbc'
Warning: Unknown zen_generation_id=b'\x02\r\xbc'
+-----+-------+-----------+---------+---------------+
| ROM |  Addr |    Size   |   FET   |     AGESA     |
+-----+-------+-----------+---------+---------------+
|  0  | 0x800 | 0x2000000 | 0x20800 | AGESA_UNKNOWN |
+-----+-------+-----------+---------+---------------+
+--+-----------+---------+------------+-------+---------------------+
|  | Directory |   Addr  | Generation | Magic | Secondary Directory |
+--+-----------+---------+------------+-------+---------------------+
|  |     0     | 0xc1800 |    None    |  $PSP |                     |
+--+-----------+---------+------------+-------+---------------------+
+--+---+-------+---------+------+---------------------+------------+----------+----------+--------------+-----------+
|  |   | Entry | Address | Size |                Type | Subprogram | Instance | Magic/ID | File Version | File Info |
+--+---+-------+---------+------+---------------------+------------+----------+----------+--------------+-----------+
|  |   |     0 | 0xc3800 |  0x0 | PSP_FW_L2A_PTR~0x48 |        0x0 |      0x0 |          |              |           |
|  |   |     1 | 0xc4800 |  0x0 | PSP_FW_L2B_PTR~0x4a |        0x0 |      0x0 |          |              |           |
+--+---+-------+---------+------+---------------------+------------+----------+----------+--------------+-----------+


+--+-----------+---------+-----------------------------+-------+---------------------+
|  | Directory |   Addr  |          Generation         | Magic | Secondary Directory |
+--+-----------+---------+-----------------------------+-------+---------------------+
|  |     1     | 0xc5800 | unknown (PSP ID 0xbc0d0200) |  $PL2 |       0x445000      |
+--+-----------+---------+-----------------------------+-------+---------------------+
+--+---+-------+----------+---------+-------------------------------+------------+----------+----------+--------------+------------------------------------------+
|  |   | Entry |  Address |    Size |                          Type | Subprogram | Instance | Magic/ID | File Version |                                File Info |
+--+---+-------+----------+---------+-------------------------------+------------+----------+----------+--------------+------------------------------------------+
|  |   |     0 |  0xc5c00 |   0x440 |            AMD_PUBLIC_KEY~0x0 |        0x0 |      0x0 |     BF7E |            1 |                            AMD_CODE_SIGN |
|  |   |     1 |  0xc6100 |  0x1d80 |        PSP_FW_BOOT_LOADER~0x1 |        0x0 |      0x0 |     $PS1 |    0.28.0.6E |                verified(BF7E), sha256_ok |
|  |   |     2 |  0xc7f00 | 0x13780 |       PSP_FW_BOOT_LOADER~0x73 |        0x0 |      0x0 |     $PS1 |    0.28.0.6E |                verified(9204), sha256_ok |
|  |   |     3 |  0xdb700 | 0x16480 |         PSP_FW_TRUSTED_OS~0x2 |        0x0 |      0x0 |     $PS1 |    0.28.0.6E |                verified(4979), sha256_ok |
|  |   |     4 |  0x61800 | 0x20000 |               PSP_NV_DATA~0x4 |        0x0 |      0x0 |          |              |                                          |
|  |   |     5 |  0xf1c00 | 0x21900 |            SMU_OFFCHIP_FW~0x8 |        0x0 |      0x0 |     $PS1 |    0.45.40.0 | compressed, veri-failed(D63D), sha256_ok |
|  |   |     6 | 0x113500 | 0x22510 |            SMU_OFFCHIP_FW~0x8 |        0x1 |      0x0 |     $PS1 |    4.45.3D.0 | compressed, veri-failed(D63D), sha256_ok |
|  |   |     7 | 0x135b00 |   0x440 |        SEC_DBG_PUBLIC_KEY~0x9 |        0x0 |      0x0 |     BE53 |            1 |     verified(BF7E), unknown_key_usage(3) |
|  |   |     8 |  0xc5890 |    0x10 |        SOFT_FUSE_CHAIN_01~0xb |        0x0 |      0x0 |          |              |                  soft_fuse(0x101000c041) |
|  |   |     9 | 0x136000 | 0x23100 |   PSP_BOOT_TIME_TRUSTLETS~0xc |        0x0 |      0x0 |     $PS1 |     6.1D.0.6 |                verified(CC7D), sha256_ok |
|  |   |    10 | 0x159100 | 0x1ad50 |        SMU_OFF_CHIP_FW_2~0x12 |        0x0 |      0x0 |     $PS1 |    0.45.40.0 | compressed, veri-failed(D63D), sha256_ok |
|  |   |    11 | 0x173f00 | 0x23210 |        SMU_OFF_CHIP_FW_2~0x12 |        0x1 |      0x0 |     $PS1 |    4.45.3D.0 | compressed, veri-failed(D63D), sha256_ok |
|  |   |    12 | 0x197200 |  0x2140 |             DEBUG_UNLOCK~0x13 |        0x0 |      0x0 |     $PS1 |    0.28.0.6E |                verified(5DD9), sha256_ok |
|  |   |    13 | 0x199400 |   0x650 |       HARDWARE_IP_CONFIG~0x20 |        0x0 |      0x0 |     $PS1 |      0.0.0.0 |                verified(F9C8), sha256_ok |
|  |   |    14 | 0x199b00 |   0x650 |       HARDWARE_IP_CONFIG~0x20 |        0x1 |      0x0 |     $PS1 |      0.0.0.1 |                verified(F9C8), sha256_ok |
|  |   |    15 | 0x19a200 |    0x30 |             WRAPPED_IKEK~0x21 |        0x0 |      0x0 |          |              |                                          |
|  |   |    16 | 0x19a800 |  0x1000 |             TOKEN_UNLOCK~0x22 |        0x0 |      0x0 |          |              |                                          |
|  |   |    17 | 0x19b800 |  0x4dc0 |               SEC_GASKET~0x24 |        0x0 |      0x0 |     $PS1 |    D.18.0.72 |                verified(6159), sha256_ok |
|  |   |    18 | 0x1a0600 | 0x2e7c0 |                   MP2_FW~0x25 |        0x0 |      0x0 |     $PS1 |      8.0.9.6 |                verified(C9C6), sha256_ok |
|  |   |    19 | 0x1cee00 | 0x22890 |           DRIVER_ENTRIES~0x28 |        0x0 |      0x0 |     $PS1 |    0.28.0.6E |                verified(4979), sha256_ok |
|  |   |    20 | 0x1f1700 |  0x3100 |              S0I3_DRIVER~0x2d |        0x0 |      0x0 |     $PS1 |   1C.1.70.11 |                verified(CC7D), sha256_ok |
|  |   |    21 | 0x1f4800 |   0x2b0 |                     ABL0~0x30 |        0x0 |      0x0 |     $PS1 |  2B.18.70.10 |                verified(A0D1), sha256_ok |
|  |   |    22 | 0x265c00 |  0x1900 |            VBIOS_PRELOAD~0x3c |        0x0 |      0x0 |     $PS1 |   20.11.0.1C |                verified(6C45), sha256_ok |
|  |   |    23 | 0x267500 |  0x2270 |      TOS_SECURITY_POLICY~0x45 |        0x0 |      0x0 |     $PS1 |    D.18.1.72 |                verified(6159), sha256_ok |
|  |   |    24 | 0x269800 |   0x220 |                  FW_XHCI~0x44 |        0x0 |      0x0 |     $PS1 |      0.1.0.A |                verified(82A5), sha256_ok |
|  |   |    25 | 0x27a100 |   0x220 |                  FW_XHCI~0x44 |        0x1 |      0x0 |     $PS1 |     0.1.0.15 |                verified(82A5), sha256_ok |
|  |   |    26 | 0x28aa00 |  0x5100 |                  DRTM_TA~0x47 |        0x0 |      0x0 |     $PS1 |    4.11.0.34 |                verified(61CE), sha256_ok |
|  |   |    27 | 0x28fb00 |  0x1f40 |            BL_PUBLIC_KEY~0x50 |        0x0 |      0x0 |     $PS1 |            1 |                verified(BF7E), sha256_ok |
|  |   |    28 | 0x291b00 |  0x16b0 |           TOS_PUBLIC_KEY~0x51 |        0x0 |      0x0 |     $PS1 |            1 |                verified(BF7E), sha256_ok |
|  |   |    29 | 0x293200 |   0x640 |          BL_ROLLBACK_SPL~0x55 |        0x0 |      0x0 |     $PS1 |    5.28.0.6B |                verified(BF7E), sha256_ok |
|  |   |    30 | 0x293900 | 0x4b630 |            MSMU_BINARY_0~0x5a |        0x0 |      0x0 |     $PS1 |   FF.45.29.0 |                verified(5E2F), sha256_ok |
|  |   |    31 | 0x2df000 |  0xf420 |            MSMU_BINARY_0~0x5a |        0x1 |      0x0 |     $PS1 |   FF.45.2E.0 | compressed, veri-failed(5E2F), sha256_ok |
|  |   |    32 | 0x2ee500 |   0x9a0 |           SPI_ROM_CONFIG~0x5c |        0x0 |      0x0 |     $PS1 |    0.22.26.1 |                verified(8A19), sha256_ok |
|  |   |    33 | 0x2eef00 | 0x60000 | FW_PSP_SMUSCS_OR_TPMLITE~0x5f |        0x0 |      0x0 |          |              |                                          |
|  |   |    34 | 0x34ef00 | 0x18b90 |           PSP_DMCUB_CODE~0x71 |        0x0 |      0x0 |     $PS1 |    0.0.50.4A |                verified(45B9), sha256_ok |
|  |   |    35 | 0x367b00 | 0x2d290 |           PSP_DMCUB_CODE~0x71 |        0x1 |      0x0 |     $PS1 |    4.0.15.47 |                verified(45B9), sha256_ok |
|  |   |    36 | 0x394e00 |   0x210 |        REGISTER_INIT_BIN~0x76 |        0x0 |      0x0 |     $PS1 |      1.0.2.B |                verified(4907), sha256_ok |
|  |   |    37 | 0x396300 |    0x30 |                  IKEK_TA~0x8d |        0x0 |      0x0 |          |              |                                          |
|  |   |    38 |  0x81800 | 0x40000 |                PSP_NVRAM~0x54 |        0x0 |      0x0 |          |              |                                          |
|  |   |    39 | 0x445800 |   0x400 |            BIOS_L2AB_PTR~0x49 |        0x0 |      0x0 |          |              |                                          |
+--+---+-------+----------+---------+-------------------------------+------------+----------+----------+--------------+------------------------------------------+


+--+-----------+----------+-----------------------------+-------+---------------------+
|  | Directory |   Addr   |          Generation         | Magic | Secondary Directory |
+--+-----------+----------+-----------------------------+-------+---------------------+
|  |     2     | 0x445800 | unknown (PSP ID 0xbc0d0200) |  $BL2 |                     |
+--+-----------+----------+-----------------------------+-------+---------------------+
+--+---+-------+-----------+---------+-----------------------------+------------+----------+----------+--------------+-------------------------------------------------------------+
|  |   | Entry |   Address |    Size |                        Type | Subprogram | Instance | Magic/ID | File Version |                                                   File Info |
+--+---+-------+-----------+---------+-----------------------------+------------+----------+----------+--------------+-------------------------------------------------------------+
|  |   |     0 |  0x445c00 |   0x440 |         BIOS_PUBLIC_KEY~0x5 |        0x0 |      0x0 |     3101 |            1 |                        verified(BF7E), PLATFORM_SECURE_BOOT |
|  |   |     1 |  0x446100 |   0x100 |      BIOS_RTM_SIGNATURE~0x7 |        0x0 |      0x0 |          |              |                                                             |
|  |   |     2 |  0x446800 |  0x3000 |                   APCB~0x60 |        0x0 |      0x0 |          |              |                                                             |
|  |   |     3 |  0x449800 |  0x3000 |              APCB_COPY~0x68 |        0x0 |      0x8 |          |              |                                                             |
|  |   |     4 |  0x44c800 |  0xd000 |              APCB_COPY~0x68 |        0x0 |      0x0 |          |              |                                                             |
|  |   |     5 |       0x0 |     0x0 |                        APOB |        0x0 |      0x0 |          |              |                                      destination(0xa200000) |
|  |   |     6 | 0x1e02800 | 0x85bd3 |                        BIOS |        0x0 |      0x0 |          |              | compressed, destination(0x9bfffe0), reset image, copy image |
|  |   |     7 | 0x1c02800 | 0x85bd3 |                        BIOS |        0x0 |      0x1 |          |              | compressed, destination(0x9bfffe0), reset image, copy image |
|  |   |     8 |  0x459800 | 0x28000 |           APOB_NV_COPY~0x63 |        0x0 |      0x0 |          |              |                                                             |
|  |   |     9 |  0x481800 |  0x6310 |               PMU_CODE~0x64 |        0x0 |      0x1 |     $PS1 |    0.0.21.6A |                    compressed, veri-failed(9D75), sha256_ok |
|  |   |    10 |  0x487c00 |   0x4e0 |               PMU_DATA~0x65 |        0x0 |      0x1 |     $PS1 |    0.0.21.6A |                    compressed, veri-failed(9D75), sha256_ok |
|  |   |    11 |  0x488100 |  0x6180 |               PMU_CODE~0x64 |        0x0 |      0x2 |     $PS1 |    0.0.21.6A |                    compressed, veri-failed(9D75), sha256_ok |
|  |   |    12 |  0x48e300 |   0x250 |               PMU_DATA~0x65 |        0x0 |      0x2 |     $PS1 |    0.0.21.6A |                    compressed, veri-failed(9D75), sha256_ok |
|  |   |    13 |  0x48e600 |  0x17c0 |        MICROCODE_PATCH~0x66 |        0x0 |      0x0 |     $PS1 |      0.0.0.1 |                    patch_level(0xa400016), date(03/30/2021) |
|  |   |    14 |  0x48fe00 |  0x17c0 |        MICROCODE_PATCH~0x66 |        0x0 |      0x1 |     $PS1 |      0.0.0.1 |                    patch_level(0xa404002), date(04/08/2021) |
|  |   |    15 |  0x491600 |  0x17c0 |        MICROCODE_PATCH~0x66 |        0x0 |      0x2 |     $PS1 |      0.0.0.1 |                    patch_level(0xa404102), date(10/18/2021) |
|  |   |    16 |  0x492e00 |   0x230 |  TEE_PRE_MEM_DRIVER_FW~0x6a |        0x0 |      0x0 |     $PS1 |  22.12.30.10 |                                   verified(C9C6), sha256_ok |
|  |   |    17 | 0x1000800 | 0x40000 | ROM_ARMOR_BIOS_NVSTORE~0x6d |        0x0 |      0x0 |          |              |                                                             |
|  |   |    18 | 0x1040800 | 0x10000 | ROM_ARMOR_BIOS_NVSTORE~0x6d |        0x0 |      0x1 |          |              |                                                             |
+--+---+-------+-----------+---------+-----------------------------+------------+----------+----------+--------------+-------------------------------------------------------------+


+--+-----------+----------+-----------------------------+-------+---------------------+
|  | Directory |   Addr   |          Generation         | Magic | Secondary Directory |
+--+-----------+----------+-----------------------------+-------+---------------------+
|  |     3     | 0x493800 | unknown (PSP ID 0xbc0d0200) |  $PL2 |       0x813000      |
+--+-----------+----------+-----------------------------+-------+---------------------+
+--+---+-------+----------+---------+-------------------------------+------------+----------+----------+--------------+------------------------------------------+
|  |   | Entry |  Address |    Size |                          Type | Subprogram | Instance | Magic/ID | File Version |                                File Info |
+--+---+-------+----------+---------+-------------------------------+------------+----------+----------+--------------+------------------------------------------+
|  |   |     0 | 0x493c00 |   0x440 |            AMD_PUBLIC_KEY~0x0 |        0x0 |      0x0 |     BF7E |            1 |                            AMD_CODE_SIGN |
|  |   |     1 | 0x494100 |  0x1d80 |        PSP_FW_BOOT_LOADER~0x1 |        0x0 |      0x0 |     $PS1 |    0.28.0.6E |                verified(BF7E), sha256_ok |
|  |   |     2 | 0x495f00 | 0x13780 |       PSP_FW_BOOT_LOADER~0x73 |        0x0 |      0x0 |     $PS1 |    0.28.0.6E |                verified(9204), sha256_ok |
|  |   |     3 | 0x4a9700 | 0x16480 |         PSP_FW_TRUSTED_OS~0x2 |        0x0 |      0x0 |     $PS1 |    0.28.0.6E |                verified(4979), sha256_ok |
|  |   |     4 |  0x61800 | 0x20000 |               PSP_NV_DATA~0x4 |        0x0 |      0x0 |          |              |                                          |
|  |   |     5 | 0x4bfc00 | 0x21900 |            SMU_OFFCHIP_FW~0x8 |        0x0 |      0x0 |     $PS1 |    0.45.40.0 | compressed, veri-failed(D63D), sha256_ok |
|  |   |     6 | 0x4e1500 | 0x22510 |            SMU_OFFCHIP_FW~0x8 |        0x1 |      0x0 |     $PS1 |    4.45.3D.0 | compressed, veri-failed(D63D), sha256_ok |
|  |   |     7 | 0x503b00 |   0x440 |        SEC_DBG_PUBLIC_KEY~0x9 |        0x0 |      0x0 |     BE53 |            1 |     verified(BF7E), unknown_key_usage(3) |
|  |   |     8 | 0x493890 |    0x10 |        SOFT_FUSE_CHAIN_01~0xb |        0x0 |      0x0 |          |              |                  soft_fuse(0x101000c041) |
|  |   |     9 | 0x504000 | 0x23100 |   PSP_BOOT_TIME_TRUSTLETS~0xc |        0x0 |      0x0 |     $PS1 |     6.1D.0.6 |                verified(CC7D), sha256_ok |
|  |   |    10 | 0x527100 | 0x1ad50 |        SMU_OFF_CHIP_FW_2~0x12 |        0x0 |      0x0 |     $PS1 |    0.45.40.0 | compressed, veri-failed(D63D), sha256_ok |
|  |   |    11 | 0x541f00 | 0x23210 |        SMU_OFF_CHIP_FW_2~0x12 |        0x1 |      0x0 |     $PS1 |    4.45.3D.0 | compressed, veri-failed(D63D), sha256_ok |
|  |   |    12 | 0x565200 |  0x2140 |             DEBUG_UNLOCK~0x13 |        0x0 |      0x0 |     $PS1 |    0.28.0.6E |                verified(5DD9), sha256_ok |
|  |   |    13 | 0x567400 |   0x650 |       HARDWARE_IP_CONFIG~0x20 |        0x0 |      0x0 |     $PS1 |      0.0.0.0 |                verified(F9C8), sha256_ok |
|  |   |    14 | 0x567b00 |   0x650 |       HARDWARE_IP_CONFIG~0x20 |        0x1 |      0x0 |     $PS1 |      0.0.0.1 |                verified(F9C8), sha256_ok |
|  |   |    15 | 0x568200 |    0x30 |             WRAPPED_IKEK~0x21 |        0x0 |      0x0 |          |              |                                          |
|  |   |    16 | 0x568800 |  0x1000 |             TOKEN_UNLOCK~0x22 |        0x0 |      0x0 |          |              |                                          |
|  |   |    17 | 0x569800 |  0x4dc0 |               SEC_GASKET~0x24 |        0x0 |      0x0 |     $PS1 |    D.18.0.72 |                verified(6159), sha256_ok |
|  |   |    18 | 0x56e600 | 0x2e7c0 |                   MP2_FW~0x25 |        0x0 |      0x0 |     $PS1 |      8.0.9.6 |                verified(C9C6), sha256_ok |
|  |   |    19 | 0x59ce00 | 0x22890 |           DRIVER_ENTRIES~0x28 |        0x0 |      0x0 |     $PS1 |    0.28.0.6E |                verified(4979), sha256_ok |
|  |   |    20 | 0x5bf700 |  0x3100 |              S0I3_DRIVER~0x2d |        0x0 |      0x0 |     $PS1 |   1C.1.70.11 |                verified(CC7D), sha256_ok |
|  |   |    21 | 0x5c2800 |   0x2b0 |                     ABL0~0x30 |        0x0 |      0x0 |     $PS1 |  2B.18.70.10 |                verified(A0D1), sha256_ok |
|  |   |    22 | 0x633c00 |  0x1900 |            VBIOS_PRELOAD~0x3c |        0x0 |      0x0 |     $PS1 |   20.11.0.1C |                verified(6C45), sha256_ok |
|  |   |    23 | 0x635500 |  0x2270 |      TOS_SECURITY_POLICY~0x45 |        0x0 |      0x0 |     $PS1 |    D.18.1.72 |                verified(6159), sha256_ok |
|  |   |    24 | 0x637800 |   0x220 |                  FW_XHCI~0x44 |        0x0 |      0x0 |     $PS1 |      0.1.0.A |                verified(82A5), sha256_ok |
|  |   |    25 | 0x648100 |   0x220 |                  FW_XHCI~0x44 |        0x1 |      0x0 |     $PS1 |     0.1.0.15 |                verified(82A5), sha256_ok |
|  |   |    26 | 0x658a00 |  0x5100 |                  DRTM_TA~0x47 |        0x0 |      0x0 |     $PS1 |    4.11.0.34 |                verified(61CE), sha256_ok |
|  |   |    27 | 0x65db00 |  0x1f40 |            BL_PUBLIC_KEY~0x50 |        0x0 |      0x0 |     $PS1 |            1 |                verified(BF7E), sha256_ok |
|  |   |    28 | 0x65fb00 |  0x16b0 |           TOS_PUBLIC_KEY~0x51 |        0x0 |      0x0 |     $PS1 |            1 |                verified(BF7E), sha256_ok |
|  |   |    29 | 0x661200 |   0x640 |          BL_ROLLBACK_SPL~0x55 |        0x0 |      0x0 |     $PS1 |    5.28.0.6B |                verified(BF7E), sha256_ok |
|  |   |    30 | 0x661900 | 0x4b630 |            MSMU_BINARY_0~0x5a |        0x0 |      0x0 |     $PS1 |   FF.45.29.0 |                verified(5E2F), sha256_ok |
|  |   |    31 | 0x6ad000 |  0xf420 |            MSMU_BINARY_0~0x5a |        0x1 |      0x0 |     $PS1 |   FF.45.2E.0 | compressed, veri-failed(5E2F), sha256_ok |
|  |   |    32 | 0x6bc500 |   0x9a0 |           SPI_ROM_CONFIG~0x5c |        0x0 |      0x0 |     $PS1 |    0.22.26.1 |                verified(8A19), sha256_ok |
|  |   |    33 | 0x6bcf00 | 0x60000 | FW_PSP_SMUSCS_OR_TPMLITE~0x5f |        0x0 |      0x0 |          |              |                                          |
|  |   |    34 | 0x71cf00 | 0x18b90 |           PSP_DMCUB_CODE~0x71 |        0x0 |      0x0 |     $PS1 |    0.0.50.4A |                verified(45B9), sha256_ok |
|  |   |    35 | 0x735b00 | 0x2d290 |           PSP_DMCUB_CODE~0x71 |        0x1 |      0x0 |     $PS1 |    4.0.15.47 |                verified(45B9), sha256_ok |
|  |   |    36 | 0x762e00 |   0x210 |        REGISTER_INIT_BIN~0x76 |        0x0 |      0x0 |     $PS1 |      1.0.2.B |                verified(4907), sha256_ok |
|  |   |    37 | 0x764300 |    0x30 |                  IKEK_TA~0x8d |        0x0 |      0x0 |          |              |                                          |
|  |   |    38 |  0x81800 | 0x40000 |                PSP_NVRAM~0x54 |        0x0 |      0x0 |          |              |                                          |
|  |   |    39 | 0x813800 |   0x400 |            BIOS_L2AB_PTR~0x49 |        0x0 |      0x0 |          |              |                                          |
+--+---+-------+----------+---------+-------------------------------+------------+----------+----------+--------------+------------------------------------------+


+--+-----------+----------+-----------------------------+-------+---------------------+
|  | Directory |   Addr   |          Generation         | Magic | Secondary Directory |
+--+-----------+----------+-----------------------------+-------+---------------------+
|  |     4     | 0x813800 | unknown (PSP ID 0xbc0d0200) |  $BL2 |                     |
+--+-----------+----------+-----------------------------+-------+---------------------+
+--+---+-------+-----------+---------+-----------------------------+------------+----------+----------+--------------+-------------------------------------------------------------+
|  |   | Entry |   Address |    Size |                        Type | Subprogram | Instance | Magic/ID | File Version |                                                   File Info |
+--+---+-------+-----------+---------+-----------------------------+------------+----------+----------+--------------+-------------------------------------------------------------+
|  |   |     0 |  0x813c00 |   0x440 |         BIOS_PUBLIC_KEY~0x5 |        0x0 |      0x0 |     3101 |            1 |                        verified(BF7E), PLATFORM_SECURE_BOOT |
|  |   |     1 |  0x814100 |   0x100 |      BIOS_RTM_SIGNATURE~0x7 |        0x0 |      0x0 |          |              |                                                             |
|  |   |     2 |  0x814800 |  0x3000 |                   APCB~0x60 |        0x0 |      0x0 |          |              |                                                             |
|  |   |     3 |  0x817800 |  0x3000 |              APCB_COPY~0x68 |        0x0 |      0x8 |          |              |                                                             |
|  |   |     4 |  0x81a800 |  0xd000 |              APCB_COPY~0x68 |        0x0 |      0x0 |          |              |                                                             |
|  |   |     5 |       0x0 |     0x0 |                        APOB |        0x0 |      0x0 |          |              |                                      destination(0xa200000) |
|  |   |     6 | 0x1e02800 | 0x85bd3 |                        BIOS |        0x0 |      0x0 |          |              | compressed, destination(0x9bfffe0), reset image, copy image |
|  |   |     7 | 0x1c02800 | 0x85bd3 |                        BIOS |        0x0 |      0x1 |          |              | compressed, destination(0x9bfffe0), reset image, copy image |
|  |   |     8 |  0x827800 | 0x28000 |           APOB_NV_COPY~0x63 |        0x0 |      0x0 |          |              |                                                             |
|  |   |     9 |  0x84f800 |  0x6310 |               PMU_CODE~0x64 |        0x0 |      0x1 |     $PS1 |    0.0.21.6A |                    compressed, veri-failed(9D75), sha256_ok |
|  |   |    10 |  0x855c00 |   0x4e0 |               PMU_DATA~0x65 |        0x0 |      0x1 |     $PS1 |    0.0.21.6A |                    compressed, veri-failed(9D75), sha256_ok |
|  |   |    11 |  0x856100 |  0x6180 |               PMU_CODE~0x64 |        0x0 |      0x2 |     $PS1 |    0.0.21.6A |                    compressed, veri-failed(9D75), sha256_ok |
|  |   |    12 |  0x85c300 |   0x250 |               PMU_DATA~0x65 |        0x0 |      0x2 |     $PS1 |    0.0.21.6A |                    compressed, veri-failed(9D75), sha256_ok |
|  |   |    13 |  0x85c600 |  0x17c0 |        MICROCODE_PATCH~0x66 |        0x0 |      0x0 |     $PS1 |      0.0.0.1 |                    patch_level(0xa400016), date(03/30/2021) |
|  |   |    14 |  0x85de00 |  0x17c0 |        MICROCODE_PATCH~0x66 |        0x0 |      0x1 |     $PS1 |      0.0.0.1 |                    patch_level(0xa404002), date(04/08/2021) |
|  |   |    15 |  0x85f600 |  0x17c0 |        MICROCODE_PATCH~0x66 |        0x0 |      0x2 |     $PS1 |      0.0.0.1 |                    patch_level(0xa404102), date(10/18/2021) |
|  |   |    16 |  0x860e00 |   0x230 |  TEE_PRE_MEM_DRIVER_FW~0x6a |        0x0 |      0x0 |     $PS1 |  22.12.30.10 |                                   verified(C9C6), sha256_ok |
|  |   |    17 | 0x1000800 | 0x40000 | ROM_ARMOR_BIOS_NVSTORE~0x6d |        0x0 |      0x0 |          |              |                                                             |
|  |   |    18 | 0x1040800 | 0x10000 | ROM_ARMOR_BIOS_NVSTORE~0x6d |        0x0 |      0x1 |          |              |                                                             |
+--+---+-------+-----------+---------+-----------------------------+------------+----------+----------+--------------+-------------------------------------------------------------+


+--+-----------+---------+------------+-------+---------------------+
|  | Directory |   Addr  | Generation | Magic | Secondary Directory |
+--+-----------+---------+------------+-------+---------------------+
|  |     5     | 0xc2800 |    None    |  $PSP |                     |
+--+-----------+---------+------------+-------+---------------------+
+--+---+-------+---------+------+---------------------+------------+----------+----------+--------------+-----------+
|  |   | Entry | Address | Size |                Type | Subprogram | Instance | Magic/ID | File Version | File Info |
+--+---+-------+---------+------+---------------------+------------+----------+----------+--------------+-----------+
|  |   |     0 | 0xc3800 |  0x0 | PSP_FW_L2A_PTR~0x48 |        0x0 |      0x0 |          |              |           |
|  |   |     1 | 0xc4800 |  0x0 | PSP_FW_L2B_PTR~0x4a |        0x0 |      0x0 |          |              |           |
+--+---+-------+---------+------+---------------------+------------+----------+----------+--------------+-----------+

[NikolajSchlej]

CC @Ykidia

Had to disable AMD parsing for now (in 818f0ac) due to the fact that it incorrectly populates the tree structure, breaking one of the important assumptions about it: all entries that can be found in the physical image (i.e. aren't a result of decompression and parsing a decompressed entity) should be at the exact base/offset/size position, and every byte of the input file should be accounted for at every relevant level of the tree (i.e. paddings need to be inserted where possible).

I understand that it might be a suboptimal way to present PSP-related structures, but it's how UEFITool worked since the very beginning, this is how every other parser is currently written, and this is how all of them should continue to be written.

It is clear, however, that without some code to enforce this, and/or catch bugs in existing parsers that break this assumption, it will be broken time and again, so that code needs to be written before we attempt to add more new parsers, or re-enable the AMD one. I will track that work in a separate issue.