June 2010 - SeaBIOS - mail.coreboot.org

Re: [SeaBIOS] [Qemu-devel] SeaBIOS error with Juniper FreeBSD kernel
by Kevin O'Connor July 11, 2011

July 11, 2011

On Sun, Feb 21, 2010 at 04:18:38PM -0700, Brandon Bennett wrote: > > On Sat, Feb 20, 2010 at 9:05 PM, Kevin O'Connor <kevin(a)koconnor.net> wrote: > >> Should a kernel fail during boot, I'd suspect it doesn't like one of > >> the apm/pcibios callbacks, or it doesn't like one of the > >> smbios/mptable/acpi tables. You could try compiling the SeaBIOS code > >> (see http://seabios.org/Download ) and increasing the debugging by > >> modifying src/config.h. Specifically, you could increase > >> CONFIG_DEBUG_LEVEL, and set DEBUG_HDL_pcibios32 and DEBUG_HDL_apm to > >> 1. Also, you could try disabling some of the features to see if that > >> prevents the fault (eg, disabling CONFIG_ACPI / CONFIG_SMBIOS / > >> CONFIG_MPTABLE). > > > > I have narrowed it down to SMBIOS. If I disable CONFIG_SMBIOS the > image boots up fine. Gleb, have you seen this thread? Some of the recent changes to smbios that look like possible culprits are: Make SMBIOS table pass MS SVVP test Use MaxCountCPUs during building of per cpu tables. Add malloc_high/fseg() and rework bios table creation to use them. There were other changes, but the comments indicate they were only ports of changes already in bochs. I suppose it's also possible the lack of smbios is turning off some other feature in the guest (eg, acpi) that's the real culprit. -Kevin

5 10

[PATCH] smbios: Allow all fields to be set via qemu_cfg_smbios_load_field()
by Alex Williamson July 10, 2010

July 10, 2010

The protocol we use between qemu and seabios already allows any field to be specified (via smbios_add_field() in qemu). This patch makes seabios look for qemu specified values for nearly every field we set in the types 0,1,3,4,16,17,32 smbios tables. No change in current default values for any fields. Signed-off-by: Alex Williamson <alex.williamson(a)redhat.com> --- src/smbios.c | 222 +++++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 141 insertions(+), 81 deletions(-) diff --git a/src/smbios.c b/src/smbios.c index e19a62d..917428a 100644 --- a/src/smbios.c +++ b/src/smbios.c @@ -61,7 +61,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, \ @@ -74,6 +74,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 * @@ -97,24 +106,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; - /* Enable targeted content distribution. Needed for SVVP */ - p->bios_characteristics_extension_bytes[1] = 4; - 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++; @@ -140,12 +151,12 @@ smbios_init_type_1(void *start) 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); @@ -165,29 +176,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 = 1; - 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); - memcpy((char *)start, CONFIG_APPNAME"\0\0", sizeof(CONFIG_APPNAME) + 1); - - return start + sizeof(CONFIG_APPNAME) + 1; + load_str_field_with_default(3, manufacturer_str, CONFIG_APPNAME); + set_field_with_default(3, type, 0x01); /* other */ + + 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 */ @@ -195,42 +216,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 = 2; - - 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->processor_version_str = 0; - p->voltage = 0; - p->external_clock = 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; + + set_field_with_default(4, processor_type, 0x03); /* CPU */ + set_field_with_default(4, processor_family, 0x01); /* other */ + + load_str_field_with_default(4, processor_manufacturer_str, CONFIG_APPNAME); + + 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->max_speed = 2000; - p->current_speed = 2000; + 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; - snprintf((char*)start, 6, "CPU%2x", cpu_number); - start += 6; - memcpy((char *)start, CONFIG_APPNAME"\0\0", sizeof(CONFIG_APPNAME) + 1); + *end = 0; + end++; + if (!str_index) { + *end = 0; + end++; + } - return start + sizeof(CONFIG_APPNAME) + 1; + return end; } /* Type 16 -- Physical Memory Array */ @@ -243,9 +285,10 @@ 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 = 0x06; /* Multi-bit ECC to make Microsoft happy */ + 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; @@ -263,30 +306,47 @@ static void * 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 = size_mb; - p->form_factor = 0x09; /* DIMM */ + 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 */ @@ -345,7 +405,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;

2 6

[PATCH] Bootsplash for SeaBIOS (with coreboot)
by Stefan Reinauer July 4, 2010

July 4, 2010

See patch -- coresystems GmbH • Brahmsstr. 16 • D-79104 Freiburg i. Br. Tel.: +49 761 7668825 • Fax: +49 761 7664613 Email: info(a)coresystems.de • http://www.coresystems.de/ Registergericht: Amtsgericht Freiburg • HRB 7656 Geschäftsführer: Stefan Reinauer • Ust-IdNr.: DE245674866

3 11

[PATCH v2 0/8] seabios: pci: multi pci bus support
by Isaku Yamahata July 4, 2010

July 4, 2010

Changes v1 -> v2: - simplified foreachpci_in_bus() - add overlap check during pci bar assignemnt. - use c99 initialization. Patch description: This patch set allows seabios to initialize multi pci bus and 64bit BAR. Currently seabios is able to initialize only pci root bus. However multi pci bus support is wanted because - more pci bus is wanted in qemu for many slots - pci express support is commin in qemu which requires multi pci bus. those patches on Qemu part are under way, though. Isaku Yamahata (8): seabios: pci: introduce foreachpci_in_bus() helper macro. seabios: pciinit: factor out pci bar region allocation logic. seabios: pciinit: make pci memory space assignment 64bit aware. seabios: pciinit: make pci bar assigner preferchable memory aware. seabios: pciinit: factor out bar offset calculation. seabios: pciinit: make bar offset calculation pci bridge aware. seabios: pciinit: pci bridge bus initialization. seabios: pciinit: initialize pci bridge filtering registers. src/config.h | 17 +++ src/pci.h | 10 ++ src/pciinit.c | 324 +++++++++++++++++++++++++++++++++++++++++++++++++-------- 3 files changed, 306 insertions(+), 45 deletions(-)

2 9

Re: [SeaBIOS] [PATCH] KVM vcpu hotplug seabios infrastructure
by Kevin O'Connor June 29, 2010

June 29, 2010

On Sun, Jun 27, 2010 at 01:28:52PM +0800, Liu, Jinsong wrote: > Kevin, > > Any comments? or any update need I do? The main thing holding this up is the open question around the qemu/seabios acpi interface. I wont be able to look at this for another week. -Kevin

1 0

Re: [SeaBIOS] [PATCH] KVM vcpu hotplug seabios infrastructure
by Liu, Jinsong June 27, 2010

June 27, 2010

Liu, Jinsong wrote: > Kevin O'Connor wrote: >>> >>> I'm referring to git://git.linuxtogo.org/home/kevin/seabios.git >>> According to http://www.coreboot.org/SeaBIOS, >>> it seems that Keven maintains that repo as the seabios upstream. >>> Kevin when pushing patches, which repository should we refer? >> >> Patches sent to me should be based off of the linuxtogo repo. >> >> -Kevin > > Kevin, > > Attached is updated patch: > 1). rebase my patch referring the linuxtogo repo > git://git.linuxtogo.org/home/kevin/seabios.git; 2). According to > Isaku and Peter's comments, I update Makefile, use 1 rule to build > both acpi_ssdt_15.hex and acpi_ssdt_anycpu.hex, while user don't need > iasl to compile seabios; > > Thanks Isaku, Kevin, and Peter for your comments! > > Regards, > Jinsong Kevin, Any comments? or any update need I do? Thanks, Jinsong

1 0

Re: [SeaBIOS] [PATCH] KVM vcpu hotplug seabios infrastructure
by Isaku Yamahata June 23, 2010

June 23, 2010

On Mon, Jun 21, 2010 at 02:52:51PM +0800, Liu, Jinsong wrote: > Isaku, > > Thanks for comments! > I didn't fine changeset 12cbb43b9dc8a16f712188cb308a0eb0321f3e20, I pull from git://git.kernel.org/pub/scm/virt/kvm/seabios.git, any misunderstanding? I'm referring to git://git.linuxtogo.org/home/kevin/seabios.git According to http://www.coreboot.org/SeaBIOS, it seems that Keven maintains that repo as the seabios upstream. Kevin when pushing patches, which repository should we refer? > As for makefile rule for acpi-ssdt-15.hex and acpi-ssdt-anycpu.hex, we in fact combine them into 1 generic rule in our old patch, as attached. > However, the old makefile require iasl for user compiling seabios. > Kevin prefer not using iasl, so we update it as new version. Something like the below didn't work? (I just wrote it just to show my idea. I didn't any test.) +src/%.hex: src/acpi-ssdt.dsl src/mk_ssdt.c + @echo "Compiling SSDT for general os which support more cpus" + $(Q)$(CC) -o mk_$* src/mk_ssdt.c + head -n -2 $< > src/$*.dsl.i + ./mk_$* >> src/$*.dsl.i + $(Q)cpp -P src/$*.dsl.i > src/$*.dsl + $(Q)iasl -tc -p $@ src/acpi-ssdt-anycpu.dsl + $(Q)sed -i -e 's/AmlCode/$*/g' $@ + $(Q)rm mk_$* src/$*.dsl.i src/$*.aml src/$*.dsl thanks, > > Thanks, > Jinsong > > Isaku Yamahata wrote: > > Hi Jison. > > > > Can you check the changeset of > > 12cbb43b9dc8a16f712188cb308a0eb0321f3e20 and update Makefile changes? > > > > The rule for acpi-ssdt-15.hex and acpi-ssdt-anycpu.hex seems > > same, so it can be combined into a single generic rule. > > The rules removes the files at the last, but it would be more > > reliable to use Makefile intermediate and let make to remove > > them automatically. > > > > On Sun, Jun 20, 2010 at 11:40:02PM +0800, Liu, Jinsong wrote: > >> Kevin O'Connor wrote: > >>> On Wed, Jun 16, 2010 at 12:19:24PM +0800, Liu, Jinsong wrote: > >>>> Gleb Natapov wrote: > >>>>> FWIW looks good to me. This patch removes dynamic creation of > >>>>> Processor scope and supports only 15/255 cpus configuration, but > >>>>> given that new code is much more complex that old one I don't see > >>>>> other possibilities (unless we'll add aml compiler to seabios > >>>>> runtime). > >>>>> > >> > >>> > >>> I'm okay with the approach (two SSDTs selected by cpu count). The > >>> build changes don't look right (15.c is too cryptic). However, more > >>> importantly, I want to see where we end up going with the > >>> qemu/seabios acpi interface discussion before committing this. > >>> > >>> -Kevin > >> > >> > >> Kevin, > >> > >> Thanks for comments! > >> > >> In your last comments, you prefer not to use iasl to compile seabios. > >> Now I update the patch as attached (only need update Makefile): > >> 1. cancel cryptic name like 15.c from Makefile, and we give detailed > >> description for cpu number in new version; > >> 2. user don't need iasl again to compile seabios, except if they > >> want to change dsdt/ssdt itself; > >> > >> The process to apply patch and build in my desktop is: > >> $ git apply kvm-vcpu-hotplug-seabios.patch > >> $ git add src/acpi-ssdt.dsl > >> $ git add src/mk_ssdt.c > >> $ git add src/acpi-ssdt-15.hex > >> $ git add src/acpi-ssdt-anycpu.hex > >> $ git commit -a > >> $ make > >> > >> We test the updated patch, it works OK with linux2.6.32 hot-add and > >> hot-remove. > >> > >> Thanks, > >> Jinsong > > > >> _______________________________________________ > >> SeaBIOS mailing list > >> SeaBIOS(a)seabios.org > >> http://www.seabios.org/mailman/listinfo/seabios > -- yamahata

4 4

Re: [SeaBIOS] [PATCH] KVM vcpu hotplug seabios infrastructure
by Isaku Yamahata June 23, 2010

June 23, 2010

On Tue, Jun 22, 2010 at 10:01:36PM +0800, Liu, Jinsong wrote: > > Something like the below didn't work? > > (I just wrote it just to show my idea. I didn't any test.) > > > > +src/%.hex: src/acpi-ssdt.dsl src/mk_ssdt.c > > + @echo "Compiling SSDT for general os which support more cpus" > > + $(Q)$(CC) -o mk_$* src/mk_ssdt.c > > + head -n -2 $< > src/$*.dsl.i > > + ./mk_$* >> src/$*.dsl.i > > + $(Q)cpp -P src/$*.dsl.i > src/$*.dsl > > + $(Q)iasl -tc -p $@ src/acpi-ssdt-anycpu.dsl > > + $(Q)sed -i -e 's/AmlCode/$*/g' $@ > > + $(Q)rm mk_$* src/$*.dsl.i src/$*.aml src/$*.dsl > > > > If so, current dependency 'src/%.hex: src/%.dsl' will conflict with new dependency 'src/%.hex: src/acpi-ssdt.dsl src/mk_ssdt.c', like when build src/acpi-ssdt.hex? > Ah, then src/acpi-ssdt-%.hex doesn't work? Anyway if automatic variable doesn't work for what you want or you want more generic method, canned command sequence would work. This technique is already used. Linux kbuild uses it very heavily. ssdt-compile = ... (or use define/endef) src/acpi-anycpu.hex: ... $(ssdt-compile) If you want to pass parameter src/acpi-15cpu.hex: ... $(call ssdt-compile parameter, ...) > BTW, in current Makefile, seems the dependency '$(OUT)ccode32flat.o: src/acpi-dsdt.hex' is redundant. > Without it, makefile still build src/acpi-dsdt.hex. I checked the Makefile but didn't find the reason. It's subtle dependency. Without the dependency, "make clean; rm -f src/acpi-dsdt.hex; make" causes the following error for me. I suspect that old acpi-dsdt.hex would be used even when acpi-dsdt.dsl is modified. Hmm, should it be commented? Working around non-functional -combine Compiling whole program out/ccode.16.s Compiling to assembler out/asm-offsets.s Generating offset file out/asm-offsets.h Compiling (16bit) out/code16.o Compiling whole program out/ccode32flat.o In file included from out/ccode32flat.o.tmp.c:39: out/../src/acpi.c:205:25: error: acpi-dsdt.hex: No such file or directory In file included from out/ccode32flat.o.tmp.c:39: out/../src/acpi.c: In function 'acpi_bios_init': out/../src/acpi.c:690: error: 'AmlCode' undeclared (first use in this function) out/../src/acpi.c:690: error: (Each undeclared identifier is reported only once out/../src/acpi.c:690: error: for each function it appears in.) make: *** [out/ccode32flat.o] Error 1 -- yamahata

1 0

[PATCH 0/2] Allow acpi and smbios default strings to be set on config.h
by Eduardo Habkost June 22, 2010

June 22, 2010

Hi, This series allows the default values for specific fields on acpi and smbios tables to be set at build time, by editing config.h. The current defaults are not changed, but it will allow build-time setting of specific strings on config.h if necessary. Eduardo Habkost (2): acpi: allow header strings be configured on config.h smbios: allow vendor/manufacturer/version/product names be set on config.h src/acpi.c | 8 ++++---- src/config.h | 13 +++++++++++++ src/smbios.c | 16 ++++++++-------- 3 files changed, 25 insertions(+), 12 deletions(-)

3 6

[PATCH v2] seabios: acpi: allow qemu to load dsdt as external acpi table.
by Isaku Yamahata June 22, 2010

June 22, 2010

allow qemu to load dsdt as external acpi table. Signed-off-by: Isaku Yamahata <yamahata(a)valinux.co.jp> --- changes v1 -> v2. - load qemu table first and they try default dsdt table if qemu doesn't supply dsdt. Thus unnecessary malloc_high()/free() is avoided. --- src/acpi.c | 49 +++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 41 insertions(+), 8 deletions(-) diff --git a/src/acpi.c b/src/acpi.c index 0559443..b75f9af 100644 --- a/src/acpi.c +++ b/src/acpi.c @@ -126,6 +126,11 @@ struct fadt_descriptor_rev1 } PACKED; /* + * Differentiated System Descrition Table (DSDT) + */ +#define DSDT_SIGNATURE 0x54445344 // DSDT + +/* * MADT values and structures */ @@ -280,6 +285,11 @@ static inline u32 cpu_to_le32(u32 x) return x; } +static inline u32 le32_to_cpu(u32 x) +{ + return x; +} + static void build_header(struct acpi_table_header *h, u32 sig, int len, u8 rev) { @@ -295,14 +305,20 @@ build_header(struct acpi_table_header *h, u32 sig, int len, u8 rev) h->checksum -= checksum(h, len); } +static void fill_dsdt(struct fadt_descriptor_rev1 *fadt, void *dsdt) +{ + fadt->dsdt = cpu_to_le32((u32)dsdt); + fadt->checksum -= checksum(fadt, sizeof(*fadt)); + dprintf(1, "ACPI DSDT=%p\n", dsdt); +} + static void* build_fadt(int bdf) { struct fadt_descriptor_rev1 *fadt = malloc_high(sizeof(*fadt)); struct facs_descriptor_rev1 *facs = memalign_high(64, sizeof(*facs)); - void *dsdt = malloc_high(sizeof(AmlCode)); - if (!fadt || !facs || !dsdt) { + if (!fadt || !facs) { warn_noalloc(); return NULL; } @@ -312,13 +328,11 @@ build_fadt(int bdf) facs->signature = FACS_SIGNATURE; facs->length = cpu_to_le32(sizeof(*facs)); - /* DSDT */ - memcpy(dsdt, AmlCode, sizeof(AmlCode)); - /* FADT */ memset(fadt, 0, sizeof(*fadt)); fadt->firmware_ctrl = cpu_to_le32((u32)facs); - fadt->dsdt = cpu_to_le32((u32)dsdt); + fadt->dsdt = 0; /* dsdt will be filled later in acpi_bios_init() + by fill_dsdt() */ fadt->model = 1; fadt->reserved1 = 0; int pm_sci_int = pci_config_readb(bdf, PCI_INTERRUPT_LINE); @@ -634,7 +648,8 @@ acpi_bios_init(void) } while(0) // Add tables - ACPI_INIT_TABLE(build_fadt(bdf)); + struct fadt_descriptor_rev1 *fadt = build_fadt(bdf); + ACPI_INIT_TABLE(fadt); ACPI_INIT_TABLE(build_ssdt()); ACPI_INIT_TABLE(build_madt()); ACPI_INIT_TABLE(build_hpet()); @@ -649,12 +664,30 @@ acpi_bios_init(void) warn_noalloc(); continue; } - ACPI_INIT_TABLE(qemu_cfg_next_acpi_table_load(addr, len)); + struct acpi_table_header *header = + qemu_cfg_next_acpi_table_load(addr, len); + if (header->signature == DSDT_SIGNATURE) { + if (fadt) { + fill_dsdt(fadt, addr); + } + } else { + ACPI_INIT_TABLE(header); + } if (tbl_idx == MAX_ACPI_TABLES) { warn_noalloc(); break; } } + if (fadt && !fadt->dsdt) { + /* default DSDT */ + void *dsdt = malloc_high(sizeof(AmlCode)); + if (!dsdt) { + warn_noalloc(); + return; + } + memcpy(dsdt, AmlCode, sizeof(AmlCode)); + fill_dsdt(fadt, dsdt); + } struct rsdt_descriptor_rev1 *rsdt; size_t rsdt_len = sizeof(*rsdt) + sizeof(u32) * tbl_idx; -- 1.6.6.1

1 0

Pending patch summary
by Kevin O'Connor June 22, 2010

June 22, 2010

There are a bunch of patches pending. I've put together a summary below. If your patch isn't on this list, please ping me. -Kevin Misc: Isaku Yamahata - pci: multi pci bus support - pci express, etc. Stefan Reinauer - Bootsplash for SeaBIOS - Add jpeg bootsplash support ACPI/SMBIOS: Alex Williamson - smbios: Allow all fields to be set via qemu_cfg_smbios_load_field() - allow all smbios fields to be overwritten by qemu. Arseny Klimovsky - Added ACPI SLIC table - Add acpi slic table generation to seabios - Update slic table oem ids in seabios Eduardo Habkost - Allow acpi and smbios default strings to be set on config.h - Allow each oem id in every smbios/acpi table to be set independently Isaku Yamahata - acpi: allow qemu to load dsdt as external acpi table. - Allow loading of an external dsdt table Gleb Natapov - load hpet info for HPET ACPI table from qemu - Fix hpet by pulling correct info from qemu_cfg Liu, Jinsong - KVM vcpu hotplug seabios infrastructure - replace dynamic ssdt with two builtin ssdts (16/255 cpus) Jes Sorensen - SMBIOS strings - Not really a patch, but Jes wants to rework smbios oem ids

2 1

Added ACPI SLIC table
by Arseny Klimovsky June 22, 2010

June 22, 2010

Hello, in some cases Microsoft OEM licence can be used in virtual machine legally. http://www.microsoft.com/windowsserver2008/en/us/licensing-datacenter.aspx For Windows 7 it is not clear, but possibly it is legal. To make in technically possible, one should use its ACPI SLIC table from original BIOS in virtual BIOS. I've created a patch for some versions (including latest stable), it can be easily cherry-picked in master. http://gitorious.org/seabios/seabios Of course, the patch does not include this SLIC table, only a code and place to put it. Coreboot project have such support (at least for some motherboards). -- Klimovsky Arseny

4 5

Re: [SeaBIOS] [PATCH 4/8] seabios: pciinit: make pci bar assigner preferchable memory aware.
by Kevin O'Connor June 22, 2010

June 22, 2010

On Thu, Jun 17, 2010 at 08:03:12PM +0900, Isaku Yamahata wrote: > Make pci bar assigner preferchable memory aware. > This is needed for PCI bridge support because memory space and > prefetchable memory space is filtered independently based on > memory base/limit and prefetchable memory base/limit of pci bridge. > On bus 0, such a distinction isn't necessary so keep existing behavior > by checking bus=0. [...] > pci_bios_io_addr = 0xc000; > pci_bios_mem_addr = BUILD_PCIMEM_START; > > + /* pci_bios_mem_addr + <some value> */ > + pci_bios_prefmem_addr = pci_bios_mem_addr + 0x08000000; How can we be sure that the "mem" space doesn't overlap with the "prefmem" space? -Kevin

2 2

[PATCH] seabios: acpi: allow qemu to load dsdt as external acpi table.
by Isaku Yamahata June 22, 2010

June 22, 2010

allow qemu to load dsdt as external acpi table. Signed-off-by: Isaku Yamahata <yamahata(a)valinux.co.jp> --- src/acpi.c | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git a/src/acpi.c b/src/acpi.c index 0559443..254e43b 100644 --- a/src/acpi.c +++ b/src/acpi.c @@ -126,6 +126,11 @@ struct fadt_descriptor_rev1 } PACKED; /* + * Differentiated System Descrition Table (DSDT) + */ +#define DSDT_SIGNATURE 0x54445344 // DSDT + +/* * MADT values and structures */ @@ -280,6 +285,11 @@ static inline u32 cpu_to_le32(u32 x) return x; } +static inline u32 le32_to_cpu(u32 x) +{ + return x; +} + static void build_header(struct acpi_table_header *h, u32 sig, int len, u8 rev) { @@ -634,7 +644,8 @@ acpi_bios_init(void) } while(0) // Add tables - ACPI_INIT_TABLE(build_fadt(bdf)); + struct fadt_descriptor_rev1 *fadt = build_fadt(bdf); + ACPI_INIT_TABLE(fadt); ACPI_INIT_TABLE(build_ssdt()); ACPI_INIT_TABLE(build_madt()); ACPI_INIT_TABLE(build_hpet()); @@ -649,7 +660,19 @@ acpi_bios_init(void) warn_noalloc(); continue; } - ACPI_INIT_TABLE(qemu_cfg_next_acpi_table_load(addr, len)); + struct acpi_table_header *header = + qemu_cfg_next_acpi_table_load(addr, len); + if (header->signature == DSDT_SIGNATURE) { + if (fadt) { + free((void*)le32_to_cpu(fadt->dsdt)); + fadt->dsdt = cpu_to_le32((u32)addr); + fadt->checksum -= checksum(fadt, sizeof(*fadt)); + header->checksum -= checksum(header, len); + dprintf(1, "ACPI DSDT=%p\n", addr); + } + } else { + ACPI_INIT_TABLE(header); + } if (tbl_idx == MAX_ACPI_TABLES) { warn_noalloc(); break; -- 1.6.6.1

2 1

Re: [SeaBIOS] [PATCH 8/8] seabios: pciinit: initialize pci bridge filtering registers.
by Kevin O'Connor June 22, 2010

June 22, 2010

On Thu, Jun 17, 2010 at 08:03:16PM +0900, Isaku Yamahata wrote: > initialize pci bridge filtering registers. [...] > +static void pci_bios_init_device_bridge(u16 bdf) > +{ > + u32 io_old; > + u32 mem_old; > + u32 prefmem_old; It would be preferable if C99 initializations were used here - especially since there are already C99 declarations introduced later in this function. BTW, my other comments/questions aside, the patch series looks good to me. -Kevin

1 0

Re: [SeaBIOS] [PATCH 1/8] seabios: pci: introduce foreachpci_in_bus() helper macro.
by Kevin O'Connor June 22, 2010

June 22, 2010

On Thu, Jun 17, 2010 at 08:03:09PM +0900, Isaku Yamahata wrote: > This patch introduces foreachpci_in_bus() helper macro for > depth first recursion. foreachpci() is for width first recursion. > The macro will be used later to initialize pci bridge > that requires depth first recursion. Instead of introducing pci_next_in_bus(), can't we just use the existing pci_next() call? Something like: #define foreachpci_in_bus(BDF, MAX, BUS) \ for (MAX=(BUS + 0x0100), BDF = BUS \ ; BDF >= 0 && BDF < (BUS + 0x0100) \ ; BDF = pci_next(BDF+1, &MAX)) -Kevin

1 0

Re: [SeaBIOS] [PATCH] KVM vcpu hotplug seabios infrastructure
by Isaku Yamahata June 21, 2010

June 21, 2010

Hi Jison. Can you check the changeset of 12cbb43b9dc8a16f712188cb308a0eb0321f3e20 and update Makefile changes? The rule for acpi-ssdt-15.hex and acpi-ssdt-anycpu.hex seems same, so it can be combined into a single generic rule. The rules removes the files at the last, but it would be more reliable to use Makefile intermediate and let make to remove them automatically. On Sun, Jun 20, 2010 at 11:40:02PM +0800, Liu, Jinsong wrote: > Kevin O'Connor wrote: > > On Wed, Jun 16, 2010 at 12:19:24PM +0800, Liu, Jinsong wrote: > >> Gleb Natapov wrote: > >>> FWIW looks good to me. This patch removes dynamic creation of > >>> Processor scope and supports only 15/255 cpus configuration, but > >>> given that new code is much more complex that old one I don't see > >>> other possibilities (unless we'll add aml compiler to seabios > >>> runtime). > >>> > > > > > I'm okay with the approach (two SSDTs selected by cpu count). The > > build changes don't look right (15.c is too cryptic). However, more > > importantly, I want to see where we end up going with the qemu/seabios > > acpi interface discussion before committing this. > > > > -Kevin > > > Kevin, > > Thanks for comments! > > In your last comments, you prefer not to use iasl to compile seabios. > Now I update the patch as attached (only need update Makefile): > 1. cancel cryptic name like 15.c from Makefile, and we give detailed description for cpu number in new version; > 2. user don't need iasl again to compile seabios, except if they want to change dsdt/ssdt itself; > > The process to apply patch and build in my desktop is: > $ git apply kvm-vcpu-hotplug-seabios.patch > $ git add src/acpi-ssdt.dsl > $ git add src/mk_ssdt.c > $ git add src/acpi-ssdt-15.hex > $ git add src/acpi-ssdt-anycpu.hex > $ git commit -a > $ make > > We test the updated patch, it works OK with linux2.6.32 hot-add and hot-remove. > > Thanks, > Jinsong > _______________________________________________ > SeaBIOS mailing list > SeaBIOS(a)seabios.org > http://www.seabios.org/mailman/listinfo/seabios -- yamahata

2 2

Re: [SeaBIOS] [PATCH] KVM vcpu hotplug seabios infrastructure
by Peter Stuge June 20, 2010

June 20, 2010

Liu, Jinsong wrote: > In our patch, how about use iasl (ssdt build rules) in Makefile, > and I will build ssdt in my local server, and then send the compile > result to you which contain acpi-ssdt[] aml array I don't think that makes sense. The source code will still be under some version control so it seems much better to simply keep it in the same project as all the other source code that is related. //Peter

2 1

Re: [SeaBIOS] [PATCH] KVM vcpu hotplug seabios infrastructure
by Kevin O'Connor June 20, 2010

June 20, 2010

On Wed, Jun 16, 2010 at 12:19:24PM +0800, Liu, Jinsong wrote: > Gleb Natapov wrote: > > FWIW looks good to me. This patch removes dynamic creation of > > Processor scope and supports only 15/255 cpus configuration, but > > given that new code is much more complex that old one I don't see > > other possibilities (unless we'll add aml compiler to seabios > > runtime). > > > > Thanks Gleb for comments! > > Kevin, what's your comments? I'm okay with the approach (two SSDTs selected by cpu count). The build changes don't look right (15.c is too cryptic). However, more importantly, I want to see where we end up going with the qemu/seabios acpi interface discussion before committing this. -Kevin

2 1

[PATCH 0/8] seabios: pci: multi pci bus support
by Isaku Yamahata June 18, 2010

June 18, 2010

This patch set allows seabios to initialize multi pci bus and 64bit BAR. Currently seabios is able to initialize only pci root bus. However multi pci bus support is wanted because - more pci bus is wanted in qemu for many slots - pci express support is commin in qemu which requires multi pci bus. those patches on Qemu part are under way, though. Isaku Yamahata (8): seabios: pci: introduce foreachpci_in_bus() helper macro. seabios: pciinit: factor out pci bar region allocation logic. seabios: pciinit: make pci memory space assignment 64bit aware. seabios: pciinit: make pci bar assigner preferchable memory aware. seabios: pciinit: factor out bar offset calculation. seabios: pciinit: make bar offset calculation pci bridge aware. seabios: pciinit: pci bridge bus initialization. seabios: pciinit: initialize pci bridge filtering registers. src/pci.c | 30 ++++++ src/pci.h | 11 ++ src/pciinit.c | 310 ++++++++++++++++++++++++++++++++++++++++++++++++-------- 3 files changed, 306 insertions(+), 45 deletions(-)

3 14

[PATCHv2] load hpet info for HPET ACPI table from qemu
by Gleb Natapov June 17, 2010

June 17, 2010

Load hpet info for HPET ACPI table from qemu instead of using hardcoded values. Use hardcoded values anyway if old qemu is detected. Signed-off-by: Gleb Natapov <gleb(a)redhat.com> diff --git a/src/acpi.c b/src/acpi.c index 0559443..864f1a8 100644 --- a/src/acpi.c +++ b/src/acpi.c @@ -469,7 +469,7 @@ build_ssdt(void) #define HPET_SIGNATURE 0x54455048 //HPET static void* -build_hpet(void) +build_hpet(struct hpet_fw_entry *e, u8 id) { struct acpi_20_hpet *hpet = malloc_high(sizeof(*hpet)); if (!hpet) { @@ -478,11 +478,11 @@ build_hpet(void) } memset(hpet, 0, sizeof(*hpet)); - /* Note timer_block_id value must be kept in sync with value advertised by - * emulated hpet - */ - hpet->timer_block_id = cpu_to_le32(0x8086a201); - hpet->addr.address = cpu_to_le32(ACPI_HPET_ADDRESS); + hpet->timer_block_id = cpu_to_le32(e->event_timer_block_id); + hpet->addr.address = cpu_to_le32(e->address); + hpet->min_tick = cpu_to_le32(e->min_tick); + hpet->hpet_number = id; + hpet->page_protect = e->page_prot; build_header((void*)hpet, HPET_SIGNATURE, sizeof(*hpet), 1); return hpet; @@ -637,9 +637,27 @@ acpi_bios_init(void) ACPI_INIT_TABLE(build_fadt(bdf)); ACPI_INIT_TABLE(build_ssdt()); ACPI_INIT_TABLE(build_madt()); - ACPI_INIT_TABLE(build_hpet()); ACPI_INIT_TABLE(build_srat()); + u8 hpet_id, c = qemu_cfg_hpet_entries(); + struct hpet_fw_entry e; + + if (c == ~0) { + /* qemu do not provide hpet description */ + e.event_timer_block_id = 0x8086a201; + e.address = ACPI_HPET_ADDRESS; + e.min_tick = 0; + c = 1; + } else if (c != 0) + qemu_cfg_hpet_load_next(&e); + + while (c--) { + ACPI_INIT_TABLE(build_hpet(&e, hpet_id++)); + if (c) + qemu_cfg_hpet_load_next(&e); + } + + u16 i, external_tables = qemu_cfg_acpi_additional_tables(); for(i = 0; i < external_tables; i++) { diff --git a/src/paravirt.c b/src/paravirt.c index 5c77b5c..458ab08 100644 --- a/src/paravirt.c +++ b/src/paravirt.c @@ -149,6 +149,23 @@ void* qemu_cfg_e820_load_next(void *addr) return addr; } +u8 qemu_cfg_hpet_entries(void) +{ + u8 cnt; + + if (!qemu_cfg_present) + return 0; + + /* read valid flags */ + qemu_cfg_read_entry(&cnt, QEMU_CFG_HPET, sizeof(cnt)); + return cnt; +} + +void qemu_cfg_hpet_load_next(struct hpet_fw_entry *e) +{ + qemu_cfg_read((u8*)e, sizeof(*e)); +} + struct smbios_header { u16 length; u8 type; diff --git a/src/paravirt.h b/src/paravirt.h index c46418f..272af81 100644 --- a/src/paravirt.h +++ b/src/paravirt.h @@ -37,6 +37,7 @@ static inline int kvm_para_available(void) #define QEMU_CFG_SMBIOS_ENTRIES (QEMU_CFG_ARCH_LOCAL + 1) #define QEMU_CFG_IRQ0_OVERRIDE (QEMU_CFG_ARCH_LOCAL + 2) #define QEMU_CFG_E820_TABLE (QEMU_CFG_ARCH_LOCAL + 3) +#define QEMU_CFG_HPET (QEMU_CFG_ARCH_LOCAL + 4) extern int qemu_cfg_present; @@ -68,10 +69,20 @@ struct e820_reservation { u32 type; }; +struct hpet_fw_entry +{ + u32 event_timer_block_id; + u64 address; + u16 min_tick; + u8 page_prot; +} __attribute__ ((packed)); + u16 qemu_cfg_first_file(QemuCfgFile *entry); u16 qemu_cfg_next_file(QemuCfgFile *entry); u32 qemu_cfg_read_file(QemuCfgFile *entry, void *dst, u32 maxlen); u32 qemu_cfg_e820_entries(void); void* qemu_cfg_e820_load_next(void *addr); +u8 qemu_cfg_hpet_entries(void); +void qemu_cfg_hpet_load_next(struct hpet_fw_entry *e); #endif -- Gleb.

7 22

[PATCH] SeaBIOS: Fix bvprintf() to respect padding for hex printing.
by Jes.Sorensen＠redhat.com June 17, 2010

June 17, 2010

From: Jes Sorensen <Jes.Sorensen(a)redhat.com> Fix bvprintf to respect space padding when printing hex numbers and the caller specifies alignment without zero padding, eg. %2x as opposed to %02x Signed-off-by: Jes Sorensen <Jes.Sorensen(a)redhat.com> --- src/output.c | 27 +++++++++++++++++++++------ 1 files changed, 21 insertions(+), 6 deletions(-) diff --git a/src/output.c b/src/output.c index 3de565a..a0d07e3 100644 --- a/src/output.c +++ b/src/output.c @@ -195,7 +195,7 @@ putsinglehex(struct putcinfo *action, u32 val) // Output an integer in hexadecimal. static void -puthex(struct putcinfo *action, u32 val, int width) +puthex(struct putcinfo *action, u32 val, int width, int spacepad) { if (!width) { u32 tmp = val; @@ -210,6 +210,17 @@ puthex(struct putcinfo *action, u32 val, int width) } if (tmp > 0xf) width += 1; + } else if (spacepad) { + int count = 1; + u32 tmp = val; + while (tmp >>= 4) { + count++; + } + count = width - count; + width -= count; + while (count--) { + putc(action, ' '); + } } switch (width) { @@ -244,11 +255,15 @@ bvprintf(struct putcinfo *action, const char *fmt, va_list args) } const char *n = s+1; int field_width = 0; + int spacepad = 1; for (;;) { c = GET_GLOBAL(*(u8*)n); if (!isdigit(c)) break; - field_width = field_width * 10 + c - '0'; + if (!field_width && (c == '0')) + spacepad = 0; + else + field_width = field_width * 10 + c - '0'; n++; } if (c == 'l') { @@ -281,7 +296,7 @@ bvprintf(struct putcinfo *action, const char *fmt, va_list args) field_width = 8; case 'x': val = va_arg(args, s32); - puthex(action, val, field_width); + puthex(action, val, field_width, spacepad); break; case 'c': val = va_arg(args, int); @@ -333,7 +348,7 @@ __dprintf(const char *fmt, ...) if (cur != &MainThread) { // Show "thread id" for this debug message. putc_debug(&debuginfo, '|'); - puthex(&debuginfo, (u32)cur, 8); + puthex(&debuginfo, (u32)cur, 8, 0); putc_debug(&debuginfo, '|'); putc_debug(&debuginfo, ' '); } @@ -411,12 +426,12 @@ hexdump(const void *d, int len) while (len > 0) { if (count % 8 == 0) { putc(&debuginfo, '\n'); - puthex(&debuginfo, count*4, 8); + puthex(&debuginfo, count*4, 8, 0); putc(&debuginfo, ':'); } else { putc(&debuginfo, ' '); } - puthex(&debuginfo, *(u32*)d, 8); + puthex(&debuginfo, *(u32*)d, 8, 0); count++; len-=4; d+=4; -- 1.6.5.2

3 2

Re: [SeaBIOS] [PATCH] KVM vcpu hotplug seabios infrastructure
by Gleb Natapov June 16, 2010

June 16, 2010

On Wed, Jun 09, 2010 at 10:01:47PM +0800, Liu, Jinsong wrote: > Gleb Natapov wrote: > > On Wed, Jun 09, 2010 at 09:20:07PM +0800, Liu, Jinsong wrote: > >> Which patch do you use? > >> I have send 2 patches before: > >> 1st patch is mis-send test patch which need manually build, > >> 2nd is updated patch to fix makefile issue, as attached email. > >> > > The patch you attached now compiles for me. Thanks. > > Kevin, Gleb, and All > > Currently KVM vcpu hotplug patch status is, > 1). works OK with Linux 2.6.32 (hot-add and hot-remove); > 2). works OK with Windows 2008 datacenter (hot-add); > FWIW looks good to me. This patch removes dynamic creation of Processor scope and supports only 15/255 cpus configuration, but given that new code is much more complex that old one I don't see other possibilities (unless we'll add aml compiler to seabios runtime). > As for iasl, I notice that current Makefile use iasl at dsdt build rules. I understand for user it seldom used if no change dsdt. > In our patch, how about use iasl (ssdt build rules) in Makefile, and I will build ssdt in my local server, and then send the compile result to you which contain acpi-ssdt[] aml array (that will be a big size patch)? We provide user a full built bios.bin and user don't need run 'iasl' when Makefile. > > Thanks, > Jinsong -- Gleb.

2 1

[PATCH] acpi: add option, load_header, to -acpitable in order to load acpi header.
by Isaku Yamahata June 15, 2010

June 15, 2010

This patch adds load_header option to -acpitable in order to load acpi table which includes acpi header. With this option and with seabios patches, alternative dsdt table can be passed to BIOS. Also fix potential buffer overflow. There is no guarantee that file size remains same when loading. Signed-off-by: Isaku Yamahata <yamahata(a)valinux.co.jp> --- hw/acpi.c | 43 +++++++++++++++++++++++++++++++++---------- qemu-options.hx | 2 ++ 2 files changed, 35 insertions(+), 10 deletions(-) diff --git a/hw/acpi.c b/hw/acpi.c index c7044b1..682f4c7 100644 --- a/hw/acpi.c +++ b/hw/acpi.c @@ -47,11 +47,25 @@ static int acpi_checksum(const uint8_t *data, int len) int acpi_table_add(const char *t) { static const char *dfl_id = "QEMUQEMU"; + int load_header = 0; char buf[1024], *p, *f; struct acpi_table_header acpi_hdr; + uint32_t length; + struct acpi_table_header *acpi_hdr_p; unsigned long val; size_t off; + if (strncmp(t, "load_header", strlen("load_header")) == 0) { + /* the files includes acpi header to load. + * the acpi header options, sig, rev, ... will be ignored. + */ + load_header = 1; + t += strlen("load_header"); + if (*t == ',') { + t++; + } + } + memset(&acpi_hdr, 0, sizeof(acpi_hdr)); if (get_param_value(buf, sizeof(buf), "sig", t)) { @@ -108,7 +122,10 @@ int acpi_table_add(const char *t) buf[0] = '\0'; } - acpi_hdr.length = sizeof(acpi_hdr); + length = sizeof(acpi_hdr); + if (load_header) { + length = 0; + } f = buf; while (buf[0]) { @@ -120,7 +137,7 @@ int acpi_table_add(const char *t) fprintf(stderr, "Can't stat file '%s': %s\n", f, strerror(errno)); goto out; } - acpi_hdr.length += s.st_size; + length += s.st_size; if (!n) break; *n = ':'; @@ -131,15 +148,19 @@ int acpi_table_add(const char *t) acpi_tables_len = sizeof(uint16_t); acpi_tables = qemu_mallocz(acpi_tables_len); } + acpi_tables = qemu_realloc(acpi_tables, + acpi_tables_len + sizeof(uint16_t) + length); p = acpi_tables + acpi_tables_len; - acpi_tables_len += sizeof(uint16_t) + acpi_hdr.length; - acpi_tables = qemu_realloc(acpi_tables, acpi_tables_len); + acpi_tables_len += sizeof(uint16_t) + length; - acpi_hdr.length = cpu_to_le32(acpi_hdr.length); - *(uint16_t*)p = acpi_hdr.length; + *(uint16_t*)p = cpu_to_le32(length); p += sizeof(uint16_t); - memcpy(p, &acpi_hdr, sizeof(acpi_hdr)); - off = sizeof(acpi_hdr); + if (load_header) { + off = 0; + } else { + off = sizeof(acpi_hdr); + memcpy(p, &acpi_hdr, sizeof(acpi_hdr)); + } f = buf; while (buf[0]) { @@ -167,7 +188,7 @@ int acpi_table_add(const char *t) close(fd); goto out; } - } while(s.st_size); + } while(s.st_size && off < length); close(fd); if (!n) @@ -175,7 +196,9 @@ int acpi_table_add(const char *t) f = n + 1; } - ((struct acpi_table_header*)p)->checksum = acpi_checksum((uint8_t*)p, off); + acpi_hdr_p = (struct acpi_table_header*)p; + acpi_hdr_p->length = cpu_to_le32(length); + acpi_hdr_p->checksum = acpi_checksum((uint8_t*)p, off); /* increase number of tables */ (*(uint16_t*)acpi_tables) = cpu_to_le32(le32_to_cpu(*(uint16_t*)acpi_tables) + 1); diff --git a/qemu-options.hx b/qemu-options.hx index a6928b7..cbb68ba 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -900,9 +900,11 @@ ETEXI DEF("acpitable", HAS_ARG, QEMU_OPTION_acpitable, "-acpitable [sig=str][,rev=n][,oem_id=str][,oem_table_id=str][,oem_rev=n][,asl_compiler_id=str][,asl_compiler_rev=n][,data=file1[:file2]...]\n" + "-acpitable [load_header][,data=file1[:file2]...]\n" " ACPI table description\n", QEMU_ARCH_I386) STEXI @item -acpitable [sig=@var{str}][,rev=@var{n}][,oem_id=@var{str}][,oem_table_id=@var{str}][,oem_rev=@var{n}] [,asl_compiler_id=@var{str}][,asl_compiler_rev=@var{n}][,data=@var{file1}[:@var{file2}]...] +@item -acpitable [load_header][,data=@var{file1}[:@var{file2}]...] @findex -acpitable Add ACPI table with specified header fields and context from specified files. ETEXI -- 1.6.6.1

1 0

[PATCH] Unify optionrom cbfs/qemu_cfg rom pulling code.
by Kevin O'Connor June 14, 2010

June 14, 2010

Make the qemu_cfg optionrom extraction code use an interface more similar to the cbfs file interface. Introduce a set of "romfile_" wrappers that select between cbfs and qemu cfg interface. Use these new wrappers in the optionrom code. --- src/coreboot.c | 15 +-------------- src/optionroms.c | 42 ++++++++++++------------------------------ src/paravirt.c | 48 +++++++++++++++++++++++++++++------------------- src/paravirt.h | 24 +++++++++++++++++++++--- src/util.h | 3 +-- 5 files changed, 64 insertions(+), 68 deletions(-) diff --git a/src/coreboot.c b/src/coreboot.c index 883834c..5d9a101 100644 --- a/src/coreboot.c +++ b/src/coreboot.c @@ -459,7 +459,7 @@ cbfs_findprefix(const char *prefix, struct cbfs_file *last) } // Find a file with the given filename (possibly with ".lzma" extension). -static struct cbfs_file * +struct cbfs_file * cbfs_finddatafile(const char *fname) { int fnlen = strlen(fname); @@ -531,19 +531,6 @@ cbfs_copyfile(struct cbfs_file *file, void *dst, u32 maxlen) return size; } -// Find and copy the optionrom for the given vendor/device id. -int -cbfs_copy_optionrom(void *dst, u32 maxlen, u32 vendev) -{ - if (!CONFIG_COREBOOT || !CONFIG_COREBOOT_FLASH) - return -1; - - char fname[17]; - snprintf(fname, sizeof(fname), "pci%04x,%04x.rom" - , (u16)vendev, vendev >> 16); - return cbfs_copyfile(cbfs_finddatafile(fname), dst, maxlen); -} - struct cbfs_payload_segment { u32 type; u32 compression; diff --git a/src/optionroms.c b/src/optionroms.c index f144d83..0b0f396 100644 --- a/src/optionroms.c +++ b/src/optionroms.c @@ -227,47 +227,31 @@ lookup_hardcode(u32 vendev) && ((OPTIONROM_VENDEV_2 >> 16) | ((OPTIONROM_VENDEV_2 & 0xffff)) << 16) == vendev) return copy_rom((void*)OPTIONROM_MEM_2); - int ret = cbfs_copy_optionrom((void*)RomEnd, max_rom() - RomEnd, vendev); - if (ret < 0) + char fname[17]; + snprintf(fname, sizeof(fname), "pci%04x,%04x.rom" + , pci_vd_to_ven(vendev), pci_vd_to_dev(vendev)); + int ret = romfile_copy(romfile_find(fname), (void*)RomEnd + , max_rom() - RomEnd); + if (ret <= 0) return NULL; return (void*)RomEnd; } // Run all roms in a given CBFS directory. static void -run_cbfs_roms(const char *prefix, int isvga) +run_file_roms(const char *prefix, int isvga) { - struct cbfs_file *file = NULL; + u32 file = 0; for (;;) { - file = cbfs_findprefix(prefix, file); + file = romfile_findprefix(prefix, file); if (!file) break; - int ret = cbfs_copyfile(file, (void*)RomEnd, max_rom() - RomEnd); + int ret = romfile_copy(file, (void*)RomEnd, max_rom() - RomEnd); if (ret > 0) init_optionrom((void*)RomEnd, 0, isvga); } } -static void -run_qemu_roms(const char *prefix, int isvga) -{ - struct QemuCfgFile entry; - int plen = strlen(prefix); - int rc, dlen; - - rc = qemu_cfg_first_file(&entry); - while (rc > 0) { - if (memcmp(prefix, entry.name, plen) == 0) { - dlen = qemu_cfg_read_file(&entry, (void*)RomEnd, max_rom() - RomEnd); - if (dlen > 0) { - dprintf(1, "init qemu rom: %s\n", entry.name); - init_optionrom((void*)RomEnd, 0, isvga); - } - } - rc = qemu_cfg_next_file(&entry); - } -} - /**************************************************************** * PCI roms @@ -397,8 +381,7 @@ optionrom_setup(void) } // Find and deploy CBFS roms not associated with a device. - run_cbfs_roms("genroms/", 0); - run_qemu_roms("genroms/", 0); + run_file_roms("genroms/", 0); } // All option roms found and deployed - now build BEV/BCV vectors. @@ -457,8 +440,7 @@ vga_setup(void) init_pcirom(bdf, 1); // Find and deploy CBFS vga-style roms not associated with a device. - run_cbfs_roms("vgaroms/", 1); - run_qemu_roms("vgaroms/", 1); + run_file_roms("vgaroms/", 1); } if (RomEnd == BUILD_ROM_START) { diff --git a/src/paravirt.c b/src/paravirt.c index 5c77b5c..00ff58c 100644 --- a/src/paravirt.c +++ b/src/paravirt.c @@ -306,38 +306,48 @@ u16 qemu_cfg_get_max_cpus(void) return cnt; } -u16 qemu_cfg_first_file(QemuCfgFile *entry) -{ - memset(entry, 0, sizeof(*entry)); - return qemu_cfg_next_file(entry); -} +static QemuCfgFile LastFile; -u16 qemu_cfg_next_file(QemuCfgFile *entry) +static u32 +__cfg_next_prefix_file(const char *prefix, int prefixlen, u32 prevselect) { - u16 last = ntohs(entry->select); - u32 e,count; - if (!qemu_cfg_present) return 0; + u32 count; qemu_cfg_read_entry(&count, QEMU_CFG_FILE_DIR, sizeof(count)); - for (e = 0; e < ntohl(count); e++) { - qemu_cfg_read((void*)entry, sizeof(*entry)); - if (ntohs(entry->select) > last) { - return 1; - } + count = ntohl(count); + u32 e; + for (e = 0; e < count; e++) { + qemu_cfg_read((void*)&LastFile, sizeof(LastFile)); + u32 select = ntohs(LastFile.select); + if (select <= prevselect) + continue; + if (memcmp(prefix, LastFile.name, prefixlen) == 0) + return select; } return 0; } -u32 qemu_cfg_read_file(QemuCfgFile *entry, void *dst, u32 maxlen) +u32 qemu_cfg_next_prefix_file(const char *prefix, u32 prevselect) +{ + return __cfg_next_prefix_file(prefix, strlen(prefix), prevselect); +} + +u32 qemu_cfg_find_file(const char *name) { - int len = ntohl(entry->size); + return __cfg_next_prefix_file(name, strlen(name) + 1, 0); +} +int qemu_cfg_read_file(u32 select, void *dst, u32 maxlen) +{ if (!qemu_cfg_present) - return 0; + return -1; + if (!select || select != ntohs(LastFile.select)) + return -1; + int len = ntohl(LastFile.size); if (len > maxlen) - return 0; - qemu_cfg_read_entry(dst, ntohs(entry->select), len); + return -1; + qemu_cfg_read_entry(dst, select, len); return len; } diff --git a/src/paravirt.h b/src/paravirt.h index c46418f..83fe8ec 100644 --- a/src/paravirt.h +++ b/src/paravirt.h @@ -68,9 +68,27 @@ struct e820_reservation { u32 type; }; -u16 qemu_cfg_first_file(QemuCfgFile *entry); -u16 qemu_cfg_next_file(QemuCfgFile *entry); -u32 qemu_cfg_read_file(QemuCfgFile *entry, void *dst, u32 maxlen); +u32 qemu_cfg_next_prefix_file(const char *prefix, u32 prevselect); +u32 qemu_cfg_find_file(const char *name); +int qemu_cfg_read_file(u32 select, void *dst, u32 maxlen); + +// Wrappers that select cbfs or qemu_cfg file interface. +static inline u32 romfile_findprefix(const char *prefix, u32 previd) { + if (CONFIG_COREBOOT) + return (u32)cbfs_findprefix(prefix, (void*)previd); + return qemu_cfg_next_prefix_file(prefix, previd); +} +static inline u32 romfile_find(const char *name) { + if (CONFIG_COREBOOT) + return (u32)cbfs_finddatafile(name); + return qemu_cfg_find_file(name); +} +static inline int romfile_copy(u32 fileid, void *dst, u32 maxlen) { + if (CONFIG_COREBOOT) + return cbfs_copyfile((void*)fileid, dst, maxlen); + return qemu_cfg_read_file(fileid, dst, maxlen); +} + u32 qemu_cfg_e820_entries(void); void* qemu_cfg_e820_load_next(void *addr); diff --git a/src/util.h b/src/util.h index 7fd76bc..a630bc1 100644 --- a/src/util.h +++ b/src/util.h @@ -338,13 +338,12 @@ void smp_probe_setup(void); // coreboot.c struct cbfs_file; +struct cbfs_file *cbfs_finddatafile(const char *fname); struct cbfs_file *cbfs_findprefix(const char *prefix, struct cbfs_file *last); u32 cbfs_datasize(struct cbfs_file *file); const char *cbfs_filename(struct cbfs_file *file); int cbfs_copyfile(struct cbfs_file *file, void *dst, u32 maxlen); -int cbfs_copy_optionrom(void *dst, u32 maxlen, u32 vendev); void cbfs_run_payload(struct cbfs_file *file); - void coreboot_copy_biostable(void); void coreboot_setup(void); -- 1.7.0.1

1 0