SeaBIOS June 2010

seabios@seabios.org

21 participants
39 discussions

Re: [SeaBIOS] [Qemu-devel] SeaBIOS error with Juniper FreeBSD kernel

by Kevin O'Connor

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

9 years, 6 months

[PATCH] smbios: Allow all fields to be set via qemu_cfg_smbios_load_field()

by Alex Williamson

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;

10 years, 6 months

[PATCH] Bootsplash for SeaBIOS (with coreboot)

by Stefan Reinauer

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

10 years, 6 months

[PATCH v2 0/8] seabios: pci: multi pci bus support

by Isaku Yamahata

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(-)

10 years, 6 months

Re: [SeaBIOS] [PATCH] KVM vcpu hotplug seabios infrastructure

by Kevin O'Connor

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

10 years, 6 months

Re: [SeaBIOS] [PATCH] KVM vcpu hotplug seabios infrastructure

by Liu, Jinsong

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

10 years, 7 months

Re: [SeaBIOS] [PATCH] KVM vcpu hotplug seabios infrastructure

by Isaku Yamahata

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

10 years, 7 months

Re: [SeaBIOS] [PATCH] KVM vcpu hotplug seabios infrastructure

by Isaku Yamahata

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

10 years, 7 months

[PATCH 0/2] Allow acpi and smbios default strings to be set on config.h

by Eduardo Habkost

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(-)

10 years, 7 months

[PATCH v2] seabios: acpi: allow qemu to load dsdt as external acpi table.

by Isaku Yamahata

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

10 years, 7 months

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS June 2010