GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/amd/mendocino: Add svc_set_fw_hash_table 

Add new PSP svc call to pass psp firmware hash table to the PSP.
psp_verstage will verify hash table and then pass them to the PSP.
The PSP will check if signed firmware contents match these hashes.
This will prevent anyone replacing signed firmware in the RW region.

BUG=b:203597980
TEST=Build and boot to OS in Skyrim.

Change-Id: I512d359967eae925098973e90250111d6f59dd39
Signed-off-by: Karthikeyan Ramasubramanian <kramasub@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/67259
Reviewed-by: Robert Zieba <robertzieba@google.com>
Reviewed-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com>
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Karthikeyan Ramasubramanian 2022-08-25 12:52:13 -06:00 committed by Paul Fagerburg
parent aae7d4d5c8
commit 35aa4355c4
3 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/soc/amd/mendocino/psp_verstage/svc.c
View File

@ -204,3 +204,13 @@ uint32_t svc_set_platform_boot_mode(enum chrome_platform_boot_mode boot_mode)
SVC_CALL2(SVC_VERSTAGE_CMD, CMD_SET_PLATFORM_BOOT_MODE, (void *)&param, retval); SVC_CALL2(SVC_VERSTAGE_CMD, CMD_SET_PLATFORM_BOOT_MODE, (void *)&param, retval);
return retval; return retval;
} }
uint32_t svc_set_fw_hash_table(struct psp_fw_hash_table *hash_table)
{
uint32_t retval = 0;
struct cmd_param_set_fw_hash_table param = {
.ptr_psp_fw_hash_table = hash_table,
};
SVC_CALL2(SVC_VERSTAGE_CMD, CMD_SET_FW_HASH_TABLE, (void *)&param, retval);
return retval;
}

4
src/soc/amd/mendocino/psp_verstage/svc.h
View File

@ -141,4 +141,8 @@ struct cmd_param_set_platform_boot_mode {
uint32_t boot_mode; uint32_t boot_mode;
}; };
struct cmd_param_set_fw_hash_table {
struct psp_fw_hash_table *ptr_psp_fw_hash_table;
};
#endif /* PSP_VERSTAGE_SVC_H */ #endif /* PSP_VERSTAGE_SVC_H */

31
src/vendorcode/amd/fsp/mendocino/include/bl_uapp/bl_syscall_public.h
View File

@ -54,6 +54,7 @@ enum verstage_cmd_id {
CMD_UNMAP_FCH_IO_DEVICE, CMD_UNMAP_FCH_IO_DEVICE,
CMD_CCP_DMA, CMD_CCP_DMA,
CMD_SET_PLATFORM_BOOT_MODE, CMD_SET_PLATFORM_BOOT_MODE,
CMD_SET_FW_HASH_TABLE,
}; };
struct mod_exp_params { struct mod_exp_params {
@ -152,6 +153,26 @@ enum chrome_platform_boot_mode
CHROME_BOOK_BOOT_MODE_TYPE_MAX_LIMIT = 0x4, // used for boundary check CHROME_BOOK_BOOT_MODE_TYPE_MAX_LIMIT = 0x4, // used for boundary check
}; };
struct psp_fw_entry_hash_256 {
uint16_t fw_type;
uint16_t sub_type;
uint8_t sha[32];
} __packed;
struct psp_fw_entry_hash_384 {
uint16_t fw_type;
uint16_t sub_type;
uint8_t sha[48];
} __packed;
struct psp_fw_hash_table {
uint16_t version; // Version of psp_fw_hash_table, Start with 0.
uint16_t no_of_entries_256;
uint16_t no_of_entries_384;
struct psp_fw_entry_hash_256 *fw_hash_256;
struct psp_fw_entry_hash_384 *fw_hash_384;
} __packed;
/* /*
* Exit to the main Boot Loader. This does not return back to user application. * Exit to the main Boot Loader. This does not return back to user application.
* *
@ -338,6 +359,16 @@ uint32_t svc_ccp_dma(uint32_t spi_rom_offset, void *dest, uint32_t size);
-----------------------------------------------------------------------------*/ -----------------------------------------------------------------------------*/
uint32_t svc_set_platform_boot_mode(enum chrome_platform_boot_mode boot_mode); uint32_t svc_set_platform_boot_mode(enum chrome_platform_boot_mode boot_mode);
/*
* Set the PSP FW hash table.
*
* Parameters:
* - hash_table - Table of hash for each PSP binary signed against SoC chain of trust
*
* Return value: BL_OK or error code
*/
uint32_t svc_set_fw_hash_table(struct psp_fw_hash_table *hash_table);
/* C entry point for the Bootloader Userspace Application */ /* C entry point for the Bootloader Userspace Application */
void Main(void); void Main(void);