From 357e5525620021db6e53e225bfa4776dc1b84a91 Mon Sep 17 00:00:00 2001 From: Lijian Zhao Date: Thu, 11 Apr 2019 13:07:00 -0700 Subject: soc/intel/common: Inject SMBIOS type 16 table Add SMBIOS type 16 table for physical memory array, there's two item had been left over.ECC and max capacity, as of now we set it to fixed value as all the platform support by Intel common code don't support ECC memory and so far the biggest capacity is 32GB. BUG=b:129485635 TEST=Boot up with Sarien platform and check with dmidecode, the following is the result: Handle 0x000D, DMI type 16, 23 bytes Physical Memory Array Location: System Board Or Motherboard Use: System Memory Error Correction Type: None Maximum Capacity: 32 GB Error Information Handle: Not Provided Number Of Devices: 2 Signed-off-by: Lijian Zhao Change-Id: If9c5831956ef273c84d831a2b1572b3442eed961 Reviewed-on: https://review.coreboot.org/c/coreboot/+/32286 Reviewed-by: Duncan Laurie Reviewed-by: Patrick Rudolph Tested-by: build bot (Jenkins) --- .../intel/common/block/systemagent/systemagent.c | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/src/soc/intel/common/block/systemagent/systemagent.c b/src/soc/intel/common/block/systemagent/systemagent.c index d95a4ebedb..0f91156566 100644 --- a/src/soc/intel/common/block/systemagent/systemagent.c +++ b/src/soc/intel/common/block/systemagent/systemagent.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -275,6 +276,37 @@ static void systemagent_read_resources(struct device *dev) sa_add_imr_resources(dev, &index); } +#if CONFIG(GENERATE_SMBIOS_TABLES) +static int sa_smbios_write_type_16(struct device *dev, int *handle, + unsigned long *current) +{ + struct smbios_type16 *t = (struct smbios_type16 *)*current; + int len = sizeof(struct smbios_type16); + + struct memory_info *meminfo; + meminfo = cbmem_find(CBMEM_ID_MEMINFO); + if (meminfo == NULL) + return 0; /* can't find mem info in cbmem */ + + memset(t, 0, sizeof(struct smbios_type16)); + t->type = SMBIOS_PHYS_MEMORY_ARRAY; + t->handle = *handle; + t->length = len - 2; + t->location = MEMORY_ARRAY_LOCATION_SYSTEM_BOARD; + t->use = MEMORY_ARRAY_USE_SYSTEM; + /* TBD, meminfo hob have information about ECC */ + t->memory_error_correction = MEMORY_ARRAY_ECC_NONE; + /* no error information handle available */ + t->memory_error_information_handle = 0xFFFE; + t->maximum_capacity = 32 * (GiB / KiB); /* 32GB as default */ + t->number_of_memory_devices = meminfo->dimm_cnt; + + *current += len; + *handle += 1; + return len; +} +#endif + void enable_power_aware_intr(void) { uint8_t pair; @@ -295,6 +327,9 @@ static struct device_operations systemagent_ops = { #if CONFIG(HAVE_ACPI_TABLES) .write_acpi_tables = sa_write_acpi_tables, #endif +#if CONFIG(GENERATE_SMBIOS_TABLES) + .get_smbios_data = sa_smbios_write_type_16, +#endif }; static const unsigned short systemagent_ids[] = { -- cgit v1.2.3