SeaBIOS

seabios@seabios.org

10 participants
3770 discussions

Re: [SeaBIOS] [PATCH] KVM vcpu hotplug seabios infrastructure
by Isaku Yamahata 23 Jun '10

23 Jun '10

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 22 Jun '10

22 Jun '10

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 22 Jun '10

22 Jun '10

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 22 Jun '10

22 Jun '10

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 22 Jun '10

22 Jun '10

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 22 Jun '10

22 Jun '10

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 22 Jun '10

22 Jun '10

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 22 Jun '10

22 Jun '10

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 22 Jun '10

22 Jun '10

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 21 Jun '10

21 Jun '10

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS