SeaBIOS September 2010

seabios@seabios.org

13 participants
19 discussions

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

11 Jul '11

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] support piix PAM registers in KVM
by Gleb Natapov 19 Jun '11

19 Jun '11

Without this BIOS fails to remap 0xf0000 memory from ROM to RAM so writes to F-segment modify ROM content instead of memory copy. Since QEMU does not reloads ROMs during reset on next boot modified copy of BIOS is used. Signed-off-by: Gleb Natapov <gleb(a)redhat.com> diff --git a/hw/piix_pci.c b/hw/piix_pci.c index 933ad86..0bf435d 100644 --- a/hw/piix_pci.c +++ b/hw/piix_pci.c @@ -99,10 +99,6 @@ static void i440fx_update_memory_mappings(PCII440FXState *d) int i, r; uint32_t smram, addr; - if (kvm_enabled()) { - /* FIXME: Support remappings and protection changes. */ - return; - } update_pam(d, 0xf0000, 0x100000, (d->dev.config[I440FX_PAM] >> 4) & 3); for(i = 0; i < 12; i++) { r = (d->dev.config[(i >> 1) + (I440FX_PAM + 1)] >> ((i & 1) * 4)) & 3; -- Gleb.

5 13

ohci bulk?
by Jonathan A. Kollasch 23 Nov '10

23 Nov '10

Hi, http://www.seabios.org/pipermail/seabios/2010-March/000396.html Could anyone explain what the difficulty with OHCI bulk in 16-bit mode is before I spend a few hours discovering for myself? Jonathan Kollasch

9 61

[PATCH] fix virtio-blk failure after reboot
by Gleb Natapov 13 Nov '10

13 Nov '10

vring_virtqueue should be zeroed otherwise old values will be reused after reboot. Signed-off-by: Gleb Natapov <gleb(a)redhat.com> diff --git a/src/virtio-blk.c b/src/virtio-blk.c index 34d7863..7a25826 100644 --- a/src/virtio-blk.c +++ b/src/virtio-blk.c @@ -109,6 +109,7 @@ init_virtio_blk(u16 bdf) goto fail; } memset(vdrive_g, 0, sizeof(*vdrive_g)); + memset(vq, 0, sizeof(*vq)); vdrive_g->drive.type = DTYPE_VIRTIO; vdrive_g->drive.cntl_id = bdf; vdrive_g->vq = vq; -- Gleb.

3 5

Re: [SeaBIOS] [PATCH] Allow rom to grow to 256K.
by H. Peter Anvin 27 Sep '10

27 Sep '10

On 09/25/2010 09:55 AM, Kevin O'Connor wrote: > Enable rom size to be over 128K. > > Apparently, only the first 128K of the rom are mirrored to the > 0xc0000-0xfffff area under qemu, so make sure to copy the rom (via > make_bios_writable) in the non-init part of the startup code. This > ensure the copy code is itself available. This is pretty typical... the BIOS is supposed to fit within the 0xe0000..0xfffff area during actual execution. -hpa

1 0

[PATCH] Cleanup - it's no longer necessary to manually reset global variables.
by Kevin O'Connor 25 Sep '10

25 Sep '10

Now that a soft-reboot forces a hard-reboot, it is no longer necessary to manually reset global variables. --- src/block.c | 11 ----------- src/cdrom.c | 2 -- src/clock.c | 1 - src/coreboot.c | 6 ------ src/disk.h | 1 - src/memmap.c | 7 ------- src/memmap.h | 1 - src/optionroms.c | 5 +---- src/pmm.c | 6 ------ src/post.c | 3 --- src/smp.c | 8 -------- src/stacks.c | 2 -- src/usb-hid.c | 9 --------- src/usb-hid.h | 1 - src/usb.c | 2 -- src/util.h | 1 - src/vgahooks.c | 5 ++--- 17 files changed, 3 insertions(+), 68 deletions(-) diff --git a/src/block.c b/src/block.c index b6b1902..3f4b13f 100644 --- a/src/block.c +++ b/src/block.c @@ -329,14 +329,3 @@ send_disk_op(struct disk_op_s *op) return stack_hop((u32)op, GET_SEG(SS), __send_disk_op); } - - -/**************************************************************** - * Setup - ****************************************************************/ - -void -drive_setup(void) -{ - memset(&Drives, 0, sizeof(Drives)); -} diff --git a/src/cdrom.c b/src/cdrom.c index 655ee00..349e401 100644 --- a/src/cdrom.c +++ b/src/cdrom.c @@ -109,8 +109,6 @@ cdemu_setup(void) { if (!CONFIG_CDROM_EMU) return; - cdemu_drive_gf = NULL; - cdemu_buf_fl = NULL; if (!Drives.cdcount) return; diff --git a/src/clock.c b/src/clock.c index f6a43e9..fcdc698 100644 --- a/src/clock.c +++ b/src/clock.c @@ -211,7 +211,6 @@ timer_setup(void) u32 ticks = (hours * 60 + minutes) * 60 + seconds; ticks = ((u64)ticks * PIT_TICK_RATE) / PIT_TICK_INTERVAL; SET_BDA(timer_counter, ticks); - SET_BDA(timer_rollover, 0); enable_hwirq(0, FUNC16(entry_08)); enable_hwirq(8, FUNC16(entry_70)); diff --git a/src/coreboot.c b/src/coreboot.c index db0063b..50d300c 100644 --- a/src/coreboot.c +++ b/src/coreboot.c @@ -126,8 +126,6 @@ coreboot_fill_map(void) { dprintf(3, "Attempting to find coreboot table\n"); - CBMemTable = NULL; - // Find coreboot table. struct cb_header *cbh = find_cb_header(0, 0x1000); if (!cbh) @@ -290,10 +288,6 @@ coreboot_copy_biostable(void) dprintf(3, "Relocating coreboot bios tables\n"); - // Init variables set in coreboot table memory scan. - PirOffset = 0; - RsdpAddr = 0; - // Scan CB_MEM_TABLE areas for bios tables. int i, count = MEM_RANGE_COUNT(cbm); for (i=0; i<count; i++) { diff --git a/src/disk.h b/src/disk.h index 9e5b083..55a5da3 100644 --- a/src/disk.h +++ b/src/disk.h @@ -234,7 +234,6 @@ void map_hd_drive(struct drive_s *drive_g); void map_cd_drive(struct drive_s *drive_g); int process_op(struct disk_op_s *op); int send_disk_op(struct disk_op_s *op); -void drive_setup(void); // floppy.c extern struct floppy_ext_dbt_s diskette_param_table2; diff --git a/src/memmap.c b/src/memmap.c index 84bc4fa..ea05953 100644 --- a/src/memmap.c +++ b/src/memmap.c @@ -119,13 +119,6 @@ add_e820(u64 start, u64 size, u32 type) //dump_map(); } -// Prep for memmap stuff - init bios table locations. -void -memmap_setup(void) -{ - e820_count = 0; -} - // Report on final memory locations. void memmap_finalize(void) diff --git a/src/memmap.h b/src/memmap.h index d4154c1..01c7ddb 100644 --- a/src/memmap.h +++ b/src/memmap.h @@ -17,7 +17,6 @@ struct e820entry { }; void add_e820(u64 start, u64 size, u32 type); -void memmap_setup(void); void memmap_finalize(void); // A typical OS page size diff --git a/src/optionroms.c b/src/optionroms.c index ceb4060..854c33f 100644 --- a/src/optionroms.c +++ b/src/optionroms.c @@ -72,7 +72,7 @@ struct pnp_data { #define PCIROM_CODETYPE_X86 0 // The end of the last deployed rom. -u32 RomEnd; +u32 RomEnd = BUILD_ROM_START; /**************************************************************** @@ -423,9 +423,6 @@ optionrom_setup(void) void vga_setup(void) { - VGAbdf = -1; - RomEnd = BUILD_ROM_START; - if (! CONFIG_OPTIONROMS) return; diff --git a/src/pmm.c b/src/pmm.c index bb90ff0..e0770ac 100644 --- a/src/pmm.c +++ b/src/pmm.c @@ -193,12 +193,6 @@ malloc_setup(void) ASSERT32FLAT(); dprintf(3, "malloc setup\n"); - ZoneLow.info = ZoneHigh.info = ZoneFSeg.info = NULL; - ZoneTmpLow.info = ZoneTmpHigh.info = NULL; - - // Clear memory in 0xf0000 area. - memset(BiosTableSpace, 0, CONFIG_MAX_BIOSTABLE); - // Populate temp high ram u32 highram = 0; int i; diff --git a/src/post.c b/src/post.c index a72b8cd..4e42731 100644 --- a/src/post.c +++ b/src/post.c @@ -211,7 +211,6 @@ maininit(void) mathcp_setup(); // Initialize mtrr - smp_probe_setup(); mtrr_setup(); // Initialize pci @@ -220,7 +219,6 @@ maininit(void) // Initialize internal tables boot_setup(); - drive_setup(); // Start hardware initialization (if optionrom threading) if (CONFIG_THREADS && CONFIG_THREAD_OPTIONROMS) @@ -327,7 +325,6 @@ void VISIBLE32INIT post(void) { // Detect ram and setup internal malloc. - memmap_setup(); qemu_cfg_port_probe(); ram_probe(); malloc_setup(); diff --git a/src/smp.c b/src/smp.c index 38e117e..40f5451 100644 --- a/src/smp.c +++ b/src/smp.c @@ -127,11 +127,3 @@ smp_probe(void) dprintf(1, "Found %d cpu(s) max supported %d cpu(s)\n", readl(&CountCPUs), MaxCountCPUs); } - -// Reset variables to zero -void -smp_probe_setup(void) -{ - CountCPUs = 0; - smp_mtrr_count = 0; -} diff --git a/src/stacks.c b/src/stacks.c index dade3af..d541a4f 100644 --- a/src/stacks.c +++ b/src/stacks.c @@ -195,8 +195,6 @@ thread_setup(void) { MainThread.next = &MainThread; MainThread.pprev = &MainThread.next; - MainThread.stackpos = NULL; - CanPreempt = 0; } // Return the 'struct thread_info' for the currently running thread. diff --git a/src/usb-hid.c b/src/usb-hid.c index b88d684..168b7fa 100644 --- a/src/usb-hid.c +++ b/src/usb-hid.c @@ -130,15 +130,6 @@ usb_hid_init(struct usb_pipe *pipe return -1; } -void -usb_hid_setup(void) -{ - if (CONFIG_USB_KEYBOARD) - keyboard_pipe = NULL; - if (CONFIG_USB_MOUSE) - mouse_pipe = NULL; -} - /**************************************************************** * Keyboard events diff --git a/src/usb-hid.h b/src/usb-hid.h index d8199b9..7fbcf4b 100644 --- a/src/usb-hid.h +++ b/src/usb-hid.h @@ -6,7 +6,6 @@ struct usb_interface_descriptor; struct usb_pipe; int usb_hid_init(struct usb_pipe *pipe , struct usb_interface_descriptor *iface, int imax); -void usb_hid_setup(void); inline int usb_kbd_active(void); inline int usb_kbd_command(int command, u8 *param); inline int usb_mouse_active(void); diff --git a/src/usb.c b/src/usb.c index cefc5f3..aa8d72c 100644 --- a/src/usb.c +++ b/src/usb.c @@ -423,8 +423,6 @@ usb_setup(void) dprintf(3, "init usb\n"); - usb_hid_setup(); - // Look for USB controllers int ehcibdf = -1; int count = 0; diff --git a/src/util.h b/src/util.h index c27037a..1823fd4 100644 --- a/src/util.h +++ b/src/util.h @@ -358,7 +358,6 @@ extern u32 CountCPUs; extern u32 MaxCountCPUs; void wrmsr_smp(u32 index, u64 val); void smp_probe(void); -void smp_probe_setup(void); // coreboot.c struct cbfs_file; diff --git a/src/vgahooks.c b/src/vgahooks.c index 14678be..eb4dfa8 100644 --- a/src/vgahooks.c +++ b/src/vgahooks.c @@ -13,7 +13,7 @@ #include "config.h" // CONFIG_* // The Bus/Dev/Fn of the primary VGA device. -int VGAbdf VAR16VISIBLE; +int VGAbdf VAR16VISIBLE = -1; // Coreboot board detected. int CBmainboard VAR16VISIBLE; @@ -305,11 +305,10 @@ vgahook_setup(const char *vendor, const char *part) if (! CONFIG_VGAHOOKS) return; - CBmainboard = 0; for (i=0; i<(sizeof(mainboard_list) / sizeof(mainboard_list[0])); i++) { if (!strcmp(vendor, mainboard_list[i].vendor) && !strcmp(part, mainboard_list[i].device)) { - printf("Found mainboard %s %s\n", vendor, part); + printf("Found mainboard %s %s\n", vendor, part); CBmainboard = mainboard_list[i].type; break; } -- 1.7.2.3

1 0

[PATCH] Allow rom to grow to 256K.
by Kevin O'Connor 25 Sep '10

25 Sep '10

Enable rom size to be over 128K. Apparently, only the first 128K of the rom are mirrored to the 0xc0000-0xfffff area under qemu, so make sure to copy the rom (via make_bios_writable) in the non-init part of the startup code. This ensure the copy code is itself available. --- src/post.c | 13 ++++++------- tools/checkrom.py | 2 ++ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/post.c b/src/post.c index 4a75f51..a72b8cd 100644 --- a/src/post.c +++ b/src/post.c @@ -321,18 +321,11 @@ reloc_init(void) func(); } -static int HaveRunPost; - // Start of Power On Self Test (POST) - the BIOS initilization phase. // This function sets up for and attempts relocation of the init code. void VISIBLE32INIT post(void) { - // Allow writes to modify bios area (0xf0000) - make_bios_writable(); - - HaveRunPost = 1; - // Detect ram and setup internal malloc. memmap_setup(); qemu_cfg_port_probe(); @@ -347,6 +340,8 @@ post(void) * POST entry point ****************************************************************/ +static int HaveRunPost; + // Attempt to invoke a hard-reboot. static void tryReboot(void) @@ -385,6 +380,10 @@ _start(void) // This is a soft reboot - invoke a hard reboot. tryReboot(); + // Allow writes to modify bios area (0xf0000) + make_bios_writable(); + HaveRunPost = 1; + // Perform main setup code. post(); } diff --git a/tools/checkrom.py b/tools/checkrom.py index 42cf2df..6309528 100755 --- a/tools/checkrom.py +++ b/tools/checkrom.py @@ -24,6 +24,8 @@ def main(): finalsize = 64*1024 if datasize > 64*1024: finalsize = 128*1024 + if datasize > 128*1024: + finalsize = 256*1024 # Sanity checks start = symbols['code32flat_start'].offset -- 1.7.2.3

1 0

[PATCH] Fix typo preventing relocated space from being used for option roms.
by Kevin O'Connor 25 Sep '10

25 Sep '10

--- src/optionroms.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/optionroms.c b/src/optionroms.c index f26a3aa..ceb4060 100644 --- a/src/optionroms.c +++ b/src/optionroms.c @@ -171,7 +171,7 @@ get_pci_rom(struct rom_header *rom) // Return start of code in 0xc0000-0xf0000 space. static inline u32 _max_rom(void) { extern u8 code32flat_start[], code32init_end[]; - return CONFIG_RELOCATE_INIT ? (u32)code32flat_start : (u32)code32init_end; + return CONFIG_RELOCATE_INIT ? (u32)code32init_end : (u32)code32flat_start; } // Return the memory position up to which roms may be located. static inline u32 max_rom(void) { -- 1.7.2.3

1 0

Pending patch summary
by Kevin O'Connor 25 Sep '10

25 Sep '10

Patches pending: Eduard - Gabriel Munteanu: 20100828: iommu: introduce AMD IOMMU support, initialize it * Likely for post v0.6.1 release Isaku Yamahata: 20100722: acpi: allow qemu to load dsdt as external acpi table. * Needs resolution on acpi patches Isaku Yamahata: 20100819: seabios: acpi: add mcfg table. * Needs resolution on acpi patches Patches pending with author: Isaku Yamahata: 20100726: seabios: pciinit: fix overflow when bar allocation. * Isaku was looking at another approach Sebastian Herbszt: 20100731: EDD fixes * Initial patch looked like it may break backwards compatibility; I haven't seen a new patch. Patches not applied: Arseny Klimovsky: 20100621: Added ACPI SLIC table * There was no explicit patch sent, and approach (eg, recompile seabios) doesn't look scalable. Eduardo Habkost: 20100618: Allow acpi and smbios default strings to be set on config.h * Should no longer be needed now that smbios strings can be passed in via fwcfg. Christopher Gautier: 20100723: Impossible to distinguish between two '/' keys * No explicit patch sent, and I didn't understand the description. Gleb Natapov: 20100614: load hpet info for HPET ACPI table from qemu * Gleb withdrew this patch due to a bug. Concept is pending ACPI resolution. Please let me know if I've missed any thing. -Kevin

2 2

[PATCH 00/11] Relocate init code to high memory
by Kevin O'Connor 23 Sep '10

23 Sep '10

This patch series enables SeaBIOS to relocate itself out of the e-segment, which enables that space to be used by optionroms. Before this patch series, SeaBIOS would typically use about half of the e-segment. A full debugging build could use nearly all of the e-segment. With this series, SeaBIOS shouldn't need anything beyond the standard f-segment. Future features can likely be added without fear of limiting optionroms. To support relocation, the build determines which parts of the 32bit code is one-time initialization code. It separates that out and stores relocation information for it. The run-time code can then copy the initialization code to high memory and run it at that location. The one-time init code could be called again on a soft-reboot, but SeaBIOS now detects this case and attempts a hard-reboot. Unfortunately, both qemu and kvm don't appear to have a reliable way to hard-reboot - normal reboots don't reset the 0xc0000-0xfffff memory. I've worked around this on qemu by manually resetting that memory. However, kvm doesn't keep a pristine copy of the bios at 0xffff0000. Until this is fixed, this patch series will cause a soft-reboot on kvm to result in a shutdown instead of a reboot. Some details on the patches: Patches 1-4 enhance the build scripts. Patches 5-7 handle soft-reboots. Patches 8-11 enhance the runtime to support relocation. -Kevin Kevin O'Connor (11): Use str.startswith() in python scripts. Modify tools/layoutrom.py to use classes instead of tuples. Separate out init code from the rest of the 32bit flat code. Enhance build to emit relocation information. Try to hard-reboot processor on rerun of post under coreboot. Don't do shadow copying of optionroms when CONFIG_OPTIONROMS_DEPLOYED. Try to hard-reboot on rerun of post even on emulators. Add memalign_tmp() helper function. Move init code from _start() to post(). Move the 32bit init code to high memory at runtime. Enable optionroms to use freed space due to CONFIG_RELOCATE_INIT. Makefile | 6 +- src/apm.c | 14 +- src/config.h | 2 + src/ioport.h | 1 + src/optionroms.c | 18 ++- src/pci.c | 10 + src/pci.h | 1 + src/pmm.c | 8 - src/post.c | 164 +++++++++++++++--- src/ps2port.c | 16 ++- src/ps2port.h | 3 +- src/shadow.c | 40 +++-- src/stacks.c | 4 +- src/types.h | 10 +- src/util.h | 13 ++- tools/checkrom.py | 9 +- tools/checkstack.py | 14 +- tools/layoutrom.py | 465 ++++++++++++++++++++++++++++++++------------------- 18 files changed, 535 insertions(+), 263 deletions(-) -- 1.7.2.3

4 36

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS September 2010