SeaBIOS

seabios@seabios.org

3 participants
3808 discussions

[PATCH 0/8] seabios: pci: multi pci bus support
by Isaku Yamahata 18 Jun '10

18 Jun '10

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

17 Jun '10

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

17 Jun '10

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

15 Jun '10

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

14 Jun '10

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

13 Jun '10

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

[PATCH] load hpet info for HPET ACPI table from qemu
by Gleb Natapov 13 Jun '10

13 Jun '10

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..eeecca1 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,28 @@ 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 = 0; + u32 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..13a4916 100644 --- a/src/paravirt.c +++ b/src/paravirt.c @@ -149,6 +149,26 @@ void* qemu_cfg_e820_load_next(void *addr) return addr; } +u32 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)); + if (!cnt) + return ~0; + qemu_cfg_read(&cnt, 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..2fd98cc 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); +u32 qemu_cfg_hpet_entries(void); +void qemu_cfg_hpet_load_next(struct hpet_fw_entry *e); #endif -- Gleb.

1 0

[PATCH] SeaBIOS VGA hooks
by Stefan Reinauer 10 Jun '10

10 Jun '10

SeaBIOS VGA hooks for Getac P470 and Roda RK886EX notebooks -- 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

4 15

Re: [SeaBIOS] [coreboot] [PATCH] SeaBIOS CD/DVD abbreviations
by Stefan Reinauer 10 Jun '10

10 Jun '10

On 6/9/10 5:43 PM, Andrew Morgan wrote: > Just a small point, the "ROM" bit isn't really needed. The fact that > CDs are read-only is pretty much irrelevant. No other type of disk > gets -ROM or -RAM stuck on the end of it. Also some CDs aren't read > only... Good point. Updated patch attached

2 1

[PATCH] seabios: remove iasl output file when error.
by Isaku Yamahata 10 Jun '10

10 Jun '10

Surprisingly iasl creates output file even when compilation error. So typing make after an error will succeed. This patch prevents it by removing the output file when error. And adds related dependencies to compile when .hex is missing. Signed-off-by: Isaku Yamahata <yamahata(a)valinux.co.jp> --- Makefile | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 72d711d..d69c630 100644 --- a/Makefile +++ b/Makefile @@ -184,11 +184,16 @@ $(OUT)vgabios.bin: $(OUT)vgabios.bin.raw tools/buildrom.py $(Q)./tools/buildrom.py $< $@ ####### dsdt build rules -src/acpi-dsdt.hex: src/acpi-dsdt.dsl +$(OUT)%.dsl.i: src/%.dsl + $(Q)cpp -P $< > $@ + +src/%.hex: $(OUT)%.dsl.i @echo "Compiling DSDT" - $(Q)cpp -P $< > $(OUT)acpi-dsdt.dsl.i - $(Q)iasl -tc -p $@ $(OUT)acpi-dsdt.dsl.i - $(Q)rm $(OUT)acpi-dsdt.dsl.i + $(Q)iasl -tc -p $@ $< || (e=$$?; rm $@; exit $$e) + +src/acpi.c: src/acpi-dsdt.hex +$(OUT)ccode32flat.o: src/acpi.c +$(OUT)../src/acpi-dsdt.hex: src/acpi-dsdt.hex ####### Generic rules clean: -- 1.6.6.1

2 3

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS