diff options
| -rw-r--r-- | src/arch/x86/smbios.c | 9 | ||||
| -rw-r--r-- | src/include/smbios.h | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/arch/x86/smbios.c b/src/arch/x86/smbios.c index 87714c0abe..b3e1c138f8 100644 --- a/src/arch/x86/smbios.c +++ b/src/arch/x86/smbios.c @@ -1028,6 +1028,7 @@ static int smbios_write_type16(unsigned long *current, int *handle) int len; int i; + uint64_t max_capacity; struct memory_info *meminfo; meminfo = cbmem_find(CBMEM_ID_MEMINFO); @@ -1057,7 +1058,13 @@ static int smbios_write_type16(unsigned long *current, int *handle) /* no error information handle available */ t->memory_error_information_handle = 0xFFFE; - t->maximum_capacity = meminfo->max_capacity_mib * (MiB / KiB); + max_capacity = meminfo->max_capacity_mib; + if (max_capacity * (MiB / KiB) < SMBIOS_USE_EXTENDED_MAX_CAPACITY) + t->maximum_capacity = max_capacity * (MiB / KiB); + else { + t->maximum_capacity = SMBIOS_USE_EXTENDED_MAX_CAPACITY; + t->extended_maximum_capacity = max_capacity * MiB; + } t->number_of_memory_devices = meminfo->number_of_devices; len += smbios_string_table_len(t->eos); diff --git a/src/include/smbios.h b/src/include/smbios.h index d8ac4caff2..2f63aac6ab 100644 --- a/src/include/smbios.h +++ b/src/include/smbios.h @@ -829,6 +829,8 @@ enum { SMBIOS_EVENTLOG_STATUS_FULL = 2, /* Bit 1 */ }; +#define SMBIOS_USE_EXTENDED_MAX_CAPACITY (1 << 31) + struct smbios_type16 { u8 type; u8 length; |