SeaBIOS October 2010

seabios@seabios.org

15 participants
14 discussions

[PATCH 0/2] pciinit: fix overflow when bar allocation

by Isaku Yamahata

This patch set fixes PCI bar allocation when bar overflow occured. I checked if pmm_alloc facility can be used, but it doesn't suit for pci bar allocation. So I resulted in new API, pci_region which encapsulates region allocation and overflow checks. The first patch introduces pci_region, and the second patch fixes the overflow case with pci_region. Isaku Yamahata (2): pci: introduce pci_region to manage pci io/memory/prefmemory regions. pciinit: use pci_region functions. Makefile | 3 +- src/pci_region.c | 70 +++++++++++++++++++++++++++++++ src/pciinit.c | 122 ++++++++++++++++++++++++++--------------------------- src/util.h | 15 +++++++ 4 files changed, 147 insertions(+), 63 deletions(-) create mode 100644 src/pci_region.c

9 years, 9 months

Re: [SeaBIOS] [PATCH 1/2] pci: introduce pci_region to manage pci io/memory/prefmemory regions.

by Michael S. Tsirkin

On Mon, Oct 18, 2010 at 06:34:22PM +0900, Isaku Yamahata wrote: > This patch adds helper functions to manage pci area. > > Signed-off-by: Isaku Yamahata <yamahata(a)valinux.co.jp> > --- > Makefile | 3 +- > src/pci_region.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ > src/util.h | 15 +++++++++++ > 3 files changed, 87 insertions(+), 1 deletions(-) > create mode 100644 src/pci_region.c > > diff --git a/Makefile b/Makefile > index 9d412f1..1663a5d 100644 > --- a/Makefile > +++ b/Makefile > @@ -19,7 +19,8 @@ SRCBOTH=misc.c pmm.c stacks.c output.c util.c block.c floppy.c ata.c mouse.c \ > SRC16=$(SRCBOTH) system.c disk.c font.c > SRC32FLAT=$(SRCBOTH) post.c shadow.c memmap.c coreboot.c boot.c \ > acpi.c smm.c mptable.c smbios.c pciinit.c optionroms.c mtrr.c \ > - lzmadecode.c bootsplash.c jpeg.c usb-hub.c paravirt.c dev-i440fx.c > + lzmadecode.c bootsplash.c jpeg.c usb-hub.c paravirt.c dev-i440fx.c \ > + pci_region.c > SRC32SEG=util.c output.c pci.c pcibios.c apm.c stacks.c > > cc-option = $(shell if test -z "`$(1) $(2) -S -o /dev/null -xc \ > diff --git a/src/pci_region.c b/src/pci_region.c > new file mode 100644 > index 0000000..a4e71d9 > --- /dev/null > +++ b/src/pci_region.c > @@ -0,0 +1,70 @@ > +// helper functions to manage pci io/memory/prefetch memory region > +// > +// Copyright (C) 2009 Isaku Yamahata <yamahata at valinux co jp> > +// > +// This file may be distributed under the terms of the GNU LGPLv3 license. > +// > +// > + > +#include "util.h" > + > +#define PCI_REGION_DISABLED (-1) > + > +void pci_region_init(struct pci_region *r, u32 start, u32 end) > +{ > + r->start = start; > + r->end = end; > + > + r->cur_end = start; > +} > + > +static u32 pci_region_alloc_align(struct pci_region *r, u32 size, u32 align) > +{ > + if (r->cur_end == PCI_REGION_DISABLED) { > + return 0; > + } So is special value PCI_REGION_DISABLED or cur_end? > + > + u32 s = ALIGN(r->cur_end, align); > + if (s > r->end || s < r->cur_end) { > + return 0; > + } > + u32 e = s + size; > + if (e > r->end || e < s) { > + return 0; > + } > + r->cur_end = e; > + return s; > +} > + > +u32 pci_region_alloc(struct pci_region *r, u32 size) > +{ > + return pci_region_alloc_align(r, size, size); > +} > + > +u32 pci_region_align(struct pci_region *r, u32 align) > +{ > + return pci_region_alloc_align(r, 0, align); > +} > + > +void pci_region_revert(struct pci_region *r, u32 addr) > +{ > + r->cur_end = addr; > +} > + > +u32 pci_region_disable(struct pci_region *r) > +{ > + return r->cur_end = PCI_REGION_DISABLED; > +} > + > +u32 pci_region_addr(const struct pci_region *r) > +{ > + if (r->cur_end == PCI_REGION_DISABLED){ > + return r->end; > + } > + return r->cur_end; > +} > + > +u32 pci_region_size(const struct pci_region *r) > +{ > + return r->end - r->start; > +} > diff --git a/src/util.h b/src/util.h > index 5cc9f17..ecd1c16 100644 > --- a/src/util.h > +++ b/src/util.h > @@ -344,6 +344,21 @@ void qemu_prep_reset(void); > void smm_save_and_copy(void); > void smm_relocate_and_restore(void); > > +// pci_region.c > +struct pci_region { > + u32 start; > + u32 end; > + > + u32 cur_end; > +}; > +void pci_region_init(struct pci_region *r, u32 start, u32 end); > +u32 pci_region_alloc(struct pci_region *r, u32 size); > +u32 pci_region_align(struct pci_region *r, u32 align); > +void pci_region_revert(struct pci_region *r, u32 addr); > +u32 pci_region_disable(struct pci_region *r); > +u32 pci_region_addr(const struct pci_region *r); > +u32 pci_region_size(const struct pci_region *r); > + Please document structure fields here and functions in the .c file. > // pciinit.c > extern const u8 pci_irqs[4]; > void pci_bios_allocate_regions(u16 bdf, void *arg); > -- > 1.7.1.1

9 years, 9 months

Re: [SeaBIOS] system_powerdown not working for qemu-kvm 0.12.4?

by Avi Kivity

On 10/11/2010 07:53 PM, Ruben Kerkhof wrote: > On Mon, Oct 11, 2010 at 18:57, Avi Kivity<avi(a)redhat.com> wrote: > > On 10/11/2010 06:29 PM, Ruben Kerkhof wrote: > >> > >> Hi Avi, > >> > >> On Sun, Aug 15, 2010 at 13:00, Avi Kivity<avi(a)redhat.com> wrote: > >> > >> > I'm betting 73b48d914f9 is the cause, but let's see the full bisect. > >> > >> system_powerdown with FreeBSD 8.1 works on 73b48d914f9. > >> > >> I've bisected the issue to commit 76e617c. > >> > >> Let me know if I should do some other tests. > > > > It works on 73b48d914f9 but fails on 76e617c due to the seabios change. > > > > Can you try 76e617c but with SeaBIOS 0.5.0? If that works, keep qemu-kvm on > > 76e617c but bisect SeaBIOS from 0.5.0 to 0.5.1 to see which commit broke > > freebsd. > > > > Sure, > > 5c99b6c984682ddb1d4543a7e27a1f4ca633e6a6 is the first bad commit > commit 5c99b6c984682ddb1d4543a7e27a1f4ca633e6a6 > Author: Kevin O'Connor<kevin(a)koconnor.net> > Date: Wed Dec 30 12:36:22 2009 -0500 > > Commit compiled dsdt file; misc comment updates. > > Commit new dsdt with recent changes. > Add some misc comments. > Also, fix uninitialized warning in mptable code. > > Regards, Ruben Gleb, Kevin, any ideas? (summary: qemu-kvm doesn't acpi shutdown freebsd 8.1 with this commit; qemu.git does. May be due to interrupt polarity which kvm implements but qemu does not) -- I have a truly marvellous patch that fixes the bug which this signature is too narrow to contain.

9 years, 9 months

[RFC] Passing boot order from qemu to seabios

by Gleb Natapov

Currently if VM is started with multiple disks it is almost impossible to guess which one of them will be used as boot device especially if there is a mix of ATA/virtio/SCSI devices. Essentially BIOS decides the order and without looking into the code you can't tell what the order will be (and in qemu-kvm if boot=on is used it brings even more havoc). We should allow fine-grained control of boot order from qemu command line, or as a minimum control what device will be used for booting. To do that along with inventing syntax to specify boot order on qemu command line we need to communicate boot order to seabios via fw_cfg interface. For that we need to have a way to unambiguously specify a disk from qemu to seabios. PCI bus address is not enough since not all devices are PCI (do we care about them?) and since one PCI device may control more then one disk (ATA slave/master, SCSI LUNs). We can do what EDD specification does. Describe disk as: bus type (isa/pci), address on a bus (16 bit base address for isa, b/s/f for pci) device type (ATA/SCSI/VIRTIO) device path (slave/master for ATA, LUN for SCSI, nothing for virtio) Will it cover all use cased? Any other ideas? Any ideas about qemu command line syntax? May be somebody whats to implement it? :) -- Gleb.

9 years, 9 months

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS October 2010