X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fsmbios.c;h=fe1e1835f6ad07797eb469f6384c203ede4319a5;hb=refs%2Fheads%2Fcoreboot;hp=e2f21901420581b528b4e473e15b5f64e1c05c71;hpb=b1b7c2a1c3b940b787fdb5da67fc37003e9d7b0e;p=seabios.git diff --git a/src/smbios.c b/src/smbios.c index e2f2190..fe1e183 100644 --- a/src/smbios.c +++ b/src/smbios.c @@ -1,234 +1,38 @@ // smbios table generation (on emulators) // -// Copyright (C) 2008 Kevin O'Connor +// Copyright (C) 2008,2009 Kevin O'Connor // Copyright (C) 2006 Fabrice Bellard // // This file may be distributed under the terms of the GNU LGPLv3 license. #include "util.h" // dprintf -#include "memmap.h" // bios_table_cur_addr #include "biosvar.h" // GET_EBDA +#include "paravirt.h" // qemu_cfg_smbios_load_field +#include "smbios.h" // struct smbios_entry_point - -/**************************************************************** - * UUID probe - ****************************************************************/ - -#define QEMU_CFG_SIGNATURE 0x00 -#define QEMU_CFG_ID 0x01 -#define QEMU_CFG_UUID 0x02 - -static void -qemu_cfg_read(u8 *buf, u16 f, int len) -{ - outw(f, PORT_QEMU_CFG_CTL); - while (len--) - *(buf++) = inb(PORT_QEMU_CFG_DATA); -} - -static int -qemu_cfg_port_probe() -{ - u8 sig[4] = "QEMU"; - u8 buf[4]; - qemu_cfg_read(buf, QEMU_CFG_SIGNATURE, 4); - return *(u32*)buf == *(u32*)sig; -} - -static void -uuid_probe(u8 *bios_uuid) -{ - // Default to UUID not set - memset(bios_uuid, 0, 16); - - if (! CONFIG_UUID_BACKDOOR) - return; - if (CONFIG_COREBOOT) - return; - if (! qemu_cfg_port_probe()) - // Feature not available - return; - - qemu_cfg_read(bios_uuid, QEMU_CFG_UUID, 16); -} - - -/**************************************************************** - * smbios tables - ****************************************************************/ - -/* SMBIOS entry point -- must be written to a 16-bit aligned address - between 0xf0000 and 0xfffff. - */ -struct smbios_entry_point { - char anchor_string[4]; - u8 checksum; - u8 length; - u8 smbios_major_version; - u8 smbios_minor_version; - u16 max_structure_size; - u8 entry_point_revision; - u8 formatted_area[5]; - char intermediate_anchor_string[5]; - u8 intermediate_checksum; - u16 structure_table_length; - u32 structure_table_address; - u16 number_of_structures; - u8 smbios_bcd_revision; -} PACKED; - -/* This goes at the beginning of every SMBIOS structure. */ -struct smbios_structure_header { - u8 type; - u8 length; - u16 handle; -} PACKED; - -/* SMBIOS type 0 - BIOS Information */ -struct smbios_type_0 { - struct smbios_structure_header header; - u8 vendor_str; - u8 bios_version_str; - u16 bios_starting_address_segment; - u8 bios_release_date_str; - u8 bios_rom_size; - u8 bios_characteristics[8]; - u8 bios_characteristics_extension_bytes[2]; - u8 system_bios_major_release; - u8 system_bios_minor_release; - u8 embedded_controller_major_release; - u8 embedded_controller_minor_release; -} PACKED; - -/* SMBIOS type 1 - System Information */ -struct smbios_type_1 { - struct smbios_structure_header header; - u8 manufacturer_str; - u8 product_name_str; - u8 version_str; - u8 serial_number_str; - u8 uuid[16]; - u8 wake_up_type; - u8 sku_number_str; - u8 family_str; -} PACKED; - -/* SMBIOS type 3 - System Enclosure (v2.3) */ -struct smbios_type_3 { - struct smbios_structure_header header; - u8 manufacturer_str; - u8 type; - u8 version_str; - u8 serial_number_str; - u8 asset_tag_number_str; - u8 boot_up_state; - u8 power_supply_state; - u8 thermal_state; - u8 security_status; - u32 oem_defined; - u8 height; - u8 number_of_power_cords; - u8 contained_element_count; - // contained elements follow -} PACKED; - -/* SMBIOS type 4 - Processor Information (v2.0) */ -struct smbios_type_4 { - struct smbios_structure_header header; - u8 socket_designation_str; - u8 processor_type; - u8 processor_family; - u8 processor_manufacturer_str; - u32 processor_id[2]; - u8 processor_version_str; - u8 voltage; - u16 external_clock; - u16 max_speed; - u16 current_speed; - u8 status; - u8 processor_upgrade; - u16 l1_cache_handle; - u16 l2_cache_handle; - u16 l3_cache_handle; -} PACKED; - -/* SMBIOS type 16 - Physical Memory Array - * Associated with one type 17 (Memory Device). - */ -struct smbios_type_16 { - struct smbios_structure_header header; - u8 location; - u8 use; - u8 error_correction; - u32 maximum_capacity; - u16 memory_error_information_handle; - u16 number_of_memory_devices; -} PACKED; - -/* SMBIOS type 17 - Memory Device - * Associated with one type 19 - */ -struct smbios_type_17 { - struct smbios_structure_header header; - u16 physical_memory_array_handle; - u16 memory_error_information_handle; - u16 total_width; - u16 data_width; - u16 size; - u8 form_factor; - u8 device_set; - u8 device_locator_str; - u8 bank_locator_str; - u8 memory_type; - u16 type_detail; -} PACKED; - -/* SMBIOS type 19 - Memory Array Mapped Address */ -struct smbios_type_19 { - struct smbios_structure_header header; - u32 starting_address; - u32 ending_address; - u16 memory_array_handle; - u8 partition_width; -} PACKED; - -/* SMBIOS type 20 - Memory Device Mapped Address */ -struct smbios_type_20 { - struct smbios_structure_header header; - u32 starting_address; - u32 ending_address; - u16 memory_device_handle; - u16 memory_array_mapped_address_handle; - u8 partition_row_position; - u8 interleave_position; - u8 interleaved_data_depth; -} PACKED; - -/* SMBIOS type 32 - System Boot Information */ -struct smbios_type_32 { - struct smbios_structure_header header; - u8 reserved[6]; - u8 boot_status; -} PACKED; - -/* SMBIOS type 127 -- End-of-table */ -struct smbios_type_127 { - struct smbios_structure_header header; -} PACKED; - - -/**************************************************************** - * smbios init - ****************************************************************/ +struct smbios_entry_point *SMBiosAddr; static void -smbios_entry_point_init(void *start, - u16 max_structure_size, +smbios_entry_point_init(u16 max_structure_size, u16 structure_table_length, - u32 structure_table_address, + void *structure_table_address, u16 number_of_structures) { - struct smbios_entry_point *ep = (struct smbios_entry_point *)start; + struct smbios_entry_point *ep = malloc_fseg(sizeof(*ep)); + void *finaltable; + if (structure_table_length <= BUILD_MAX_SMBIOS_FSEG) + // Table is small enough for f-seg - allocate there. This + // works around a bug in JunOS (at least for small SMBIOS tables). + finaltable = malloc_fseg(structure_table_length); + else + finaltable = malloc_high(structure_table_length); + if (!ep || !finaltable) { + warn_noalloc(); + free(ep); + free(finaltable); + return; + } + memcpy(finaltable, structure_table_address, structure_table_length); memcpy(ep->anchor_string, "_SM_", 4); ep->length = 0x1f; @@ -240,156 +44,250 @@ smbios_entry_point_init(void *start, memcpy(ep->intermediate_anchor_string, "_DMI_", 5); ep->structure_table_length = structure_table_length; - ep->structure_table_address = structure_table_address; + ep->structure_table_address = (u32)finaltable; ep->number_of_structures = number_of_structures; ep->smbios_bcd_revision = 0x24; - ep->checksum = 0; - ep->intermediate_checksum = 0; + ep->checksum -= checksum(ep, 0x10); - ep->checksum = -checksum(start, 0x10); + ep->intermediate_checksum -= checksum((void*)ep + 0x10, ep->length - 0x10); - ep->intermediate_checksum = -checksum(start + 0x10, ep->length - 0x10); + SMBiosAddr = ep; + dprintf(1, "SMBIOS ptr=%p table=%p size=%d\n" + , ep, finaltable, structure_table_length); } +#define load_str_field_with_default(type, field, def) \ + do { \ + size = qemu_cfg_smbios_load_field(type, \ + offsetof(struct smbios_type_##type, \ + field), end); \ + if (size > 0) { \ + end += size; \ + } else { \ + memcpy(end, def, sizeof(def)); \ + end += sizeof(def); \ + } \ + p->field = ++str_index; \ + } while (0) + +#define load_str_field_or_skip(type, field) \ + do { \ + size = qemu_cfg_smbios_load_field(type, \ + offsetof(struct smbios_type_##type, \ + field), end); \ + if (size > 0) { \ + end += size; \ + p->field = ++str_index; \ + } else { \ + p->field = 0; \ + } \ + } while (0) + +#define set_field_with_default(type, field, def) \ + do { \ + if (!qemu_cfg_smbios_load_field(type, \ + offsetof(struct smbios_type_##type, \ + field), &p->field)) { \ + p->field = def; \ + } \ + } while (0) + /* Type 0 -- BIOS Information */ #define RELEASE_DATE_STR "01/01/2007" static void * -smbios_type_0_init(void *start) +smbios_init_type_0(void *start) { struct smbios_type_0 *p = (struct smbios_type_0 *)start; + char *end = (char *)start + sizeof(struct smbios_type_0); + size_t size; + int str_index = 0; p->header.type = 0; p->header.length = sizeof(struct smbios_type_0); p->header.handle = 0; - p->vendor_str = 1; - p->bios_version_str = 1; - p->bios_starting_address_segment = 0xe800; - p->bios_release_date_str = 2; - p->bios_rom_size = 0; /* FIXME */ + load_str_field_with_default(0, vendor_str, CONFIG_APPNAME); + load_str_field_with_default(0, bios_version_str, CONFIG_APPNAME); - memset(p->bios_characteristics, 0, sizeof(p->bios_characteristics)); - p->bios_characteristics[0] = 0x08; /* BIOS characteristics not supported */ - p->bios_characteristics_extension_bytes[0] = 0; - p->bios_characteristics_extension_bytes[1] = 0; + p->bios_starting_address_segment = 0xe800; - p->system_bios_major_release = 1; - p->system_bios_minor_release = 0; - p->embedded_controller_major_release = 0xff; - p->embedded_controller_minor_release = 0xff; + load_str_field_with_default(0, bios_release_date_str, RELEASE_DATE_STR); - start += sizeof(struct smbios_type_0); - memcpy((char *)start, CONFIG_APPNAME, sizeof(CONFIG_APPNAME)); - start += sizeof(CONFIG_APPNAME); - memcpy((char *)start, RELEASE_DATE_STR, sizeof(RELEASE_DATE_STR)); - start += sizeof(RELEASE_DATE_STR); - *((u8 *)start) = 0; + p->bios_rom_size = 0; /* FIXME */ - return start+1; + if (!qemu_cfg_smbios_load_field(0, offsetof(struct smbios_type_0, + bios_characteristics), + &p->bios_characteristics)) { + memset(p->bios_characteristics, 0, 8); + /* BIOS characteristics not supported */ + p->bios_characteristics[0] = 0x08; + } + + if (!qemu_cfg_smbios_load_field(0, offsetof(struct smbios_type_0, + bios_characteristics_extension_bytes), + &p->bios_characteristics_extension_bytes)) { + p->bios_characteristics_extension_bytes[0] = 0; + /* Enable targeted content distribution. Needed for SVVP */ + p->bios_characteristics_extension_bytes[1] = 4; + } + + set_field_with_default(0, system_bios_major_release, 1); + set_field_with_default(0, system_bios_minor_release, 0); + set_field_with_default(0, embedded_controller_major_release, 0xff); + set_field_with_default(0, embedded_controller_minor_release, 0xff); + + *end = 0; + end++; + + return end; } /* Type 1 -- System Information */ static void * -smbios_type_1_init(void *start) +smbios_init_type_1(void *start) { struct smbios_type_1 *p = (struct smbios_type_1 *)start; + char *end = (char *)start + sizeof(struct smbios_type_1); + size_t size; + int str_index = 0; + p->header.type = 1; p->header.length = sizeof(struct smbios_type_1); p->header.handle = 0x100; - p->manufacturer_str = 0; - p->product_name_str = 0; - p->version_str = 0; - p->serial_number_str = 0; + load_str_field_with_default(1, manufacturer_str, CONFIG_APPNAME); + load_str_field_with_default(1, product_name_str, CONFIG_APPNAME); + load_str_field_or_skip(1, version_str); + load_str_field_or_skip(1, serial_number_str); - uuid_probe(p->uuid); + if (!qemu_cfg_smbios_load_field(1, offsetof(struct smbios_type_1, + uuid), &p->uuid)) { + memset(p->uuid, 0, 16); + } - p->wake_up_type = 0x06; /* power switch */ - p->sku_number_str = 0; - p->family_str = 0; + set_field_with_default(1, wake_up_type, 0x06); /* power switch */ - start += sizeof(struct smbios_type_1); - *((u16 *)start) = 0; + load_str_field_or_skip(1, sku_number_str); + load_str_field_or_skip(1, family_str); - return start+2; + *end = 0; + end++; + if (!str_index) { + *end = 0; + end++; + } + + return end; } /* Type 3 -- System Enclosure */ static void * -smbios_type_3_init(void *start) +smbios_init_type_3(void *start) { struct smbios_type_3 *p = (struct smbios_type_3 *)start; + char *end = (char *)start + sizeof(struct smbios_type_3); + size_t size; + int str_index = 0; p->header.type = 3; p->header.length = sizeof(struct smbios_type_3); p->header.handle = 0x300; - p->manufacturer_str = 0; - p->type = 0x01; /* other */ - p->version_str = 0; - p->serial_number_str = 0; - p->asset_tag_number_str = 0; - p->boot_up_state = 0x03; /* safe */ - p->power_supply_state = 0x03; /* safe */ - p->thermal_state = 0x03; /* safe */ - p->security_status = 0x02; /* unknown */ - p->oem_defined = 0; - p->height = 0; - p->number_of_power_cords = 0; - p->contained_element_count = 0; - - start += sizeof(struct smbios_type_3); - *((u16 *)start) = 0; + load_str_field_with_default(3, manufacturer_str, CONFIG_APPNAME); + set_field_with_default(3, type, 0x01); /* other */ - return start+2; + load_str_field_or_skip(3, version_str); + load_str_field_or_skip(3, serial_number_str); + load_str_field_or_skip(3, asset_tag_number_str); + + set_field_with_default(3, boot_up_state, 0x03); /* safe */ + set_field_with_default(3, power_supply_state, 0x03); /* safe */ + set_field_with_default(3, thermal_state, 0x03); /* safe */ + set_field_with_default(3, security_status, 0x02); /* unknown */ + + set_field_with_default(3, oem_defined, 0); + set_field_with_default(3, height, 0); + set_field_with_default(3, number_of_power_cords, 0); + set_field_with_default(3, contained_element_count, 0); + + *end = 0; + end++; + if (!str_index) { + *end = 0; + end++; + } + + return end; } /* Type 4 -- Processor Information */ static void * -smbios_type_4_init(void *start, unsigned int cpu_number) +smbios_init_type_4(void *start, unsigned int cpu_number) { struct smbios_type_4 *p = (struct smbios_type_4 *)start; + char *end = (char *)start + sizeof(struct smbios_type_4); + size_t size; + int str_index = 0; + char name[1024]; p->header.type = 4; p->header.length = sizeof(struct smbios_type_4); p->header.handle = 0x400 + cpu_number; - p->socket_designation_str = 1; - p->processor_type = 0x03; /* CPU */ - p->processor_family = 0x01; /* other */ - p->processor_manufacturer_str = 0; + size = qemu_cfg_smbios_load_field(4, offsetof(struct smbios_type_4, + socket_designation_str), + name); + if (size) + snprintf(name + size - 1, sizeof(name) - size, "%2x", cpu_number); + else + snprintf(name, sizeof(name), "CPU%2x", cpu_number); + + memcpy(end, name, strlen(name) + 1); + end += strlen(name) + 1; + p->socket_designation_str = ++str_index; - u32 cpuid_signature, ebx, ecx, cpuid_features; - cpuid(1, &cpuid_signature, &ebx, &ecx, &cpuid_features); - p->processor_id[0] = cpuid_signature; - p->processor_id[1] = cpuid_features; + set_field_with_default(4, processor_type, 0x03); /* CPU */ + set_field_with_default(4, processor_family, 0x01); /* other */ - p->processor_version_str = 0; - p->voltage = 0; - p->external_clock = 0; + load_str_field_with_default(4, processor_manufacturer_str, CONFIG_APPNAME); - p->max_speed = 0; /* unknown */ - p->current_speed = 0; /* unknown */ + if (!qemu_cfg_smbios_load_field(4, offsetof(struct smbios_type_4, + processor_id), p->processor_id)) { + u32 cpuid_signature, ebx, ecx, cpuid_features; + cpuid(1, &cpuid_signature, &ebx, &ecx, &cpuid_features); + p->processor_id[0] = cpuid_signature; + p->processor_id[1] = cpuid_features; + } - p->status = 0x41; /* socket populated, CPU enabled */ - p->processor_upgrade = 0x01; /* other */ + load_str_field_or_skip(4, processor_version_str); + set_field_with_default(4, voltage, 0); + set_field_with_default(4, external_clock, 0); - p->l1_cache_handle = 0xffff; /* cache information structure not provided */ - p->l2_cache_handle = 0xffff; - p->l3_cache_handle = 0xffff; + set_field_with_default(4, max_speed, 2000); + set_field_with_default(4, current_speed, 2000); - start += sizeof(struct smbios_type_4); + set_field_with_default(4, status, 0x41); /* socket populated, CPU enabled */ + set_field_with_default(4, processor_upgrade, 0x01); /* other */ - memcpy((char *)start, "CPU " "\0" "" "\0" "", 7); - ((char *)start)[4] = cpu_number + '0'; + /* cache information structure not provided */ + p->l1_cache_handle = 0xffff; + p->l2_cache_handle = 0xffff; + p->l3_cache_handle = 0xffff; - return start+7; + *end = 0; + end++; + if (!str_index) { + *end = 0; + end++; + } + + return end; } /* Type 16 -- Physical Memory Array */ static void * -smbios_type_16_init(void *start) +smbios_init_type_16(void *start, u32 memory_size_mb, int nr_mem_devs) { struct smbios_type_16 *p = (struct smbios_type_16*)start; @@ -397,13 +295,15 @@ smbios_type_16_init(void *start) p->header.length = sizeof(struct smbios_type_16); p->header.handle = 0x1000; - p->location = 0x01; /* other */ - p->use = 0x03; /* system memory */ - p->error_correction = 0x01; /* other */ - u64 memsize = RamSize + RamSizeOver4G; - p->maximum_capacity = memsize / 1024; + set_field_with_default(16, location, 0x01); /* other */ + set_field_with_default(16, use, 0x03); /* system memory */ + /* Multi-bit ECC to make Microsoft happy */ + set_field_with_default(16, error_correction, 0x06); + /* 0x80000000 = unknown, accept sizes < 2TB - TODO multiple arrays */ + p->maximum_capacity = memory_size_mb < 2 << 20 ? + memory_size_mb << 10 : 0x80000000; p->memory_error_information_handle = 0xfffe; /* none provided */ - p->number_of_memory_devices = 1; + p->number_of_memory_devices = nr_mem_devs; start += sizeof(struct smbios_type_16); *((u16 *)start) = 0; @@ -413,53 +313,64 @@ smbios_type_16_init(void *start) /* Type 17 -- Memory Device */ static void * -smbios_type_17_init(void *start) +smbios_init_type_17(void *start, u32 size_mb, int instance) { struct smbios_type_17 *p = (struct smbios_type_17 *)start; + char *end = (char *)start + sizeof(struct smbios_type_17); + size_t size; + int str_index = 0; + char name[1024]; p->header.type = 17; p->header.length = sizeof(struct smbios_type_17); - p->header.handle = 0x1100; + p->header.handle = 0x1100 + instance; p->physical_memory_array_handle = 0x1000; - p->total_width = 64; - p->data_width = 64; - /* truncate memory_size_mb to 16 bits and clear most significant - bit [indicates size in MB] */ - u64 memsize = RamSize + RamSizeOver4G; - p->size = (u16) (memsize / (1024*1024)) & 0x7fff; - p->form_factor = 0x09; /* DIMM */ + set_field_with_default(17, total_width, 64); + set_field_with_default(17, data_width, 64); +/* TODO: should assert in case something is wrong ASSERT((memory_size_mb & ~0x7fff) == 0); */ + p->size = size_mb; + set_field_with_default(17, form_factor, 0x09); /* DIMM */ p->device_set = 0; - p->device_locator_str = 1; - p->bank_locator_str = 0; - p->memory_type = 0x07; /* RAM */ - p->type_detail = 0; - start += sizeof(struct smbios_type_17); - memcpy((char *)start, "DIMM 1", 7); - start += 7; - *((u8 *)start) = 0; + size = qemu_cfg_smbios_load_field(17, offsetof(struct smbios_type_17, + device_locator_str), + name); + if (size) + snprintf(name + size - 1, sizeof(name) - size, "%d", instance); + else + snprintf(name, sizeof(name), "DIMM %d", instance); + + memcpy(end, name, strlen(name) + 1); + end += strlen(name) + 1; + p->device_locator_str = ++str_index; - return start+1; + load_str_field_or_skip(17, bank_locator_str); + set_field_with_default(17, memory_type, 0x07); /* RAM */ + set_field_with_default(17, type_detail, 0); + + *end = 0; + end++; + if (!str_index) { + *end = 0; + end++; + } + + return end; } /* Type 19 -- Memory Array Mapped Address */ static void * -smbios_type_19_init(void *start) +smbios_init_type_19(void *start, u32 start_mb, u32 size_mb, int instance) { struct smbios_type_19 *p = (struct smbios_type_19 *)start; p->header.type = 19; p->header.length = sizeof(struct smbios_type_19); - p->header.handle = 0x1300; + p->header.handle = 0x1300 + instance; - p->starting_address = 0; - u64 memsize = RamSizeOver4G; - if (memsize) - memsize += 0x100000000ull; - else - memsize = RamSize; - p->ending_address = memsize / 1024 - 1; + p->starting_address = start_mb << 10; + p->ending_address = p->starting_address + (size_mb << 10) - 1; p->memory_array_handle = 0x1000; p->partition_width = 1; @@ -471,23 +382,19 @@ smbios_type_19_init(void *start) /* Type 20 -- Memory Device Mapped Address */ static void * -smbios_type_20_init(void *start) +smbios_init_type_20(void *start, u32 start_mb, u32 size_mb, int instance, + int dev_handle, int array_handle) { struct smbios_type_20 *p = (struct smbios_type_20 *)start; p->header.type = 20; p->header.length = sizeof(struct smbios_type_20); - p->header.handle = 0x1400; + p->header.handle = 0x1400 + instance; - p->starting_address = 0; - u64 memsize = RamSizeOver4G; - if (memsize) - memsize += 0x100000000ull; - else - memsize = RamSize; - p->ending_address = memsize / 1024 - 1; - p->memory_device_handle = 0x1100; - p->memory_array_mapped_address_handle = 0x1300; + p->starting_address = start_mb << 10; + p->ending_address = p->starting_address + (size_mb << 10) - 1; + p->memory_device_handle = 0x1100 + dev_handle; + p->memory_array_mapped_address_handle = 0x1300 + array_handle; p->partition_row_position = 1; p->interleave_position = 0; p->interleaved_data_depth = 0; @@ -500,7 +407,7 @@ smbios_type_20_init(void *start) /* Type 32 -- System Boot Information */ static void * -smbios_type_32_init(void *start) +smbios_init_type_32(void *start) { struct smbios_type_32 *p = (struct smbios_type_32 *)start; @@ -508,7 +415,7 @@ smbios_type_32_init(void *start) p->header.length = sizeof(struct smbios_type_32); p->header.handle = 0x2000; memset(p->reserved, 0, 6); - p->boot_status = 0; /* no errors detected */ + set_field_with_default(32, boot_status, 0); /* no errors detected */ start += sizeof(struct smbios_type_32); *((u16 *)start) = 0; @@ -518,7 +425,7 @@ smbios_type_32_init(void *start) /* Type 127 -- End of Table */ static void * -smbios_type_127_init(void *start) +smbios_init_type_127(void *start) { struct smbios_type_127 *p = (struct smbios_type_127 *)start; @@ -532,6 +439,8 @@ smbios_type_127_init(void *start) return start + 2; } +#define TEMPSMBIOSSIZE (32 * 1024) + void smbios_init(void) { @@ -540,44 +449,76 @@ smbios_init(void) dprintf(3, "init SMBIOS tables\n"); - unsigned cpu_num, nr_structs = 0, max_struct_size = 0; - char *start, *p, *q; - - bios_table_cur_addr = ALIGN(bios_table_cur_addr, 16); - start = (void *)(bios_table_cur_addr); - - p = (char *)start + sizeof(struct smbios_entry_point); - -#define add_struct(fn) { \ - q = (fn); \ - nr_structs++; \ - if ((q - p) > max_struct_size) \ - max_struct_size = q - p; \ - p = q; \ -} - - add_struct(smbios_type_0_init(p)); - add_struct(smbios_type_1_init(p)); - add_struct(smbios_type_3_init(p)); - int smp_cpus = smp_probe(); - for (cpu_num = 1; cpu_num <= smp_cpus; cpu_num++) - add_struct(smbios_type_4_init(p, cpu_num)); - add_struct(smbios_type_16_init(p)); - add_struct(smbios_type_17_init(p)); - add_struct(smbios_type_19_init(p)); - add_struct(smbios_type_20_init(p)); - add_struct(smbios_type_32_init(p)); - add_struct(smbios_type_127_init(p)); + char *start = malloc_tmphigh(TEMPSMBIOSSIZE); + if (! start) { + warn_noalloc(); + return; + } + + u32 nr_structs = 0, max_struct_size = 0; + char *q, *p = start; + char *end = start + TEMPSMBIOSSIZE - sizeof(struct smbios_type_127); + +#define add_struct(type, args...) \ + do { \ + if (!qemu_cfg_smbios_load_external(type, &p, &nr_structs, \ + &max_struct_size, end)) { \ + q = smbios_init_type_##type(args); \ + nr_structs++; \ + if ((q - p) > max_struct_size) \ + max_struct_size = q - p; \ + p = q; \ + } \ + } while (0) + + add_struct(0, p); + add_struct(1, p); + add_struct(3, p); + + int cpu_num; + for (cpu_num = 1; cpu_num <= MaxCountCPUs; cpu_num++) + add_struct(4, p, cpu_num); + + int ram_mb = (RamSize + RamSizeOver4G) >> 20; + int nr_mem_devs = (ram_mb + 0x3fff) >> 14; + add_struct(16, p, ram_mb, nr_mem_devs); + + int i, j; + for (i = 0; i < nr_mem_devs; i++) { + u32 dev_mb = ((i == (nr_mem_devs - 1)) + ? (((ram_mb - 1) & 0x3fff) + 1) + : 16384); + add_struct(17, p, dev_mb, i); + } + + add_struct(19, p, 0, RamSize >> 20, 0); + if (RamSizeOver4G) + add_struct(19, p, 4096, RamSizeOver4G >> 20, 1); + + add_struct(20, p, 0, RamSize >> 20, 0, 0, 0); + if (RamSizeOver4G) { + u32 start_mb = 4096; + for (j = 1, i = 0; i < nr_mem_devs; i++, j++) { + u32 dev_mb = ((i == (nr_mem_devs - 1)) + ? (((ram_mb - 1) & 0x3fff) + 1) + : 16384); + if (i == 0) + dev_mb -= RamSize >> 20; + + add_struct(20, p, start_mb, dev_mb, j, i, 1); + start_mb += dev_mb; + } + } + + add_struct(32, p); + /* Add any remaining provided entries before the end marker */ + for (i = 0; i < 256; i++) + qemu_cfg_smbios_load_external(i, &p, &nr_structs, &max_struct_size, + end); + add_struct(127, p); #undef add_struct - smbios_entry_point_init( - start, max_struct_size, - (p - (char *)start) - sizeof(struct smbios_entry_point), - (u32)(start + sizeof(struct smbios_entry_point)), - nr_structs); - - bios_table_cur_addr += (p - (char *)start); - - dprintf(1, "SMBIOS table addr=0x%08lx\n", (unsigned long)start); + smbios_entry_point_init(max_struct_size, p - start, start, nr_structs); + free(start); }