SeaBIOS

seabios@seabios.org

4 participants
3801 discussions

Re: [SeaBIOS] [coreboot] [PATCH 1/2] Add i915 VGA test Driver.
by Denis 'GNUtoo' Carikli 02 Mar '13

02 Mar '13

On Fri, 1 Mar 2013 19:41:16 -0800 ron minnich <rminnich(a)gmail.com> wrote: > Assuming this stuff is set up in coreboot, it should not be necessary > to bring it into seabios, so I'm not sure what's going on here. > > ron > I was ask by Paul Menzel to do it(for the purpose of documentation): http://review.coreboot.org/#/c/2559/1//COMMIT_MSG Denis.

1 0

[PATCH] pci vga: Support VGA behind bridges
by Alex Williamson 01 Mar '13

01 Mar '13

We currently expect to find VGA devices on the root bus but we will also support them below bridges iff the VGA routing across the bridges is pre-configured. This patch maintains that behavior, but also enables SeaBIOS to enable VGA routing to the first VGA class device it finds when there is no preconfigured device. This allows us to support VGA devices behind root ports and bridges without special setup from QEMU. Signed-off-by: Alex Williamson <alex.williamson(a)redhat.com> --- src/optionroms.c | 46 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 40 insertions(+), 6 deletions(-) diff --git a/src/optionroms.c b/src/optionroms.c index caa2151..1c2a714 100644 --- a/src/optionroms.c +++ b/src/optionroms.c @@ -439,13 +439,47 @@ vgarom_setup(void) memset((void*)BUILD_ROM_START, 0, rom_get_max() - BUILD_ROM_START); // Find and deploy PCI VGA rom. - struct pci_device *pci; + struct pci_device *pci, *pci_vga = NULL; + // Search for devices already enabled foreachpci(pci) { - if (!is_pci_vga(pci)) - continue; - vgahook_setup(pci); - init_pcirom(pci, 1, NULL); - break; + if (is_pci_vga(pci)) { + pci_vga = pci; + break; + } + } + + // Find and enable the first VGA device + if (!pci_vga && (pci = pci_find_class(PCI_CLASS_DISPLAY_VGA)) != NULL) { + dprintf(4, "Enabling device %02x:%02x.%x for primary VGA\n", + pci_bdf_to_bus(pci->bdf), pci_bdf_to_dev(pci->bdf), + pci_bdf_to_fn(pci->bdf)); + + u16 cmd = pci_config_readw(pci->bdf, PCI_COMMAND); + cmd |= PCI_COMMAND_IO | PCI_COMMAND_MEMORY; + pci_config_writew(pci->bdf, PCI_COMMAND, cmd); + + pci_vga = pci; + + while (pci->parent) { + pci = pci->parent; + + dprintf(4, "Setting VGA enable for bridge %02x:%02x.%x\n", + pci_bdf_to_bus(pci->bdf), pci_bdf_to_dev(pci->bdf), + pci_bdf_to_fn(pci->bdf)); + + u8 ctrl = pci_config_readb(pci->bdf, PCI_BRIDGE_CONTROL); + ctrl |= PCI_BRIDGE_CTL_VGA; + pci_config_writeb(pci->bdf, PCI_BRIDGE_CONTROL, ctrl); + + u16 cmd = pci_config_readw(pci->bdf, PCI_COMMAND); + cmd |= PCI_COMMAND_IO | PCI_COMMAND_MEMORY; + pci_config_writew(pci->bdf, PCI_COMMAND, cmd); + } + } + + if (pci_vga) { + vgahook_setup(pci_vga); + init_pcirom(pci_vga, 1, NULL); } // Find and deploy CBFS vga-style roms not associated with a device.

2 2

RFC: Primary VGA
by Alex Williamson 28 Feb '13

28 Feb '13

When we start adding root ports and bridges to systems we need some concept of a primary VGA device.The differentiation of the primary device is that it's the default one that responds to the Legacy VGA address ranges. PCs often have a BIOS selection for this. Seabios already seems to have some concept of this and looks for a VGA class device for which the parent devices all have VGA routing enabled. This seems to work today if QEMU initializes VGA routing for the path it considers the primary. The first question is whether this bridge path pre-configuration is what we want to keep as the way QEMU communicates the primary VGA device to Seabios? Obviously we could switch to some kind of fwcfg interface, but I tend to think what we have is sufficient. If it is sufficient, then I think we need to rebuild that path on system reset and we need some way to specify which device to use. One option would be some kind of per PCIDevice property, perhaps "primary_vga". A downside is that users can abuse it by trying to set it for more than one device. Maybe a better approach would be to add a machine property for it, -machine primary_vga=$id. We'll also need some reasonable way to pick a default if unspecified. Does anyone have any thoughts on managing this? Thanks, Alex

5 6

Re: [SeaBIOS] [Qemu-devel] [RFC PATCH] Distinguish between reset types
by Laszlo Ersek 28 Feb '13

28 Feb '13

On 02/19/13 23:45, David Woodhouse wrote: > I'm beginning to wish I'd just ignored the fact that > we need a properly working "soft" reset to get back from 286 protected > mode to real mode, and wired up the damn PAM reset unconditionally. I'm > not convinced that the protected->real mode transition will work for > anyone anyway. I believe currently we must be somewhere "between" soft reset & hard reset. I estimate getting closer to a well-emulated hard reset is more important than getting closer to a soft one. If you were to extend the i440FX reset handler so that it unconditionally resets the PAMs, I'd give my Rb. (Take it for what it's worth :)) The long-term solution covering all targets is being designed, but a quick shortcut would be nice, and not only for CSM development / testing. (I gather qemu_prep_reset() in SeaBIOS would not have had to be written that way, for example.) For CSM stuff we can still carry private qemu patches of course... Thanks Laszlo

4 3

[PATCH 1/4] Fix return type of le64_to_cpu() and be64_to_cpu()
by David Woodhouse 28 Feb '13

28 Feb '13

From: David Woodhouse <David.Woodhouse(a)intel.com> Signed-off-by: David Woodhouse <David.Woodhouse(a)intel.com> --- src/byteorder.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/byteorder.h b/src/byteorder.h index 5a8a64a..7362aeb 100644 --- a/src/byteorder.h +++ b/src/byteorder.h @@ -43,7 +43,7 @@ static inline u16 le16_to_cpu(u16 x) { static inline u32 le32_to_cpu(u32 x) { return x; } -static inline u32 le64_to_cpu(u64 x) { +static inline u64 le64_to_cpu(u64 x) { return x; } @@ -62,7 +62,7 @@ static inline u16 be16_to_cpu(u16 x) { static inline u32 be32_to_cpu(u32 x) { return swab32(x); } -static inline u32 be64_to_cpu(u64 x) { +static inline u64 be64_to_cpu(u64 x) { return swab64(x); } -- 1.8.1.2

7 29

Re: [SeaBIOS] [Qemu-devel] [RFC PATCH v4 00/30] ACPI memory hotplug
by Vasilis Liaskovitis 28 Feb '13

28 Feb '13

Hi, sorry for the delay. On Tue, Feb 19, 2013 at 07:39:40PM -0300, Erlon Cruz wrote: > On Tue, Dec 18, 2012 at 10:41 AM, Vasilis Liaskovitis < > vasilis.liaskovitis(a)profitbricks.com> wrote: > > > This is v4 of the ACPI memory hotplug functionality. Only x86_64 target is > > supported (both i440fx and q35). There are still several issues, but it's > > been a while since v3 and I wanted to get some more feedback on the current > > state of the patchseries. > > > > > We are working in memory hotplug functionality on pSeries machine. I'm > wondering whether and how we can better integrate things. Do you think the > DIMM abstraction is generic enough to be used in other machine types? I think the DimmDevice is generic enough but I am open to other suggestions. A related issue is that the patchseries uses a DimmBus to hot-add and hot-remove DimmDevice. Another approach that has been suggested is to use links<> between DimmDevices and the dram controller device (piix4 or mch for pc and q35-pc machines respectively). This would be more similar to the CPUState/qom patches - see Andreas Färber's earlier reply to this thread. I think we should get some consensus from the community/maintainers before we continue to integrate. I haven't updated the series for a while, but I can rework if there is a more clear direction for the community. Another open issue is reference counting of memoryregions in qemu memory model. In order to make memory hot-remove operations safe, we need to remove a memoryregion after all users (e.g. both guest and block layer) have stopped using it, see discussion at http://lists.gnu.org/archive/html/qemu-devel/2012-10/msg03986.html. There was a relevant ibm patchset https://lists.gnu.org/archive/html/qemu-devel/2012-11/msg02697.html but it was not merged. > > > > Overview: > > > > Dimm device layout is modeled with a normal qemu device: > > > > "-device dimm,id=name,size=sz,node=pxm,populated=on|off,bus=membus.0" > > > > > How does this will handle the no-hotplugable memory for example the memory > passed in '-m' parameter? The non-hotpluggable initial memory (-m) is currently not modelled at all as a DimmDevice. We may want to model it though. thanks, - Vasilis

1 0

SeaBIOS v1.7.2.1 stable release
by Kevin O'Connor 28 Feb '13

28 Feb '13

A new stable release of SeaBIOS (version 1.7.2.1) has been tagged. This release contains bug fixes, including several fixes for build problems. The release is available via git: git clone git://git.seabios.org/seabios -b 1.7.2-stable -Kevin Kevin O'Connor (4): Update tools/acpi_extract.py to handle iasl 20130117 release. Fix Makefile - don't reference "out/" directly, instead use "$(OUT)". build: Don't require $(OUT) to be a sub-directory of the main directory. Verify CC is valid during build tests. Alex Williamson (3): seabios q35: Enable all PIRQn IRQs at startup seabios q35: Add new PCI slot to irq routing function seabios: Add a dummy PCI slot to irq mapping function Avik Sil (1): USB-EHCI: Fix null pointer assignment Makefile | 10 +++++----- src/Kconfig | 2 +- src/pciinit.c | 47 ++++++++++++++++++++++++++++++++++++++++++----- src/usb-ehci.c | 2 +- tools/acpi_extract.py | 4 ++-- tools/test-build.sh | 23 +++++++++++++++-------- 6 files changed, 66 insertions(+), 22 deletions(-)

1 0

[RFC] SeaBIOS v1.7.2.1 stable release
by Kevin O'Connor 24 Feb '13

24 Feb '13

There's been requests for a stable release. Here's a list of patches that have been requested / that I think would be useful: 616fb27f - Update tools/acpi_extract.py to handle iasl 20130117 release. 7cac600a - USB-EHCI: Fix null pointer assignment 4c405cbf - Fix Makefile - don't reference "out/" directly, instead use "$(OUT)". 23219122 - build: Don't require $(OUT) to be a sub-directory of the main directory. bb0808a2 - Verify CC is valid during build tests. 555a2136 - seabios q35: Enable all PIRQn IRQs at startup b9490408 - seabios q35: Add new PCI slot to irq routing function dbb7a66f - seabios: Add a dummy PCI slot to irq mapping function Comments? -Kevin

2 2

9-segment allocator
by Kevin O'Connor 23 Feb '13

23 Feb '13

SeaBIOS v1.7.0 and earlier had an allocator that would reserve memory in the "9-segment" - memory at the end of the first 640K. (Subsequent versions of SeaBIOS allocate ram for "low memory" in the e-segment.) I recently revived the 9-segment code for testing purposes. I don't plan to commit this to the SeaBIOS repo - I'm posting it here in case there is interest. It is also available at: https://github.com/KevinOConnor/seabios/tree/test-9segment-20130223 -Kevin >From 3608cf00a12c33f03c8dcb3f3ba272effdf3dfb7 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor <kevin(a)koconnor.net> Date: Mon, 18 Feb 2013 10:45:39 -0500 Subject: [PATCH] Revive 9-segment allocator. To: seabios(a)seabios.org May be useful for testing. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- src/Kconfig | 9 +++++ src/pmm.c | 113 ++++++++++++++++++++++++++++++++++++++++++++++++----- src/post.c | 10 +++-- src/shadow.c | 4 +- src/stacks.c | 3 +- tools/layoutrom.py | 9 +++-- 6 files changed, 131 insertions(+), 17 deletions(-) diff --git a/src/Kconfig b/src/Kconfig index 98a6642..c88aaec 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -104,6 +104,15 @@ endchoice help Support floppy images in coreboot flash. + config MALLOC_UPPERMEMORY + bool "Allocate memory that needs to be in first Meg above 0xc0000" + default y + help + Use the "Upper Memory Block" area for internal "low + memory" allocations. If this is not selected, the memory + is instead allocated between 0x90000-0xa0000 (the + "9-segment"). + endmenu menu "Hardware support" diff --git a/src/pmm.c b/src/pmm.c index f02cf62..829547f 100644 --- a/src/pmm.c +++ b/src/pmm.c @@ -174,8 +174,12 @@ static struct allocinfo_s *RomBase; u32 rom_get_max(void) { - return ALIGN_DOWN((u32)RomBase->allocend - OPROM_HEADER_RESERVE - , OPTION_ROM_ALIGN); + if (CONFIG_MALLOC_UPPERMEMORY) + return ALIGN_DOWN((u32)RomBase->allocend - OPROM_HEADER_RESERVE + , OPTION_ROM_ALIGN); + extern u8 code32init_end[]; + u32 end = (u32)code32init_end; + return end > BUILD_BIOS_ADDR ? BUILD_BIOS_ADDR : end; } // Return the end of the last deployed option rom. @@ -189,6 +193,11 @@ rom_get_last(void) struct rom_header * rom_reserve(u32 size) { + if (!CONFIG_MALLOC_UPPERMEMORY) { + if (RomEnd + size > rom_get_max()) + return NULL; + return (void*)RomEnd; + } u32 newend = ALIGN(RomEnd + size, OPTION_ROM_ALIGN) + OPROM_HEADER_RESERVE; if (newend > (u32)RomBase->allocend) return NULL; @@ -313,8 +322,14 @@ malloc_init(void) // Initialize low-memory region extern u8 varlow_start[], varlow_end[], final_varlow_start[]; memmove(final_varlow_start, varlow_start, varlow_end - varlow_start); - addSpace(&ZoneLow, zonelow_base + OPROM_HEADER_RESERVE, final_varlow_start); - RomBase = findLast(&ZoneLow); + if (CONFIG_MALLOC_UPPERMEMORY) { + addSpace(&ZoneLow, zonelow_base + OPROM_HEADER_RESERVE + , final_varlow_start); + RomBase = findLast(&ZoneLow); + } else { + addSpace(&ZoneLow, (void*)ALIGN_DOWN((u32)final_varlow_start, 1024) + , final_varlow_start); + } // Add space available in f-segment to ZoneFSeg extern u8 zonefseg_start[], zonefseg_end[]; @@ -330,13 +345,19 @@ malloc_prepboot(void) ASSERT32FLAT(); dprintf(3, "malloc finalize\n"); - // Place an optionrom signature around used low mem area. u32 base = rom_get_max(); - struct rom_header *dummyrom = (void*)base; - dummyrom->signature = OPTION_ROM_SIGNATURE; - int size = (BUILD_BIOS_ADDR - base) / 512; - dummyrom->size = (size > 255) ? 255 : size; memset((void*)RomEnd, 0, base-RomEnd); + if (CONFIG_MALLOC_UPPERMEMORY) { + // Place an optionrom signature around used low mem area. + struct rom_header *dummyrom = (void*)base; + dummyrom->signature = OPTION_ROM_SIGNATURE; + int size = (BUILD_BIOS_ADDR - base) / 512; + dummyrom->size = (size > 255) ? 255 : size; + } + + // Reserve more low-mem if needed. + u32 endlow = GET_BDA(mem_size_kb)*1024; + add_e820(endlow, BUILD_LOWRAM_END-endlow, E820_RESERVED); // Clear unused f-seg ram. struct allocinfo_s *info = findLast(&ZoneFSeg); @@ -357,6 +378,78 @@ malloc_prepboot(void) /**************************************************************** + * ebda movement + ****************************************************************/ + +// Move ebda +static int +relocate_ebda(u32 newebda, u32 oldebda, u8 ebda_size) +{ + u32 lowram = GET_BDA(mem_size_kb) * 1024; + if (oldebda != lowram) + // EBDA isn't at end of ram - give up. + return -1; + + // Do copy + memmove((void*)newebda, (void*)oldebda, ebda_size * 1024); + + // Update indexes + dprintf(1, "ebda moved from %x to %x\n", oldebda, newebda); + SET_BDA(mem_size_kb, newebda / 1024); + SET_BDA(ebda_seg, FLATPTR_TO_SEG(newebda)); + return 0; +} + +// Support expanding the ZoneLow dynamically. +static void * +zonelow_expand(u32 size, u32 align, struct allocinfo_s *fill) +{ + // Make sure to not move ebda while an optionrom is running. + if (unlikely(wait_preempt())) { + void *data = allocSpace(&ZoneLow, size, align, fill); + if (data) + return data; + } + + struct allocinfo_s *info = findLast(&ZoneLow); + if (!info) + return NULL; + u32 oldpos = (u32)info->allocend; + u32 newpos = ALIGN_DOWN(oldpos - size, align); + u32 bottom = (u32)info->dataend; + if (newpos >= bottom && newpos <= oldpos) + // Space already present. + return allocSpace(&ZoneLow, size, align, fill); + u16 ebda_seg = get_ebda_seg(); + u32 ebda_pos = (u32)MAKE_FLATPTR(ebda_seg, 0); + u8 ebda_size = GET_EBDA(ebda_seg, size); + u32 ebda_end = ebda_pos + ebda_size * 1024; + if (ebda_end != bottom) + // Something else is after ebda - can't use any existing space. + newpos = ALIGN_DOWN(ebda_end - size, align); + u32 newbottom = ALIGN_DOWN(newpos, 1024); + u32 newebda = ALIGN_DOWN(newbottom - ebda_size * 1024, 1024); + if (newebda < BUILD_EBDA_MINIMUM) + // Not enough space. + return NULL; + + // Move ebda + int ret = relocate_ebda(newebda, ebda_pos, ebda_size); + if (ret) + return NULL; + + // Update zone + if (ebda_end == bottom) { + info->data = (void*)newbottom; + info->dataend = (void*)newbottom; + } else + addSpace(&ZoneLow, (void*)newbottom, (void*)ebda_end); + + return allocSpace(&ZoneLow, size, align, fill); +} + + +/**************************************************************** * tracked memory allocations ****************************************************************/ @@ -380,6 +473,8 @@ pmm_malloc(struct zone_s *zone, u32 handle, u32 size, u32 align) // Find and reserve space for main allocation void *data = allocSpace(zone, size, align, &detail->datainfo); + if (!CONFIG_MALLOC_UPPERMEMORY && !data && zone == &ZoneLow) + data = zonelow_expand(size, align, &detail->datainfo); if (!data) { freeSpace(&detail->detailinfo); return NULL; diff --git a/src/post.c b/src/post.c index 44bb0b0..70a3be6 100644 --- a/src/post.c +++ b/src/post.c @@ -85,17 +85,21 @@ bda_init(void) memset(bda, 0, sizeof(*bda)); int esize = EBDA_SIZE_START; - SET_BDA(mem_size_kb, BUILD_LOWRAM_END/1024 - esize); u16 ebda_seg = EBDA_SEGMENT_START; + extern u8 final_varlow_start[]; + if (!CONFIG_MALLOC_UPPERMEMORY) + ebda_seg = FLATPTR_TO_SEG(ALIGN_DOWN((u32)final_varlow_start, 1024) + - EBDA_SIZE_START*1024); SET_BDA(ebda_seg, ebda_seg); + SET_BDA(mem_size_kb, ebda_seg / (1024/16)); + // Init ebda struct extended_bios_data_area_s *ebda = get_ebda_ptr(); memset(ebda, 0, sizeof(*ebda)); ebda->size = esize; - add_e820((u32)MAKE_FLATPTR(ebda_seg, 0), GET_EBDA(ebda_seg, size) * 1024 - , E820_RESERVED); + add_e820((u32)ebda, BUILD_LOWRAM_END-(u32)ebda, E820_RESERVED); // Init extra stack StackPos = (void*)(&ExtraStack[BUILD_EXTRA_STACK_SIZE] - zonelow_base); diff --git a/src/shadow.c b/src/shadow.c index e971fe9..5bb1bd7 100644 --- a/src/shadow.c +++ b/src/shadow.c @@ -80,7 +80,9 @@ make_bios_readonly_intel(u16 bdf, u32 pam0) wbinvd(); // Write protect roms from 0xc0000-0xf0000 - u32 romend = rom_get_last(), romtop = rom_get_max(); + u32 romend = rom_get_last(), romtop = BUILD_BIOS_ADDR; + if (CONFIG_MALLOC_UPPERMEMORY) + romtop = rom_get_max(); int i; for (i=0; i<6; i++) { u32 mem = BUILD_ROM_START + i * 32*1024; diff --git a/src/stacks.c b/src/stacks.c index 7423939..3d49d35 100644 --- a/src/stacks.c +++ b/src/stacks.c @@ -456,7 +456,8 @@ finish_preempt(void) int wait_preempt(void) { - if (MODESEGMENT || !CONFIG_THREAD_OPTIONROMS || !CanPreempt) + if (MODESEGMENT || !CONFIG_THREAD_OPTIONROMS || !CanPreempt + || getesp() < 1024*1024) return 0; while (CanPreempt) yield(); diff --git a/tools/layoutrom.py b/tools/layoutrom.py index 6e1c588..d45a37e 100755 --- a/tools/layoutrom.py +++ b/tools/layoutrom.py @@ -238,10 +238,13 @@ def doLayout(sections): # Determine "low memory" data positions li.sections32low = getSectionsCategory(sections, '32low') sec32low_end = li.sec32init_start - final_sec32low_start = min(BUILD_BIOS_ADDR, li.sec32flat_start) - relocdelta = final_sec32low_start - sec32low_end - zonelow_base = final_sec32low_start - 64*1024 + final_sec32low_end = min(BUILD_BIOS_ADDR, li.sec32flat_start) + relocdelta = final_sec32low_end - sec32low_end + zonelow_base = final_sec32low_end - 64*1024 li.zonelow_base = max(BUILD_ROM_START, alignpos(zonelow_base, 2*1024)) + if '.bss.RomBase' not in dict([(s.name, '') for s in sections]): #XXX + relocdelta = 0xa0000 - sec32low_end + li.zonelow_base = 0x90000 li.sec32low_start, li.sec32low_align = setSectionsStart( li.sections32low, sec32low_end, 16 , segoffset=li.zonelow_base - relocdelta) -- 1.7.11.7

1 0

[PATCH] Try to detect an unsuccessful hard-reboot to prevent soft-reboot loops.
by Kevin O'Connor 23 Feb '13

23 Feb '13

There have been various kvm bugs that prevent reboots from working properly. Generalize the existing test for a failed reboot to better catch these cases. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- src/resume.c | 9 +++++++++ src/shadow.c | 4 ---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/resume.c b/src/resume.c index 784abac..9466480 100644 --- a/src/resume.c +++ b/src/resume.c @@ -123,10 +123,19 @@ s3_resume(void) farcall16big(&br); } +u8 HaveAttemptedReboot VARLOW; + // Attempt to invoke a hard-reboot. static void tryReboot(void) { + if (HaveAttemptedReboot) { + // Hard reboot has failed - try to shutdown machine. + dprintf(1, "Unable to hard-reboot machine - attempting shutdown.\n"); + apm_shutdown(); + } + HaveAttemptedReboot = 1; + dprintf(1, "Attempting a hard reboot\n"); // Setup for reset on qemu. diff --git a/src/shadow.c b/src/shadow.c index 0aac60b..e971fe9 100644 --- a/src/shadow.c +++ b/src/shadow.c @@ -169,8 +169,4 @@ qemu_prep_reset(void) extern u8 code32flat_start[], code32flat_end[]; memcpy(code32flat_start, code32flat_start + BIOS_SRC_OFFSET , code32flat_end - code32flat_start); - - if (HaveRunPost) - // Memory copy failed to work - try to halt the machine. - apm_shutdown(); } -- 1.7.11.7

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS