X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fsmbios.c;h=fe1e1835f6ad07797eb469f6384c203ede4319a5;hb=34203cdf8a89c747e221005850a4558252235360;hp=f1b43f20f41862fcd06c19cc53ad95892c39bebc;hpb=01a8520fc9941dce458f75b40aab349a3a797e3e;p=seabios.git diff --git a/src/smbios.c b/src/smbios.c index f1b43f2..fe1e183 100644 --- a/src/smbios.c +++ b/src/smbios.c @@ -10,6 +10,8 @@ #include "paravirt.h" // qemu_cfg_smbios_load_field #include "smbios.h" // struct smbios_entry_point +struct smbios_entry_point *SMBiosAddr; + static void smbios_entry_point_init(u16 max_structure_size, u16 structure_table_length, @@ -17,10 +19,20 @@ smbios_entry_point_init(u16 max_structure_size, u16 number_of_structures) { struct smbios_entry_point *ep = malloc_fseg(sizeof(*ep)); - if (! ep) { - dprintf(1, "No space for smbios entry table!\n"); + 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; @@ -32,7 +44,7 @@ smbios_entry_point_init(u16 max_structure_size, memcpy(ep->intermediate_anchor_string, "_DMI_", 5); ep->structure_table_length = structure_table_length; - ep->structure_table_address = (u32)structure_table_address; + ep->structure_table_address = (u32)finaltable; ep->number_of_structures = number_of_structures; ep->smbios_bcd_revision = 0x24; @@ -40,7 +52,9 @@ smbios_entry_point_init(u16 max_structure_size, ep->intermediate_checksum -= checksum((void*)ep + 0x10, ep->length - 0x10); - dprintf(1, "SMBIOS ptr=%p table=%p\n", ep, structure_table_address); + 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) \ @@ -57,7 +71,7 @@ smbios_entry_point_init(u16 max_structure_size, p->field = ++str_index; \ } while (0) -#define load_str_field_or_skip(type, field) \ +#define load_str_field_or_skip(type, field) \ do { \ size = qemu_cfg_smbios_load_field(type, \ offsetof(struct smbios_type_##type, \ @@ -70,6 +84,15 @@ smbios_entry_point_init(u16 max_structure_size, } \ } 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 * @@ -93,23 +116,26 @@ smbios_init_type_0(void *start) p->bios_rom_size = 0; /* FIXME */ - memset(p->bios_characteristics, 0, 8); - p->bios_characteristics[0] = 0x08; /* BIOS characteristics not supported */ - p->bios_characteristics_extension_bytes[0] = 0; - p->bios_characteristics_extension_bytes[1] = 0; - if (!qemu_cfg_smbios_load_field(0, offsetof(struct smbios_type_0, - system_bios_major_release), - &p->system_bios_major_release)) - p->system_bios_major_release = 1; + 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, - system_bios_minor_release), - &p->system_bios_minor_release)) - p->system_bios_minor_release = 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; + } - p->embedded_controller_major_release = 0xff; - p->embedded_controller_minor_release = 0xff; + 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++; @@ -130,17 +156,17 @@ smbios_init_type_1(void *start) p->header.length = sizeof(struct smbios_type_1); p->header.handle = 0x100; - load_str_field_or_skip(1, manufacturer_str); - load_str_field_or_skip(1, product_name_str); + 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); - size = qemu_cfg_smbios_load_field(1, offsetof(struct smbios_type_1, - uuid), &p->uuid); - if (size == 0) + 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 */ + set_field_with_default(1, wake_up_type, 0x06); /* power switch */ load_str_field_or_skip(1, sku_number_str); load_str_field_or_skip(1, family_str); @@ -160,29 +186,39 @@ static void * 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 */ @@ -190,41 +226,63 @@ static void * 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; + } + + 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->status = 0x41; /* socket populated, CPU enabled */ - p->processor_upgrade = 0x01; /* other */ + set_field_with_default(4, max_speed, 2000); + set_field_with_default(4, current_speed, 2000); - 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, status, 0x41); /* socket populated, CPU enabled */ + set_field_with_default(4, processor_upgrade, 0x01); /* other */ - start += sizeof(struct smbios_type_4); + /* cache information structure not provided */ + p->l1_cache_handle = 0xffff; + p->l2_cache_handle = 0xffff; + p->l3_cache_handle = 0xffff; - memcpy((char *)start, "CPU " "\0" "" "\0" "", 7); - ((char *)start)[4] = cpu_number + '0'; + *end = 0; + end++; + if (!str_index) { + *end = 0; + end++; + } - return start+7; + return end; } /* Type 16 -- Physical Memory Array */ @@ -237,10 +295,13 @@ smbios_init_type_16(void *start, u32 memory_size_mb, int nr_mem_devs) 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 */ - p->maximum_capacity = memory_size_mb * 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 = nr_mem_devs; @@ -252,38 +313,55 @@ smbios_init_type_16(void *start, u32 memory_size_mb, int nr_mem_devs) /* Type 17 -- Memory Device */ static void * -smbios_init_type_17(void *start, u32 memory_size_mb, int instance) +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 + instance; p->physical_memory_array_handle = 0x1000; - p->total_width = 64; - p->data_width = 64; + 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 = memory_size_mb; - p->form_factor = 0x09; /* DIMM */ + 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 0", 7); - ((char*)start)[5] += instance; - start += 7; - *((u8 *)start) = 0; - - return start+1; + + 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; + + 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_init_type_19(void *start, u32 memory_size_mb, int instance) +smbios_init_type_19(void *start, u32 start_mb, u32 size_mb, int instance) { struct smbios_type_19 *p = (struct smbios_type_19 *)start; @@ -291,8 +369,8 @@ smbios_init_type_19(void *start, u32 memory_size_mb, int instance) p->header.length = sizeof(struct smbios_type_19); p->header.handle = 0x1300 + instance; - p->starting_address = instance << 24; - p->ending_address = p->starting_address + (memory_size_mb << 10) - 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; @@ -304,7 +382,8 @@ smbios_init_type_19(void *start, u32 memory_size_mb, int instance) /* Type 20 -- Memory Device Mapped Address */ static void * -smbios_init_type_20(void *start, u32 memory_size_mb, int instance) +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; @@ -312,10 +391,10 @@ smbios_init_type_20(void *start, u32 memory_size_mb, int instance) p->header.length = sizeof(struct smbios_type_20); p->header.handle = 0x1400 + instance; - p->starting_address = instance << 24; - p->ending_address = p->starting_address + (memory_size_mb << 10) - 1; - p->memory_device_handle = 0x1100 + instance; - p->memory_array_mapped_address_handle = 0x1300 + instance; + 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; @@ -336,7 +415,7 @@ smbios_init_type_32(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; @@ -360,6 +439,8 @@ smbios_init_type_127(void *start) return start + 2; } +#define TEMPSMBIOSSIZE (32 * 1024) + void smbios_init(void) { @@ -368,14 +449,15 @@ smbios_init(void) dprintf(3, "init SMBIOS tables\n"); - char *start = malloc_high(2048); // XXX - determine real size + char *start = malloc_tmphigh(TEMPSMBIOSSIZE); if (! start) { - dprintf(1, "No memory for smbios tables\n"); + warn_noalloc(); return; } u32 nr_structs = 0, max_struct_size = 0; - char *q, *p = start, *end = start + 2048 - sizeof(struct smbios_type_127); + char *q, *p = start; + char *end = start + TEMPSMBIOSSIZE - sizeof(struct smbios_type_127); #define add_struct(type, args...) \ do { \ @@ -396,21 +478,36 @@ smbios_init(void) int cpu_num; for (cpu_num = 1; cpu_num <= MaxCountCPUs; cpu_num++) add_struct(4, p, cpu_num); - u64 memsize = RamSizeOver4G; - if (memsize) - memsize += 0x100000000ull; - else - memsize = RamSize; - memsize = memsize / (1024 * 1024); - int nr_mem_devs = (memsize + 0x3fff) >> 14; - add_struct(16, p, memsize, nr_mem_devs); - int i; + + 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_memsize = ((i == (nr_mem_devs - 1)) - ? (((memsize-1) & 0x3fff)+1) : 0x4000); - add_struct(17, p, dev_memsize, i); - add_struct(19, p, dev_memsize, i); - add_struct(20, p, dev_memsize, 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); @@ -423,4 +520,5 @@ smbios_init(void) #undef add_struct smbios_entry_point_init(max_struct_size, p - start, start, nr_structs); + free(start); }