Patrick Rudolph has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/43969 )
Change subject: smbios: Fix type 17 for Windows 10 ......................................................................
smbios: Fix type 17 for Windows 10
This fixes an issue observed on Windows 10 where the GetPhysicallyInstalledSystemMemory API call returned an error due to invalid SMBIOS tables. Various tools use this API call and doesn't operate properly if this fails, for example the "Intel Processor Diagnostic Tool". Windows then guesses the physical memory by accumulating entries from the memory map provided by the firmware.
To fix this issue add the handle to a type 16 entry to all type 17 entries.
Add new fields to struct memory_info and fill them in Intel common code. Use the introduces variables to fill type 16 in smbios.c and provide a handle to type 17 entries.
Besides keeping the current behaviour on intel/soc/common platforms, the type 16 table is also emitted on platforms that doesn't explicitly fill it, by using the existing fields of struct memory_info.
Tested on Windows 10: The GetPhysicallyInstalledSystemMemory API call doesn't return an error any more and the installed memory is now being reported as 8192MiB.
Change-Id: Idc3a363cbc3d0654dafd4176c4f4af9005210f42 Signed-off-by: Patrick Rudolph patrick.rudolph@9elements.com --- M src/arch/x86/smbios.c M src/include/memory_info.h M src/soc/intel/common/block/systemagent/systemagent.c 3 files changed, 93 insertions(+), 56 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/69/43969/1
diff --git a/src/arch/x86/smbios.c b/src/arch/x86/smbios.c index 070c7ea..6e1ad87 100644 --- a/src/arch/x86/smbios.c +++ b/src/arch/x86/smbios.c @@ -310,7 +310,8 @@ }
static int create_smbios_type17_for_dimm(struct dimm_info *dimm, - unsigned long *current, int *handle) + unsigned long *current, int *handle, + int type16_handle) { struct smbios_type17 *t = (struct smbios_type17 *)*current;
@@ -365,6 +366,8 @@ t->memory_error_information_handle = 0xFFFE; t->attributes = dimm->rank_per_dimm; t->handle = *handle; + t->phys_memory_array_handle = type16_handle; + *handle += 1; t->length = sizeof(struct smbios_type17) - 2; return t->length + smbios_string_table_len(t->eos); @@ -1058,10 +1061,33 @@ return len; }
+static int smbios_write_type16(unsigned long *current, int *handle, bool ecc, + uint32_t max_capacity_mib, uint16_t number_of_devices) +{ + struct smbios_type16 *t = (struct smbios_type16 *)*current; + int len = 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; + t->memory_error_correction = ecc ? MEMORY_ARRAY_ECC_SINGLE_BIT : + MEMORY_ARRAY_ECC_NONE; + /* no error information handle available */ + t->memory_error_information_handle = 0xFFFE; + t->maximum_capacity = max_capacity_mib / KiB; + t->number_of_memory_devices = number_of_devices; + + *current += len; + (*handle)++; + return len; +} + static int smbios_write_type17(unsigned long *current, int *handle) { int len = sizeof(struct smbios_type17); - int totallen = 0; + int type16_handle, totallen = 0; int i;
struct memory_info *meminfo; @@ -1069,12 +1095,35 @@ if (meminfo == NULL) return 0; /* can't find mem info in cbmem */
+ printk(BIOS_INFO, "Create SMBIOS type 16\n"); + type16_handle = *handle; + + if (meminfo->max_capacity_mib == 0 || meminfo->number_of_devices == 0) { + /* Fill in defaults if not provided */ + meminfo->number_of_devices = 0; + meminfo->max_capacity_mib = 0; + for (i = 0; i < meminfo->dimm_cnt && i < ARRAY_SIZE(meminfo->dimm); i++) { + meminfo->max_capacity_mib += meminfo->dimm[i].dimm_size; + meminfo->number_of_devices += !!meminfo->dimm[i].dimm_size; + } + } + + len = smbios_write_type16(current, handle, meminfo->ecc_capable, + meminfo->max_capacity_mib, meminfo->number_of_devices); + totallen += len; + printk(BIOS_INFO, "Create SMBIOS type 17\n"); for (i = 0; i < meminfo->dimm_cnt && i < ARRAY_SIZE(meminfo->dimm); i++) { struct dimm_info *dimm; dimm = &meminfo->dimm[i]; - len = create_smbios_type17_for_dimm(dimm, current, handle); + /* + * Windows 10 GetPhysicallyInstalledSystemMemory functions reads SMBIOS + * tables type 16 and type 17. The later need to point to one type 16. + * Without those tables the physical installed system memory is guessed from + * system memory map, which is usually slightly less than memory present. + */ + len = create_smbios_type17_for_dimm(dimm, current, handle, type16_handle); *current += len; totallen += len; } diff --git a/src/include/memory_info.h b/src/include/memory_info.h index a989118..26af266 100644 --- a/src/include/memory_info.h +++ b/src/include/memory_info.h @@ -81,6 +81,14 @@ } __packed;
struct memory_info { + /* controller specific */ + bool ecc_capable; + /* Maximum capacity the DRAM controller/mainboard supports */ + uint32_t max_capacity_mib; + /* Maximum number of DIMMs the DRAM controller/mainboard supports */ + uint16_t number_of_devices; + + /* active DIMM configuration */ uint8_t dimm_cnt; struct dimm_info dimm[DIMM_INFO_TOTAL]; } __packed; diff --git a/src/soc/intel/common/block/systemagent/systemagent.c b/src/soc/intel/common/block/systemagent/systemagent.c index e12e07c..60ca478 100644 --- a/src/soc/intel/common/block/systemagent/systemagent.c +++ b/src/soc/intel/common/block/systemagent/systemagent.c @@ -46,6 +46,38 @@ return 32768; /* 32 GiB per channel */ }
+static bool sa_supports_ecc(const uint32_t capida) +{ + return !(capida & CAPID_ECCDIS); +} + +static size_t sa_slots_per_channel(const uint32_t capida) +{ + return !(capida & CAPID_DDPCD) + 1; +} + +static size_t sa_number_of_channels(const uint32_t capida) +{ + return !(capida & CAPID_PDCD) + 1; +} + +static void sa_soc_systemagent_init(struct device *dev) +{ + soc_systemagent_init(dev); + + struct memory_info *m = cbmem_find(CBMEM_ID_MEMINFO); + if (m == NULL) + return; + + const uint32_t capida = pci_read_config32(dev, CAPID0_A); + + m->ecc_capable = sa_supports_ecc(capida); + m->max_capacity_mib = soc_systemagent_max_chan_capacity_mib(CAPID_DDRSZ(capida)) * + sa_number_of_channels(capida) * MiB; + m->number_of_devices = sa_slots_per_channel(capida) * + sa_number_of_channels(capida); +} + /* * Add all known fixed MMIO ranges that hang off the host bridge/memory * controller device. @@ -262,55 +294,6 @@ sa_add_imr_resources(dev, &index); }
-#if CONFIG(GENERATE_SMBIOS_TABLES) -static bool sa_supports_ecc(const uint32_t capida) -{ - return !(capida & CAPID_ECCDIS); -} - -static size_t sa_slots_per_channel(const uint32_t capida) -{ - return !(capida & CAPID_DDPCD) + 1; -} - -static size_t sa_number_of_channels(const uint32_t capida) -{ - return !(capida & CAPID_PDCD) + 1; -} - -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); - const uint32_t capida = pci_read_config32(dev, CAPID0_A); - - 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; - t->memory_error_correction = sa_supports_ecc(capida) ? MEMORY_ARRAY_ECC_SINGLE_BIT : - MEMORY_ARRAY_ECC_NONE; - /* no error information handle available */ - t->memory_error_information_handle = 0xFFFE; - t->maximum_capacity = soc_systemagent_max_chan_capacity_mib(CAPID_DDRSZ(capida)) * - sa_number_of_channels(capida) * (MiB / KiB); - t->number_of_memory_devices = sa_slots_per_channel(capida) * - sa_number_of_channels(capida); - - *current += len; - *handle += 1; - return len; -} -#endif - void enable_power_aware_intr(void) { uint8_t pair; @@ -326,14 +309,11 @@ .read_resources = systemagent_read_resources, .set_resources = pci_dev_set_resources, .enable_resources = pci_dev_enable_resources, - .init = soc_systemagent_init, + .init = sa_soc_systemagent_init, .ops_pci = &pci_dev_ops_pci, #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[] = {