From a5866c3c99a1f55fa10a8ffecbb45ed64118d9a6 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Thu, 25 Jan 2024 16:54:33 +0100 Subject: smbios: type2: contained object handles The type 2 structure must include information about the contained objects. It is fine to set the number of contained object handles to 0. Add the missing field. Fixes: 721e992a8af5 ("x86: Add SMBIOS table support") Signed-off-by: Heinrich Schuchardt Reviewed-by: Ilias Apalodimas --- include/smbios.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/smbios.h b/include/smbios.h index b507b9d9d72..98bb9e52cdf 100644 --- a/include/smbios.h +++ b/include/smbios.h @@ -139,6 +139,7 @@ struct __packed smbios_type2 { u8 chassis_location; u16 chassis_handle; u8 board_type; + u8 number_contained_objects; char eos[SMBIOS_STRUCT_EOS_BYTES]; }; -- cgit v1.2.3 From 2497f6a84c0b906551d08054a631b86942cb4fa9 Mon Sep 17 00:00:00 2001 From: Masahisa Kojima Date: Fri, 26 Jan 2024 09:53:42 +0900 Subject: efi_loader: migrate SMBIOS 3.0 entry point structure for measurement Current U-Boot only supports the SMBIOS 3.0 entry point structure. TCG2 measurement code should migrate to SMBIOS 3.0 entry point structure. efi_selftest tcg2 test also needs to be updated, and expected PCR[1] result is changed since guid for SMBIOS EFI system table uses different guid SMBIOS3_TABLE_GUID instead of SMBIOS_TABLE_GUID. Signed-off-by: Masahisa Kojima Reviewed-by: Heinrich Schuchardt Reviewed-by: Ilias Apalodimas --- include/efi_loader.h | 1 + include/smbios.h | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/efi_loader.h b/include/efi_loader.h index d5fca2fa5ef..5c5af4f7fd1 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -340,6 +340,7 @@ extern const efi_guid_t efi_guid_firmware_management_protocol; extern const efi_guid_t efi_esrt_guid; /* GUID of the SMBIOS table */ extern const efi_guid_t smbios_guid; +extern const efi_guid_t smbios3_guid; /*GUID of console */ extern const efi_guid_t efi_guid_text_input_protocol; extern const efi_guid_t efi_guid_text_output_protocol; diff --git a/include/smbios.h b/include/smbios.h index 98bb9e52cdf..e2b7f695846 100644 --- a/include/smbios.h +++ b/include/smbios.h @@ -327,10 +327,10 @@ int smbios_update_version_full(void *smbios_tab, const char *version); * This function clear the device dependent parameters such as * serial number for the measurement. * - * @entry: pointer to a struct smbios_entry + * @entry: pointer to a struct smbios3_entry * @header: pointer to a struct smbios_header */ -void smbios_prepare_measurement(const struct smbios_entry *entry, +void smbios_prepare_measurement(const struct smbios3_entry *entry, struct smbios_header *header); #endif /* _SMBIOS_H_ */ -- cgit v1.2.3