SeaBIOS January 2011

seabios@seabios.org

9 participants
26 discussions

[PATCH] Add ability to track PCI paths and add to build_pci_path().
by Kevin O'Connor 10 Jan '11

10 Jan '11

Improve device path descriptions of devices on PCI buses. --- src/boot.c | 17 ++++++++++++----- src/pci.c | 29 +++++++++++++++++++++++++++++ src/pci.h | 5 +++++ src/post.c | 1 + 4 files changed, 47 insertions(+), 5 deletions(-) diff --git a/src/boot.c b/src/boot.c index b59794e..05fb3dd 100644 --- a/src/boot.c +++ b/src/boot.c @@ -99,13 +99,20 @@ build_pci_path(char *buf, int max, const char *devname, int bdf) { // Build the string path of a bdf - for example: /pci@i0cf8/isa@1,2 char *p = buf; - int bus = pci_bdf_to_bus(bdf); - if (bus) - // XXX - this isn't the correct path syntax - p += snprintf(p, max, "/bus%x", bus); + int parent = pci_bdf_to_bus(bdf); + if (PCIpaths) + parent = PCIpaths[parent]; + int parentdev = parent & 0xffff; + if (parent & PP_PCIBRIDGE) { + p = build_pci_path(p, max, "pci-bridge", parentdev); + } else { + if (parentdev) + p += snprintf(p, max, "/pci-root@%x", parentdev); + p += snprintf(p, buf+max-p, "%s", FW_PCI_DOMAIN); + } int dev = pci_bdf_to_dev(bdf), fn = pci_bdf_to_fn(bdf); - p += snprintf(p, buf+max-p, "%s/%s@%x", FW_PCI_DOMAIN, devname, dev); + p += snprintf(p, buf+max-p, "/%s@%x", devname, dev); if (fn) p += snprintf(p, buf+max-p, ",%x", fn); return p; diff --git a/src/pci.c b/src/pci.c index 5237f19..45f210d 100644 --- a/src/pci.c +++ b/src/pci.c @@ -185,6 +185,35 @@ pci_find_class(u16 classid) return -1; } +int *PCIpaths; + +// Build the PCI path designations. +void +pci_path_setup(void) +{ + PCIpaths = malloc_tmp(sizeof(*PCIpaths) * 256); + if (!PCIpaths) + return; + memset(PCIpaths, 0, sizeof(PCIpaths)); + + int roots = 0; + int bdf, max; + foreachpci(bdf, max) { + int bus = pci_bdf_to_bus(bdf); + if (! PCIpaths[bus]) + PCIpaths[bus] = (roots++) | PP_ROOT; + + // Check if found device is a bridge. + u32 v = pci_config_readb(bdf, PCI_HEADER_TYPE); + v &= 0x7f; + if (v == PCI_HEADER_TYPE_BRIDGE || v == PCI_HEADER_TYPE_CARDBUS) { + v = pci_config_readl(bdf, PCI_PRIMARY_BUS); + int childbus = (v >> 8) & 0xff; + PCIpaths[childbus] = bdf | PP_PCIBRIDGE; + } + } +} + int pci_init_device(const struct pci_device_id *ids, u16 bdf, void *arg) { u16 vendor_id = pci_config_readw(bdf, PCI_VENDOR_ID); diff --git a/src/pci.h b/src/pci.h index 46af207..9869a26 100644 --- a/src/pci.h +++ b/src/pci.h @@ -47,6 +47,11 @@ int pci_find_vga(void); int pci_find_device(u16 vendid, u16 devid); int pci_find_class(u16 classid); +#define PP_ROOT (1<<17) +#define PP_PCIBRIDGE (1<<18) +extern int *PCIpaths; +void pci_path_setup(void); + int pci_next(int bdf, int *pmax); #define foreachpci(BDF, MAX) \ for (MAX=0x0100, BDF=pci_next(0, &MAX) \ diff --git a/src/post.c b/src/post.c index efcfc85..7d2b5f2 100644 --- a/src/post.c +++ b/src/post.c @@ -217,6 +217,7 @@ maininit(void) // Initialize pci pci_setup(); + pci_path_setup(); smm_init(); // Initialize internal tables -- 1.7.3.4

1 0

[PATCHv2] support T13 EDD3.0 spec
by Gleb Natapov 09 Jan '11

09 Jan '11

Some guests (such as Linux) expect BIOS to behave according to T13 EDD3.0 spec. T13 spec is much better then Phoenix since it provides more information about interface and device paths. This patch adds support for the spec. If guest provides buffer with enough space for T13 EDD info return EDD according to T13 spec otherwise use Phoenix one. Signed-off-by: Gleb Natapov <gleb(a)redhat.com> diff --git a/src/disk.c b/src/disk.c index f7bfe9c..5ac69fd 100644 --- a/src/disk.c +++ b/src/disk.c @@ -503,6 +503,7 @@ static void disk_1348(struct bregs *regs, struct drive_s *drive_g) { u16 size = GET_INT13DPT(regs, size); + u16 t13 = size == 74; // Buffer is too small if (size < 26) { @@ -553,8 +554,9 @@ disk_1348(struct bregs *regs, struct drive_s *drive_g) // EDD 2.x int bdf; - u16 iobase1; - u64 device_path; + u16 iobase1 = 0; + u64 device_path = 0; + u8 channel = 0; SET_INT13DPT(regs, size, 30); if (type == DTYPE_ATA || type == DTYPE_ATAPI) { u16 ebda_seg = get_ebda_seg(); @@ -573,6 +575,7 @@ disk_1348(struct bregs *regs, struct drive_s *drive_g) iobase1 = GET_GLOBALFLAT(chan_gf->iobase1); bdf = GET_GLOBALFLAT(chan_gf->pci_bdf); device_path = slave; + channel = GET_GLOBALFLAT(chan_gf->chanid); u16 options = 0; if (type == DTYPE_ATA) { @@ -613,8 +616,6 @@ disk_1348(struct bregs *regs, struct drive_s *drive_g) SET_INT13DPT(regs, dpte_segment, 0); SET_INT13DPT(regs, dpte_offset, 0); bdf = GET_GLOBAL(drive_g->cntl_id); - device_path = 0; - iobase1 = 0; } if (size < 66) { @@ -632,17 +633,20 @@ disk_1348(struct bregs *regs, struct drive_s *drive_g) SET_INT13DPT(regs, host_bus[0], 'P'); SET_INT13DPT(regs, host_bus[1], 'C'); SET_INT13DPT(regs, host_bus[2], 'I'); - SET_INT13DPT(regs, host_bus[3], 0); + SET_INT13DPT(regs, host_bus[3], ' '); u32 path = (pci_bdf_to_bus(bdf) | (pci_bdf_to_dev(bdf) << 8) | (pci_bdf_to_fn(bdf) << 16)); + if (t13) + path |= channel << 24; + SET_INT13DPT(regs, iface_path, path); } else { // ISA SET_INT13DPT(regs, host_bus[0], 'I'); SET_INT13DPT(regs, host_bus[1], 'S'); SET_INT13DPT(regs, host_bus[2], 'A'); - SET_INT13DPT(regs, host_bus[3], 0); + SET_INT13DPT(regs, host_bus[3], ' '); SET_INT13DPT(regs, iface_path, iobase1); } @@ -651,7 +655,7 @@ disk_1348(struct bregs *regs, struct drive_s *drive_g) SET_INT13DPT(regs, iface_type[0], 'A'); SET_INT13DPT(regs, iface_type[1], 'T'); SET_INT13DPT(regs, iface_type[2], 'A'); - SET_INT13DPT(regs, iface_type[3], 0); + SET_INT13DPT(regs, iface_type[3], ' '); } else { SET_INT13DPT(regs, iface_type[0], 'S'); SET_INT13DPT(regs, iface_type[1], 'C'); @@ -663,10 +667,18 @@ disk_1348(struct bregs *regs, struct drive_s *drive_g) SET_INT13DPT(regs, iface_type[6], 0); SET_INT13DPT(regs, iface_type[7], 0); - SET_INT13DPT(regs, device_path, device_path); + if (t13) { + SET_INT13DPT(regs, t13.device_path[0], device_path); + SET_INT13DPT(regs, t13.device_path[1], 0); + + SET_INT13DPT(regs, t13.checksum + , -checksum_far(regs->ds, (void*)(regs->si+30), 43)); + } else { + SET_INT13DPT(regs, phoenix.device_path, device_path); - SET_INT13DPT(regs, checksum - , -checksum_far(regs->ds, (void*)(regs->si+30), 35)); + SET_INT13DPT(regs, phoenix.checksum + , -checksum_far(regs->ds, (void*)(regs->si+30), 35)); + } disk_ret(regs, DISK_RET_SUCCESS); } diff --git a/src/disk.h b/src/disk.h index f31de73..10a0051 100644 --- a/src/disk.h +++ b/src/disk.h @@ -63,9 +63,18 @@ struct int13dpt_s { u8 host_bus[4]; u8 iface_type[8]; u64 iface_path; - u64 device_path; - u8 reserved3; - u8 checksum; + union { + struct { + u64 device_path; + u8 reserved3; + u8 checksum; + } phoenix; + struct { + u64 device_path[2]; + u8 reserved3; + u8 checksum; + } t13; + }; } PACKED; #define GET_INT13DPT(regs,var) \ -- Gleb.

2 2

[PATCH] Extract space trimming code from ATA and use in USB and bootorder code.
by Kevin O'Connor 08 Jan '11

08 Jan '11

Introduce function nullTrailingSpace() that nulls blank characters from the end of a string. Use this function in the ATA, USB MSC, and bootorder code. --- src/ata.c | 6 +----- src/boot.c | 1 + src/usb-msc.c | 14 ++++++++------ src/util.c | 10 ++++++++++ src/util.h | 1 + 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/ata.c b/src/ata.c index e9a2aef..397e402 100644 --- a/src/ata.c +++ b/src/ata.c @@ -727,11 +727,7 @@ ata_extract_model(char *model, u32 size, u16 *buffer) for (i=0; i<size/2; i++) *(u16*)&model[i*2] = ntohs(buffer[27+i]); model[size] = 0x00; - - // Trim trailing spaces from model name. - for (i=size-1; i>0 && model[i] == 0x20; i--) - model[i] = 0x00; - + nullTrailingSpace(model); return model; } diff --git a/src/boot.c b/src/boot.c index e5475a2..b59794e 100644 --- a/src/boot.c +++ b/src/boot.c @@ -51,6 +51,7 @@ loadBootOrder(void) f = strchr(f, '\n'); if (f) *(f++) = '\0'; + nullTrailingSpace(Bootorder[i]); dprintf(3, "%d: %s\n", i+1, Bootorder[i]); i++; } while (f); diff --git a/src/usb-msc.c b/src/usb-msc.c index 58a5d14..1aa57d1 100644 --- a/src/usb-msc.c +++ b/src/usb-msc.c @@ -228,14 +228,16 @@ usb_msc_init(struct usb_pipe *pipe goto fail; char vendor[sizeof(data.vendor)+1], product[sizeof(data.product)+1]; char rev[sizeof(data.rev)+1]; + strtcpy(vendor, data.vendor, sizeof(vendor)); + nullTrailingSpace(vendor); + strtcpy(product, data.product, sizeof(product)); + nullTrailingSpace(product); + strtcpy(rev, data.rev, sizeof(rev)); + nullTrailingSpace(rev); int pdt = data.pdt & 0x1f; int removable = !!(data.removable & 0x80); - dprintf(1, "USB MSC vendor='%s' product='%s' rev='%s'" - " type=%d removable=%d\n" - , strtcpy(vendor, data.vendor, sizeof(vendor)) - , strtcpy(product, data.product, sizeof(product)) - , strtcpy(rev, data.rev, sizeof(rev)) - , pdt, removable); + dprintf(1, "USB MSC vendor='%s' product='%s' rev='%s' type=%d removable=%d\n" + , vendor, product, rev, pdt, removable); udrive_g->drive.removable = removable; if (pdt == USB_MSC_TYPE_CDROM) { diff --git a/src/util.c b/src/util.c index 579a044..ed73d63 100644 --- a/src/util.c +++ b/src/util.c @@ -272,6 +272,16 @@ strchr(const char *s, int c) return NULL; } +// Remove any trailing blank characters (spaces, new lines, carriage returns) +void +nullTrailingSpace(char *buf) +{ + int len = strlen(buf); + char *end = &buf[len-1]; + while (end >= buf && *end <= ' ') + *(end--) = '\0'; +} + /**************************************************************** * Keyboard calls ****************************************************************/ diff --git a/src/util.h b/src/util.h index 7102c27..17fc54a 100644 --- a/src/util.h +++ b/src/util.h @@ -210,6 +210,7 @@ void iomemcpy(void *d, const void *s, u32 len); void *memmove(void *d, const void *s, size_t len); char *strtcpy(char *dest, const char *src, size_t len); char *strchr(const char *s, int c); +void nullTrailingSpace(char *buf); int get_keystroke(int msec); // stacks.c -- 1.7.3.4

1 0

PCI device path?
by Kevin O'Connor 06 Jan '11

06 Jan '11

Hi Gleb, Did you have any thoughts on how to build the PCI device path for the bootprio_find_X functions? I suppose we could keep an "int parentbus[256]" and fill it with info on the parent info of every PCI bus. Then the build_pci_path() function could reconstruct the path of buses back to the root. As I understand it there could be three types of PCI buses we could run into - the root bus 0, a pci-to-pci bridge, or a non bus 0 root bus. -Kevin

2 1

seabios: acpi: add _RMV control method for PCI devices
by Marcelo Tosatti 06 Jan '11

06 Jan '11

Use _RMV method to indicate whether device can be removed. Data is retrieved from QEMU via I/O port 0xae0c. Signed-off-by: Marcelo Tosatti <mtosatti(a)redhat.com> Index: seabios/src/acpi-dsdt.dsl =================================================================== --- seabios.orig/src/acpi-dsdt.dsl +++ seabios/src/acpi-dsdt.dsl @@ -122,6 +122,12 @@ DefinitionBlock ( B0EJ, 32, } + OperationRegion(RMVC, SystemIO, 0xae0c, 0x04) + Field(RMVC, DWordAcc, NoLock, WriteAsZeros) + { + PCRM, 32, + } + #define hotplug_slot(name, nr) \ Device (S##name) { \ Name (_ADR, nr##0000) \ @@ -245,11 +251,14 @@ DefinitionBlock ( { Return (0x00) } + Method(_RMV) { Return (0x00) } } /* PIIX3 ISA bridge */ Device (ISA) { Name (_ADR, 0x00010000) + Method(_RMV) { Return (0x00) } + /* PIIX PCI to ISA irq remapping */ OperationRegion (P40C, PCI_Config, 0x60, 0x04) @@ -442,6 +451,49 @@ DefinitionBlock ( DRSJ, 32 } } + +#define gen_pci_device(name, nr) \ + Device(SL##name) { \ + Name (_ADR, nr##0000) \ + Method (_RMV) { \ + If (And(\_SB.PCI0.PCRM, ShiftLeft(1, nr))) { \ + Return (0x1) \ + } \ + Return (0x0) \ + } \ + Name (_SUN, name) \ + } + + /* VGA (slot 1) and ISA bus (slot 2) defined above */ + gen_pci_device(3, 0x0003) + gen_pci_device(4, 0x0004) + gen_pci_device(5, 0x0005) + gen_pci_device(6, 0x0006) + gen_pci_device(7, 0x0007) + gen_pci_device(8, 0x0008) + gen_pci_device(9, 0x0009) + gen_pci_device(10, 0x000a) + gen_pci_device(11, 0x000b) + gen_pci_device(12, 0x000c) + gen_pci_device(13, 0x000d) + gen_pci_device(14, 0x000e) + gen_pci_device(15, 0x000f) + gen_pci_device(16, 0x0010) + gen_pci_device(17, 0x0011) + gen_pci_device(18, 0x0012) + gen_pci_device(19, 0x0013) + gen_pci_device(20, 0x0014) + gen_pci_device(21, 0x0015) + gen_pci_device(22, 0x0016) + gen_pci_device(23, 0x0017) + gen_pci_device(24, 0x0018) + gen_pci_device(25, 0x0019) + gen_pci_device(26, 0x001a) + gen_pci_device(27, 0x001b) + gen_pci_device(28, 0x001c) + gen_pci_device(29, 0x001d) + gen_pci_device(30, 0x001e) + gen_pci_device(31, 0x001f) } /* PCI IRQs */

4 22

[PATCH 0/9] Misc boot related cleanups
by Kevin O'Connor 06 Jan '11

06 Jan '11

Some cleanups I came across while reviewing the boot code. Gleb - patch 7 conflicts with your last patch - I hope it isn't a big deal to fixup though. (I'm still reviewing your last patch.) -Kevin Kevin O'Connor (9): Rename add_ordered_drive() to add_drive() and use in map_hd_drive(). Call setup_translation() from map_hd_drive(). Don't access drive_g->desc from boot_cdrom(). Remove Drives global struct in favor of independent global variables. Move IPL.checkfloppysig to a global (CheckFloppySig) in boot.c. Move IPL.bev to static variables in boot.c Move IPL.fw_bootorder to static variables in boot.c. Minor reorganization of some of the boot_xxx code in boot.c. Remove drive->desc field. src/ahci.c | 40 +++++++--------- src/ata.c | 41 +++++++--------- src/block.c | 64 ++++++++++++------------- src/boot.c | 137 +++++++++++++++++++++++++++++++----------------------- src/boot.h | 36 +------------- src/cdrom.c | 2 +- src/coreboot.c | 5 +-- src/disk.c | 2 +- src/disk.h | 13 +---- src/floppy.c | 28 ++++++----- src/output.c | 26 ++++++++++ src/ramdisk.c | 10 +++- src/usb-msc.c | 32 ++++++------- src/util.h | 2 + src/virtio-blk.c | 11 ++--- 15 files changed, 221 insertions(+), 228 deletions(-) -- 1.7.3.4

2 21

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS January 2011