June 2012 - SeaBIOS - mail.coreboot.org

Re: [SeaBIOS] [coreboot] VGA Option ROM
by Kevin O'Connor June 9, 2012

June 9, 2012

On Sat, Jun 09, 2012 at 09:17:34PM +0200, Wolfgang Kamp - datakamp wrote: > Hi, > > When execution of VGA option ROM is configured in seabios, > seabios first scans all PCI devices and looks for a vga type device as you can see in my attached log. > If seabios finds a pci vga device then it looks for a suitable VGA BIOS (Vendor id:Device id / 1002:9804) in CBFS. > But if seabios does not find a vga device, it doesn't look for the VGA BIOS. That is what happens. > In my issue seabios can only find the pci VGA device if I first enabled VGA ROM execution in coreboot. > If seabios finds the vga device it will also find the correct VGA BIOS in CBFS and executes it. > The log shows this. The issue is that the pci enumertion fails in seabios and it does not list all available devices. > Why is it broken? It could be a coreboot or seabios problem. Looks like a coreboot issue to me. The PCI device does not appear to be present when SeaBIOS doesn't find it. As Ron indicated in another email, it looks like coreboot needs an option to enable the vga but not run the rom for your board. -Kevin

1 0

[PATCH] Remove SMBIOS generation on coreboot hack.
by Kevin O'Connor June 9, 2012

June 9, 2012

Early versions of coreboot did not create an SMBIOS table (which Linux needs in order to use the ACPI tables), so SeaBIOS had a hack to generate an SMBIOS table. However, recent versions of coreboot can generate an SMBIOS table, so there is no longer a reason to support this hack. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- src/Kconfig | 4 +--- src/coreboot.c | 4 ---- 2 files changed, 1 insertions(+), 7 deletions(-) diff --git a/src/Kconfig b/src/Kconfig index 53fda9b..25b2b1b 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -303,14 +303,13 @@ menu "BIOS interfaces" endmenu menu "BIOS Tables" + depends on !COREBOOT config PIRTABLE - depends on !COREBOOT bool "PIR table" default y help Support generation of a PIR table in 0xf000 segment. config MPTABLE - depends on !COREBOOT bool "MPTable" default y help @@ -322,7 +321,6 @@ menu "BIOS Tables" Support generation of SM BIOS tables. This is also sometimes called DMI. config ACPI - depends on !COREBOOT bool "ACPI" default y help diff --git a/src/coreboot.c b/src/coreboot.c index 9de99af..55590ce 100644 --- a/src/coreboot.c +++ b/src/coreboot.c @@ -218,10 +218,6 @@ coreboot_copy_biostable(void) if (m->type == CB_MEM_TABLE) scan_tables(m->start, m->size); } - - // XXX - create a dummy smbios table for now. - if (!SMBiosAddr) - smbios_init(); } -- 1.7.6.5

1 0

[PATCH 0/4] pci: 64bit pci window patches
by Gerd Hoffmann June 9, 2012

June 9, 2012

Hi, Time to repost, aiming for merge. The patches survived my local testing and win2k8 testing by Alexey. Patch #4 got some finishing touches: Tries two 64bit I/O window sizes only, also added a comment explaining why it is done. Rebased to latest master. cheers, Gerd Gerd Hoffmann (4): update bios date pciinit: make pci ressources configurable update dsdt ressources at runtime pci: runtime i/o window sizing src/acpi-dsdt.dsl | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++-- src/acpi.c | 28 ++++++++++++++++++++++- src/acpi.h | 9 +++++++ src/pci.h | 2 + src/pciinit.c | 46 +++++++++++++++++++++++++++++++------ src/smbios.c | 2 +- 6 files changed, 139 insertions(+), 13 deletions(-)

3 7

[PATCH] Avoid runtime relocation of 16bit "low" mem - calculate at build instead.
by Kevin O'Connor June 8, 2012

June 8, 2012

Some 16bit accesses to "low" mem variables use 16bit relocations instead of the normal 32bit relocations. This causes build problems if the "low" mem sections move more than 64K during relocation. The final location of the "low" memory can be determined during the build, so link the 16bit code with the final post-reloc location of the "low" mem variables instead. This eliminates the need to do these runtime relocations on the 16bit code. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- src/biosvar.h | 4 ++-- src/pmm.c | 14 ++++---------- src/post.c | 24 ++++++++++-------------- tools/layoutrom.py | 25 +++++++++++++------------ 4 files changed, 29 insertions(+), 38 deletions(-) diff --git a/src/biosvar.h b/src/biosvar.h index fd2f1bf..eceee54 100644 --- a/src/biosvar.h +++ b/src/biosvar.h @@ -250,13 +250,13 @@ static inline u16 get_global_seg(void) { * "Low" memory variables ****************************************************************/ -extern u8 _datalow_seg, _datalow_base[]; +extern u8 _datalow_seg, datalow_base[]; #define SEG_LOW ((u32)&_datalow_seg) #if MODESEGMENT #define GET_LOW(var) GET_FARVAR(SEG_LOW, (var)) #define SET_LOW(var, val) SET_FARVAR(SEG_LOW, (var), (val)) -#define LOWFLAT2LOW(var) ((typeof(var))((void*)(var) - (u32)_datalow_base)) +#define LOWFLAT2LOW(var) ((typeof(var))((void*)(var) - (u32)datalow_base)) #else #define GET_LOW(var) (var) #define SET_LOW(var, val) do { (var) = (val); } while (0) diff --git a/src/pmm.c b/src/pmm.c index 5d43645..1addb41 100644 --- a/src/pmm.c +++ b/src/pmm.c @@ -170,13 +170,6 @@ static struct allocinfo_s *RomBase; #define OPROM_HEADER_RESERVE 16 -// Return maximum address of read/writable "low mem" space. -static inline u32 lowmemend(void) { - extern u8 code32flat_start[], code32init_end[]; - u32 end = CONFIG_RELOCATE_INIT ? (u32)code32init_end : (u32)code32flat_start; - return end > BUILD_BIOS_ADDR ? BUILD_BIOS_ADDR : end; -} - // Return the memory position up to which roms may be located. u32 rom_get_top(void) @@ -199,8 +192,8 @@ rom_reserve(u32 size) u32 newend = ALIGN(RomEnd + size, OPTION_ROM_ALIGN) + OPROM_HEADER_RESERVE; if (newend > (u32)RomBase->allocend) return NULL; - if (newend < (u32)_datalow_base + OPROM_HEADER_RESERVE) - newend = (u32)_datalow_base + OPROM_HEADER_RESERVE; + if (newend < (u32)datalow_base + OPROM_HEADER_RESERVE) + newend = (u32)datalow_base + OPROM_HEADER_RESERVE; RomBase->data = RomBase->dataend = (void*)newend; return (void*)RomEnd; } @@ -253,7 +246,8 @@ malloc_setup(void) // Populate other regions addSpace(&ZoneTmpLow, (void*)BUILD_STACK_ADDR, (void*)BUILD_EBDA_MINIMUM); addSpace(&ZoneFSeg, BiosTableSpace, &BiosTableSpace[CONFIG_MAX_BIOSTABLE]); - addSpace(&ZoneLow, _datalow_base + OPROM_HEADER_RESERVE, (void*)lowmemend()); + extern u8 final_datalow_start[]; + addSpace(&ZoneLow, datalow_base + OPROM_HEADER_RESERVE, final_datalow_start); RomBase = findLast(&ZoneLow); if (highram) { addSpace(&ZoneHigh, (void*)highram diff --git a/src/post.c b/src/post.c index 1d0d35a..3101505 100644 --- a/src/post.c +++ b/src/post.c @@ -97,7 +97,7 @@ init_bda(void) , E820_RESERVED); // Init extra stack - StackPos = (void*)(&ExtraStack[BUILD_EXTRA_STACK_SIZE] - _datalow_base); + StackPos = (void*)(&ExtraStack[BUILD_EXTRA_STACK_SIZE] - datalow_base); } static void @@ -293,14 +293,14 @@ maininit(void) // Relocation fixup code that runs at new address after relocation complete. static void -afterReloc(void *datalow) +afterReloc(void) { // Running at new code address - do code relocation fixups malloc_fixupreloc(); // Move low-memory initial variable content to new location. - extern u8 datalow_start[], datalow_end[]; - memmove(datalow, datalow_start, datalow_end - datalow_start); + extern u8 datalow_start[], datalow_end[], final_datalow_start[]; + memmove(final_datalow_start, datalow_start, datalow_end - datalow_start); // Run main code maininit(); @@ -331,24 +331,20 @@ reloc_init(void) extern u32 _reloc_init_start[], _reloc_init_end[]; extern u8 code32init_start[], code32init_end[]; extern u32 _reloc_datalow_start[], _reloc_datalow_end[]; - extern u8 _datalow_min_align; - extern u8 datalow_start[], datalow_end[]; + extern u8 datalow_start[], datalow_end[], final_datalow_start[]; // Allocate space for init code. u32 initsize = code32init_end - code32init_start; u32 codealign = (u32)&_reloc_min_align; void *codedest = memalign_tmp(codealign, initsize); - u32 datalowsize = datalow_end - datalow_start; - u32 datalowalign = (u32)&_datalow_min_align; - void *datalow = memalign_low(datalowalign, datalowsize); - if (!codedest || !datalow) + if (!codedest) panic("No space for init relocation.\n"); // Copy code and update relocs (init absolute, init relative, and runtime) dprintf(1, "Relocating low data from %p to %p (size %d)\n" - , datalow_start, datalow, datalowsize); + , datalow_start, final_datalow_start, datalow_end - datalow_start); updateRelocs(code32flat_start, _reloc_datalow_start, _reloc_datalow_end - , datalow - (void*)datalow_start); + , final_datalow_start - datalow_start); dprintf(1, "Relocating init from %p to %p (size %d)\n" , code32init_start, codedest, initsize); s32 delta = codedest - (void*)code32init_start; @@ -358,9 +354,9 @@ reloc_init(void) updateRelocs(code32flat_start, _reloc_init_start, _reloc_init_end, delta); // Call maininit() in relocated code. - void (*func)(void*) = (void*)afterReloc + delta; + void (*func)(void) = (void*)afterReloc + delta; barrier(); - func(datalow); + func(); } // Setup for code relocation and then call reloc_init diff --git a/tools/layoutrom.py b/tools/layoutrom.py index 74b410f..7a7d08c 100755 --- a/tools/layoutrom.py +++ b/tools/layoutrom.py @@ -48,8 +48,6 @@ def setSectionsStart(sections, endaddr, minalign=1, segoffset=0): totspace = alignpos(totspace, section.align) + section.size startaddr = (endaddr - totspace) / minalign * minalign curaddr = startaddr - # out = [(addr, sectioninfo), ...] - out = [] for section in sections: curaddr = alignpos(curaddr, section.align) section.finalloc = curaddr @@ -159,7 +157,7 @@ class LayoutInfo: sections32flat = sec32flat_start = sec32flat_align = None sections32init = sec32init_start = sec32init_align = None sections32low = sec32low_start = sec32low_align = None - datalow_base = None + datalow_base = final_sec32low_start = None # Determine final memory addresses for sections def doLayout(sections, genreloc): @@ -219,13 +217,17 @@ def doLayout(sections, genreloc): li.sections32low = getSectionsCategory(sections, '32low') if genreloc: sec32low_top = li.sec32init_start - datalow_base = min(BUILD_BIOS_ADDR, li.sec32flat_start) - 64*1024 + final_sec32low_top = min(BUILD_BIOS_ADDR, li.sec32flat_start) else: sec32low_top = min(BUILD_BIOS_ADDR, li.sec32init_start) - datalow_base = sec32low_top - 64*1024 + final_sec32low_top = sec32low_top + relocdelta = final_sec32low_top - sec32low_top + datalow_base = final_sec32low_top - 64*1024 li.datalow_base = max(BUILD_ROM_START, alignpos(datalow_base, 2*1024)) li.sec32low_start, li.sec32low_align = setSectionsStart( - li.sections32low, sec32low_top, 16, segoffset=li.datalow_base) + li.sections32low, sec32low_top, 16 + , segoffset=li.datalow_base - relocdelta) + li.final_sec32low_start = li.sec32low_start + relocdelta # Print statistics size16 = BUILD_BIOS_ADDR + BUILD_BIOS_SIZE - li.sec16_start @@ -311,7 +313,7 @@ def getSectionsStart(sections, defaddr=0): def writeLinkerScripts(li, entrysym, genreloc, out16, out32seg, out32flat): # Write 16bit linker script out = outXRefs(li.sections16, useseg=1) + """ - _datalow_base = 0x%x ; + datalow_base = 0x%x ; _datalow_seg = 0x%x ; code16_start = 0x%x ; @@ -352,8 +354,7 @@ def writeLinkerScripts(li, entrysym, genreloc, out16, out32seg, out32flat): initrelocs = getRelocs( li.sections32flat + li.sections32low + li.sections16 + li.sections32seg, category='32init') - lowrelocs = getRelocs( - li.sections16 + li.sections32seg + sections32all, category='32low') + lowrelocs = getRelocs(sections32all, category='32low') relocstr = (strRelocs("_reloc_abs", "code32init_start", absrelocs) + strRelocs("_reloc_rel", "code32init_start", relrelocs) + strRelocs("_reloc_init", "code32flat_start", initrelocs) @@ -363,8 +364,8 @@ def writeLinkerScripts(li, entrysym, genreloc, out16, out32seg, out32flat): out = outXRefs(sections32all) + """ %s = 0x%x ; _reloc_min_align = 0x%x ; - _datalow_base = 0x%x ; - _datalow_min_align = 0x%x ; + datalow_base = 0x%x ; + final_datalow_start = 0x%x ; code32flat_start = 0x%x ; .text code32flat_start : { @@ -385,7 +386,7 @@ def writeLinkerScripts(li, entrysym, genreloc, out16, out32seg, out32flat): """ % (entrysym.name, entrysympos, li.sec32init_align, li.datalow_base, - li.sec32low_align, + li.final_sec32low_start, sec32all_start, relocstr, outRelSections(li.sections32low, 'code32flat_start'), -- 1.7.6.5

1 0

Re: [SeaBIOS] [PATCH] Boot from multiple USB drives as well as an HDD
by Kevin O'Connor June 7, 2012

June 7, 2012

On Thu, Jun 07, 2012 at 01:58:06PM -0600, Steve Goodrich wrote: > This change adds support for multiple USB mass storage devices in the boot > sequence. Previously, only one HDD device (which included both USB and SATA > drives) was allowed in the boot sequence; USB drives were treated as HDDs. > This code allows USB drives to be treated separately from SATA drives. Only > one HDD is allowed to boot (0x80) as has always been the case. However, > multiple USB drives can be tried in the order they are selected in the > Bootlist. I don't understand how this works. The problem with HD booting from anything other than 0x80 is that boot loaders don't know which hard drive to boot from, so they always try drive 0x80. Since USB images use the same boot loaders as hard drives, I don't see how your patch works. [...] > @@ -655,11 +674,15 @@ do_boot(int seq_nr) > break; > case IPL_TYPE_HARDDISK: > printf("Booting from Hard Disk...\n"); > - boot_disk(0x80, 1); > + boot_disk(EXTSTART_HD, 1); > break; > case IPL_TYPE_CDROM: > boot_cdrom((void*)ie->vector); > break; In the above, CDROMs can boot from any drive because the CD booting spec (El-Torito) clearly states the boot loader must use the drive specified in the dl register. > + case IPL_TYPE_USB: > + printf("Booting from USB drive...\n"); > + boot_disk(EXTSTART_USB + USB_Drive_Number++, 1); > + break; This will set the 'dl' register to something (eg, 0xc0), but we can't be sure the boot loader will honor it. So, as far as I understand, this wont work. What images did you test with? -Kevin

1 0

[PATCH] Boot from multiple USB drives as well as an HDD
by Steve Goodrich June 7, 2012

June 7, 2012

This change adds support for multiple USB mass storage devices in the boot sequence. Previously, only one HDD device (which included both USB and SATA drives) was allowed in the boot sequence; USB drives were treated as HDDs. This code allows USB drives to be treated separately from SATA drives. Only one HDD is allowed to boot (0x80) as has always been the case. However, multiple USB drives can be tried in the order they are selected in the Bootlist. This allows the user to have a bootorder which specifies USB, then HDD, then another USB device; the system will attempt to boot the first USB, then the HDD, then the second USB device. I believe this does not violate the BIOS Boot Specification. Signed-off-by: Steve Goodrich <steve.goodrich(a)se-eng.com> --- src/block.c | 19 ++++++++++++++++--- src/blockcmd.c | 8 +++++++- src/boot.c | 29 ++++++++++++++++++++++++++--- src/boot.h | 1 + src/disk.c | 6 ++++-- src/disk.h | 10 +++++++--- 6 files changed, 61 insertions(+), 12 deletions(-) diff --git a/src/block.c b/src/block.c index 44ba9bd..7f973d2 100644 --- a/src/block.c +++ b/src/block.c @@ -16,7 +16,8 @@ u8 FloppyCount VAR16VISIBLE; u8 CDCount; -struct drive_s *IDMap[3][CONFIG_MAX_EXTDRIVE] VAR16VISIBLE; +u8 USBCount; // keep track of USB MSC drives +struct drive_s *IDMap[EXTTYPE_MAX][CONFIG_MAX_EXTDRIVE] VAR16VISIBLE; u8 *bounce_buf_fl VAR16VISIBLE; struct dpte_s DefaultDPTE VARLOW; @@ -235,7 +236,7 @@ map_hd_drive(struct drive_s *drive_g) ASSERT32FLAT(); struct bios_data_area_s *bda = MAKE_FLATPTR(SEG_BDA, 0); int hdid = bda->hdcount; - dprintf(3, "Mapping hd drive %p to %d\n", drive_g, hdid); + dprintf(3, "Mapping hd drive %p to %d: 0x%x\n", drive_g, hdid, EXTSTART_HD + bda->hdcount); add_drive(IDMap[EXTTYPE_HD], &bda->hdcount, drive_g); // Setup disk geometry translation. @@ -249,10 +250,22 @@ map_hd_drive(struct drive_s *drive_g) void map_cd_drive(struct drive_s *drive_g) { - dprintf(3, "Mapping cd drive %p\n", drive_g); + dprintf(3, "Mapping cd drive %p: 0x%x\n", drive_g, EXTSTART_CD + CDCount); add_drive(IDMap[EXTTYPE_CD], &CDCount, drive_g); } +// Map a USB drive +void +map_usb_drive(struct drive_s *drive_g) +{ + dprintf(3, "Mapping usb drive %p: 0x%x\n", drive_g, EXTSTART_USB + USBCount); + add_drive(IDMap[EXTTYPE_USB], &USBCount, drive_g); + + // Setup disk geometry translation. + setup_translation(drive_g); + +} + // Map a floppy void map_floppy_drive(struct drive_s *drive_g) diff --git a/src/blockcmd.c b/src/blockcmd.c index 2dda04d..8deef81 100644 --- a/src/blockcmd.c +++ b/src/blockcmd.c @@ -175,7 +175,13 @@ scsi_init_drive(struct drive_s *drive, const char *s, int prio) char *desc = znprintf(MAXDESCSIZE, "%s Drive %s %s %s" , s, vendor, product, rev); - boot_add_hd(drive, desc, prio); + if (drive->type == DTYPE_USB) { + // add USB drive + boot_add_usb(drive, desc, prio); + } else { + // add standard HDD + boot_add_hd(drive, desc, prio); + } return 0; } diff --git a/src/boot.c b/src/boot.c index 3f6375b..a370e95 100644 --- a/src/boot.c +++ b/src/boot.c @@ -15,7 +15,6 @@ #include "pci.h" //pci_bdf_to_* #include "usb.h" // struct usbdevice_s - /**************************************************************** * Boot priority ordering ****************************************************************/ @@ -229,7 +228,8 @@ static int CheckFloppySig = 1; static int DefaultFloppyPrio = 101; static int DefaultCDPrio = 102; static int DefaultHDPrio = 103; -static int DefaultBEVPrio = 104; +static int DefaultUSBPrio = 104; // insert default USB drive priority +static int DefaultBEVPrio = 105; void boot_setup(void) @@ -282,6 +282,9 @@ static struct bootentry_s *BootList; #define IPL_TYPE_FLOPPY 0x01 #define IPL_TYPE_HARDDISK 0x02 #define IPL_TYPE_CDROM 0x03 +#define IPL_TYPE_PCMCIA 0x04 // add PCMCIA type for completeness +#define IPL_TYPE_USB 0x05 // add USB type for our needs +#define IPL_TYPE_NETWORK 0x06 #define IPL_TYPE_CBFS 0x20 #define IPL_TYPE_BEV 0x80 #define IPL_TYPE_BCV 0x81 @@ -363,6 +366,14 @@ boot_add_hd(struct drive_s *drive_g, const char *desc, int prio) , (u32)drive_g, desc); } +// Add a bootentry for the given USB MSC device +void +boot_add_usb(struct drive_s *drive_g, const char *desc, int prio) +{ + bootentry_add(IPL_TYPE_USB, defPrio(prio, DefaultUSBPrio) + , (u32)drive_g, desc); +} + void boot_add_cd(struct drive_s *drive_g, const char *desc, int prio) { @@ -498,6 +509,10 @@ boot_prep(void) map_hd_drive(pos->drive); add_bev(IPL_TYPE_HARDDISK, 0); break; + case IPL_TYPE_USB: + map_usb_drive(pos->drive); + add_bev(IPL_TYPE_USB, pos->data); + break; case IPL_TYPE_CDROM: map_cd_drive(pos->drive); // NO BREAK @@ -511,6 +526,7 @@ boot_prep(void) // If nothing added a floppy/hd boot - add it manually. add_bev(IPL_TYPE_FLOPPY, 0); add_bev(IPL_TYPE_HARDDISK, 0); + } @@ -636,6 +652,9 @@ boot_fail(void) farcall16big(&br); } +// track the next USB drive from which to boot +int USB_Drive_Number VARLOW = 0; + // Determine next boot method and attempt a boot using it. static void do_boot(int seq_nr) @@ -655,11 +674,15 @@ do_boot(int seq_nr) break; case IPL_TYPE_HARDDISK: printf("Booting from Hard Disk...\n"); - boot_disk(0x80, 1); + boot_disk(EXTSTART_HD, 1); break; case IPL_TYPE_CDROM: boot_cdrom((void*)ie->vector); break; + case IPL_TYPE_USB: + printf("Booting from USB drive...\n"); + boot_disk(EXTSTART_USB + USB_Drive_Number++, 1); + break; case IPL_TYPE_CBFS: boot_cbfs((void*)ie->vector); break; diff --git a/src/boot.h b/src/boot.h index c7c34dc..823bd90 100644 --- a/src/boot.h +++ b/src/boot.h @@ -9,6 +9,7 @@ void boot_add_bcv(u16 seg, u16 ip, u16 desc, int prio); struct drive_s; void boot_add_floppy(struct drive_s *drive_g, const char *desc, int prio); void boot_add_hd(struct drive_s *drive_g, const char *desc, int prio); +void boot_add_usb(struct drive_s *drive_g, const char *desc, int prio); void boot_add_cd(struct drive_s *drive_g, const char *desc, int prio); void boot_add_cbfs(void *data, const char *desc, int prio); void boot_prep(void); diff --git a/src/disk.c b/src/disk.c index 3ca5697..23e038c 100644 --- a/src/disk.c +++ b/src/disk.c @@ -828,9 +828,11 @@ handle_legacy_disk(struct bregs *regs, u8 extdrive) } struct drive_s *drive_g; - if (extdrive >= EXTSTART_CD) + if (extdrive >= EXTSTART_CD) // drive is in CD range? drive_g = getDrive(EXTTYPE_CD, extdrive - EXTSTART_CD); - else + else if (extdrive >= EXTSTART_USB) // drive is in USB-to-CD range? + drive_g = getDrive(EXTTYPE_USB, extdrive - EXTSTART_USB); + else // anything else is HDD drive_g = getDrive(EXTTYPE_HD, extdrive - EXTSTART_HD); if (!drive_g) goto fail; diff --git a/src/disk.h b/src/disk.h index 6776ee6..ba6e52a 100644 --- a/src/disk.h +++ b/src/disk.h @@ -240,10 +240,13 @@ struct drive_s { #define TRANSLATION_RECHS 3 #define EXTTYPE_FLOPPY 0 -#define EXTTYPE_HD 1 -#define EXTTYPE_CD 2 +#define EXTTYPE_HD 1 +#define EXTTYPE_CD 2 +#define EXTTYPE_USB 3 +#define EXTTYPE_MAX 4 // insert new items above; use this for array sizes #define EXTSTART_HD 0x80 +#define EXTSTART_USB 0xC0 #define EXTSTART_CD 0xE0 @@ -252,12 +255,13 @@ struct drive_s { ****************************************************************/ // block.c -extern u8 FloppyCount, CDCount; +extern u8 FloppyCount, CDCount, USBCount; extern u8 *bounce_buf_fl; struct drive_s *getDrive(u8 exttype, u8 extdriveoffset); int getDriveId(u8 exttype, struct drive_s *drive_g); void map_floppy_drive(struct drive_s *drive_g); void map_hd_drive(struct drive_s *drive_g); +void map_usb_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); -- 1.7.9 -- Steve G. Sage Electronic Engineering 201 Terry St., 2nd Floor Longmont, CO 80501 (303) 495-5499 x105

1 0

How do I submit a patch?
by Steve Goodrich June 7, 2012

June 7, 2012

Gentlemen, Can you tell me how I would submit a patch for SeaBIOS? Do I just attach it to an email, or is there a gerrit-like system that I go through? Thanks, -- Steve G.

1 0

Re: [SeaBIOS] [PATCH] seabios: correct setting of datalow_base for large rom images
by Kevin O'Connor June 7, 2012

June 7, 2012

On Tue, Jun 05, 2012 at 12:09:18PM -0400, Jason Baron wrote: > I've been creating 256kb rom images with larger acpi tables for second level > buses. After a recent re-base, my rom images no longer built. Bisected to: > > commit 46b82624c95b951e8825fab117d9352faeae0ec8 > Author: Kevin O'Connor <kevin(a)koconnor.net> > Date: Sun May 13 12:10:30 2012 -0400 > > Add mechanism to declare variables as "low mem" and use for extra stack. > > > Where sec32low_top is greater than datalow_base. Currently, datalow_base is > calculated by subtracting a 64kb offset. Updating it to 128kb, resolved this > issue for me, while still continuing to create smaller rom images as expected. Thanks. The problem causing the build to fail is that negative numbers aren't encoded properly. That's easy to fix, but it quickly uncovers a problem with relocations. Some of the 16bit code has 16bit relocations and those wont be handled right if the integer wraps. I put together a fix (see below) but it's a bit ugly. > --- a/tools/layoutrom.py > +++ b/tools/layoutrom.py > @@ -219,10 +219,10 @@ def doLayout(sections, genreloc): > li.sections32low = getSectionsCategory(sections, '32low') > if genreloc: > sec32low_top = li.sec32init_start > - datalow_base = min(BUILD_BIOS_ADDR, li.sec32flat_start) - 64*1024 > + datalow_base = min(BUILD_BIOS_ADDR, li.sec32flat_start) - 128*1024 Unfortunately this will just break other areas. The datalow_base can only be 64K in size because a real-mode segment can only see 64K. -Kevin diff --git a/src/biosvar.h b/src/biosvar.h index fd2f1bf..0da5a27 100644 --- a/src/biosvar.h +++ b/src/biosvar.h @@ -254,8 +254,8 @@ extern u8 _datalow_seg, _datalow_base[]; #define SEG_LOW ((u32)&_datalow_seg) #if MODESEGMENT -#define GET_LOW(var) GET_FARVAR(SEG_LOW, (var)) -#define SET_LOW(var, val) SET_FARVAR(SEG_LOW, (var), (val)) +#define GET_LOW(var) __GET_FARVAR("addr32 ", SEG_LOW, (var)) +#define SET_LOW(var, val) __SET_FARVAR("addr32 ", SEG_LOW, (var), (val)) #define LOWFLAT2LOW(var) ((typeof(var))((void*)(var) - (u32)_datalow_base)) #else #define GET_LOW(var) (var) diff --git a/src/farptr.h b/src/farptr.h index 3a85c6b..3a6130b 100644 --- a/src/farptr.h +++ b/src/farptr.h @@ -106,13 +106,13 @@ DECL_SEGFUNCS(SS) // Macros for accessing a variable in another segment. (They // automatically update the %es segment and then make the appropriate // access.) -#define __GET_FARVAR(seg, var) ({ \ +#define __GET_FARVAR(prefix, seg, var) ({ \ SET_SEG(ES, (seg)); \ - GET_VAR(ES, (var)); }) -#define __SET_FARVAR(seg, var, val) do { \ - typeof(var) __sfv_val = (val); \ - SET_SEG(ES, (seg)); \ - SET_VAR(ES, (var), __sfv_val); \ + __GET_VAR(prefix, ES, (var)); }) +#define __SET_FARVAR(prefix, seg, var, val) do { \ + typeof(var) __sfv_val = (val); \ + SET_SEG(ES, (seg)); \ + __SET_VAR(prefix, ES, (var), __sfv_val); \ } while (0) // Macros for accesssing a 32bit flat mode pointer from 16bit real @@ -139,8 +139,8 @@ DECL_SEGFUNCS(SS) #if MODESEGMENT == 1 // Definitions when using segmented mode. -#define GET_FARVAR(seg, var) __GET_FARVAR((seg), (var)) -#define SET_FARVAR(seg, var, val) __SET_FARVAR((seg), (var), (val)) +#define GET_FARVAR(seg, var) __GET_FARVAR("", (seg), (var)) +#define SET_FARVAR(seg, var, val) __SET_FARVAR("", (seg), (var), (val)) #define GET_VAR(seg, var) __GET_VAR("", seg, (var)) #define SET_VAR(seg, var, val) __SET_VAR("", seg, (var), (val)) #define SET_SEG(SEG, value) __SET_SEG(SEG, (value)) diff --git a/src/romlayout.S b/src/romlayout.S index 8125277..67b0cc2 100644 --- a/src/romlayout.S +++ b/src/romlayout.S @@ -398,7 +398,7 @@ irqentry_extrastack: pushl %eax movl $_datalow_seg, %eax movl %eax, %ds - movl StackPos, %eax + addr32 movl StackPos, %eax subl $24, %eax popl 0(%eax) // Backup %eax, %ds, %es, %ecx, %edx popw 4(%eax) diff --git a/src/stacks.c b/src/stacks.c index 9381729..890fb58 100644 --- a/src/stacks.c +++ b/src/stacks.c @@ -40,7 +40,7 @@ stack_hop(u32 eax, u32 edx, void *func) // Copy stack seg to %ds/%ss and set %esp "movw %w6, %%ds\n" "movw %w6, %%ss\n" - "movl %5, %%esp\n" + "addr32 movl %5, %%esp\n" "pushl %3\n" "pushl %4\n" // Call func @@ -68,9 +68,9 @@ stack_hop_back(u32 eax, u32 edx, void *func) u32 bkup_stack_pos, temp; asm volatile( // Backup stack_pos and current %ss/%esp - "movl %6, %4\n" + "addr32 movl %6, %4\n" "movw %%ss, %w3\n" - "movl %%esp, %6\n" + "addr32 movl %%esp, %6\n" // Restore original callers' %ss/%esp "movl -4(%4), %5\n" "movl %5, %%ss\n" @@ -81,8 +81,8 @@ stack_hop_back(u32 eax, u32 edx, void *func) // Restore %ss/%esp and stack_pos "movw %w3, %%ds\n" "movw %w3, %%ss\n" - "movl %6, %%esp\n" - "movl %4, %6" + "addr32 movl %6, %%esp\n" + "addr32 movl %4, %6" : "+a" (eax), "+d" (edx), "+c" (func), "=&r" (bkup_ss) , "=&r" (bkup_stack_pos), "=&r" (temp), "+m" (StackPos) : diff --git a/tools/layoutrom.py b/tools/layoutrom.py index 74b410f..c6025ae 100755 --- a/tools/layoutrom.py +++ b/tools/layoutrom.py @@ -48,8 +48,6 @@ def setSectionsStart(sections, endaddr, minalign=1, segoffset=0): totspace = alignpos(totspace, section.align) + section.size startaddr = (endaddr - totspace) / minalign * minalign curaddr = startaddr - # out = [(addr, sectioninfo), ...] - out = [] for section in sections: curaddr = alignpos(curaddr, section.align) section.finalloc = curaddr @@ -261,7 +259,8 @@ def outXRefs(sections, useseg=0): loc = symbol.section.finalloc if useseg: loc = symbol.section.finalsegloc - out += "%s = 0x%x ;\n" % (reloc.symbolname, loc + symbol.offset) + out += "%s = 0x%x ;\n" % ( + reloc.symbolname, (loc + symbol.offset) & 0xffffffff) return out # Write LD script includes for the given sections using relative offsets

2 1

Re: [SeaBIOS] GPT disks in a BIOS world
by Kevin O'Connor June 5, 2012

June 5, 2012

On Tue, Jun 05, 2012 at 10:58:43AM +0200, Fred . wrote: > On Tue, Jun 5, 2012 at 5:21 AM, Kevin O'Connor <kevin(a)koconnor.net> wrote: > > On Mon, Jun 04, 2012 at 07:11:30PM -0700, Ralf A. Quint wrote: > >> At 03:36 PM 6/4/2012, Kevin O'Connor wrote: > >> >On Mon, Jun 04, 2012 at 03:33:05PM +0200, Fred . wrote: > >> >> http://mjg59.dreamwidth.org/8035.html > >> >> > >> >> Does SeaBIOS support GPT disk labels? > >> >> Does SeaBIOS understand GPT disk labels? Is it aware of GPT? > >> > > >> >This is a common misunderstanding of the BIOS. The BIOS doesn't do > >> >anything with partition tables at all (at least according to the > >> >available specs). Thus, the BIOS doesn't care if it's a legacy > >> >partition table or a GPT partition table. > >> > >> Excuse me, but isn't it the BIOS that after POST is initiating the > >> boot process from the active partition? > > > > Not quite. The BIOS loads the first sector of the hard drive (ie, the > > MBR) into memory and runs the code found there. It cares nothing > > about the partition table. It's quite common for the executable code > > in that first sector to analyze the partition table, load yet other > > code, and then jump to that code - but that activity is outside the > > BIOS and is easily upgradable. > > But does GPT disks even have a MBR? > Isn't the GPT a replacement for MBR? > If the disk doesn't have any MBR, does the BIOS load the first sector of GPT? I'm not sure how I could be more clear on this. SeaBIOS cares nothing about the partition table. No BIOS spec (that I'm aware of) requires the BIOS to care anything about the partition table. The BIOS loads the first sector of the hard drive into memory and executes the code found there. GPT partitioned disks do arrange to be able to place boot code in the first sector of the hard drive. The only fundamental limit SeaBIOS has on drive size is a 64bit sector count - this allows for up to 134 million terabytes of disk space (assuming a 512 byte sector). But, even this isn't really a limit - one just needs to be able to locate their bootloader in the first 134million terabytes. -Kevin

3 3

MBR protection?
by Fred . June 5, 2012

June 5, 2012

Does SeaBIOS support MBR protection like commercial BIOS does?

1 0