SeaBIOS

seabios@seabios.org

3783 discussions

Re: [SeaBIOS] [PATCH 1/3] Add multiboot header to bios.bin.raw
by Kevin O'Connor 20 May '15

20 May '15

On Tue, May 19, 2015 at 04:43:49PM +0200, Vladimir 'phcoder' Serbinenko wrote: > Le 19 mai 2015 15:51, "Kevin O'Connor" <kevin(a)koconnor.net> a écrit : > > The _reloc_abs_start definition isn't available if > > CONFIG_RELOCATE_INIT is disabled - I think the symbol you want is > > code32flat_start. Both should be available in a top level ASM32FLAT() > > and in romlayout.S. > > > code32flat-start misses all the relocation entries It shouldn't - take a look at the generated file out/romlayout32flat.lds > > Also, I just noticed in your comments that the bios.bin.raw file was > > used in your example. That's not an exported file today (the build > > could fail while that file still exists). Does multi-boot require a > > raw image to deploy (that is, a single linear area of memory that is > > copied to a final location)? > > > Multiboot can either load ELF or a linear file. In either case the header > needs to be in first 8K of resulting file. File produced by SeaBIOS > contains few hundred kilobytes of zeros. I didn't manage to insert 12 bytes > header in first 8K because of it. I'll give it another try The system linkers tend to do funky things with alignment, which is what causes the .elf files to be huge. I don't know how to fix that. I wouldn't worry about it too much though - something like the below (totally untested) should be fine. -Kevin --- a/Makefile +++ b/Makefile @@ -88,6 +88,7 @@ target-y := target-$(CONFIG_QEMU) += $(OUT)bios.bin target-$(CONFIG_CSM) += $(OUT)Csm16.bin target-$(CONFIG_COREBOOT) += $(OUT)bios.bin.elf +target-$(CONFIG_MULTIBOOT) += $(OUT)bios.bin.multiboot target-$(CONFIG_BUILD_VGABIOS) += $(OUT)vgabios.bin all: $(target-y) @@ -194,6 +195,10 @@ $(OUT)Csm16.bin: $(OUT)bios.bin.prep @echo " Creating $@" $(Q)cp $< $@ +$(OUT)bios.bin.multiboot: $(OUT)rom.o $(OUT)bios.bin.prep + @echo " Creating $@" + $(Q)$(OBJCOPY) -O binary $< $@ + $(OUT)bios.bin.elf: $(OUT)rom.o $(OUT)bios.bin.prep @echo " Creating $@" $(Q)$(STRIP) -R .comment $< -o $(OUT)bios.bin.elf

2 1

Re: [SeaBIOS] [PATCH 1/3] Add multiboot header to bios.bin.raw
by Kevin O'Connor 20 May '15

20 May '15

On Mon, May 18, 2015 at 08:05:17PM +0000, Vladimir 'phcoder' Serbinenko wrote: > > diff --git a/scripts/layoutrom.py b/scripts/layoutrom.py > index dd770fe..04e7efa 100755 > --- a/scripts/layoutrom.py > +++ b/scripts/layoutrom.py > @@ -646,9 +646,10 @@ def main(): > entrysym = symbols['16'].get('entry_csm') > else: > entrysym = symbols['16'].get('reset_vector') > + mb_section = symbols['32flat'].get('mb_head').section > anchorsections = [entrysym.section] + [ > section for section in allsections > - if section.name.startswith('.fixedaddr.')] > + if section.name.startswith('.fixedaddr.')] + [mb_section] > keepsections = findReachable(anchorsections, checkKeep, symbols) > sections = [section for section in allsections if section in keepsections] > > diff --git a/src/fw/coreboot.c b/src/fw/coreboot.c > index 8fd8449..6610b3a 100644 > --- a/src/fw/coreboot.c > +++ b/src/fw/coreboot.c > @@ -551,3 +551,19 @@ cbfs_payload_setup(void) > boot_add_cbfs(cfile->fhdr, desc, bootprio_find_named_rom(filename, 0)); > } > } > + > +void VARLOW > +mb_head(u32 mbptr) > +{ > + asm volatile( > + ".align 4\n" > + "mb_header:\n" > + ".long 0x1BADB002\n" > + ".long 0x00010000\n" > + ".long -(0x1BADB002+0x00010000)\n" > + ".long mb_header\n" > + ".long _reloc_abs_start\n" > + ".long 0\n" > + ".long 0\n" > + ".long entry_elf\n"); > +} Can this header really exist anywhere in the rom file? Is 0x1BADB002 a required signature? If this is just a header, it should not be placed into a function, and it shouldn't be marked with VARLOW. Instead it should be placed in in a top-level assembler (see ASM macro) or in romlayout.S. -Kevin

3 3

Re: [SeaBIOS] [PATCH 3/3] Accept file supplied as multiboot modules
by Kevin O'Connor 20 May '15

20 May '15

On Mon, May 18, 2015 at 08:07:56PM +0000, Vladimir 'phcoder' Serbinenko wrote: > > diff --git a/src/fw/coreboot.c b/src/fw/coreboot.c > index 7815de4..df940cb 100644 > --- a/src/fw/coreboot.c > +++ b/src/fw/coreboot.c > @@ -17,6 +17,7 @@ > #include "stacks.h" // yield > #include "string.h" // memset > #include "util.h" // coreboot_preinit > +#include "multiboot.h" > > > /**************************************************************** > @@ -462,6 +463,67 @@ coreboot_cbfs_init(void) > process_links_file(); > } > > +static int > +extract_filename(char *dest, char *src, size_t lim) > +{ > + char *ptr; > + for (ptr = src; *ptr; ptr++) > + { > + if (!(ptr == src || ptr[-1] == ' ' || ptr[-1] == '\t')) > + continue; This code would need to be in the seabios coding style. > + /* memcmp stops early if it encounters \0 as it doesn't match name=. */ > + if (memcmp(ptr, "name=", 5) == 0) > + { > + int i; > + char *optr = dest; > + for (i = 0, ptr += 5; *ptr && *ptr != ' ' && i < lim; i++) > + *optr++ = *ptr++; > + *optr++ = '\0'; > + return 1; > + } > + } > + return 0; > +} > + > +void > +coreboot_multiboot_init(u32 mbptr) > +{ > + struct multiboot_info *mbi = (void *)mbptr; > + dprintf (1, "mbptr=0x%x\n", mbptr); > + if (mbptr == NO_MULTIBOOT) > + return; > + mbi = (void *)mbptr; > + dprintf (1, "flags=0x%x, mods=0x%x, mods_c=%d\n", mbi->flags, mbi->mods_addr, > + mbi->mods_count); > + if (!(mbi->flags & MULTIBOOT_INFO_MODS)) > + return; > + int i; > + struct multiboot_mod_list *mod = (void *)mbi->mods_addr; > + for (i = 0; i < mbi->mods_count; i++) { > + struct cbfs_romfile_s *cfile; > + u8 *copy; > + u32 len; > + if (!mod[i].cmdline) > + continue; > + len = mod[i].mod_end - mod[i].mod_start; > + cfile = malloc_tmp(sizeof(*cfile)); > + memset(cfile, 0, sizeof(*cfile)); > + dprintf (1, "module %s, size 0x%x\n", (char *)mod[i].cmdline, len); > + if (!extract_filename(cfile->file.name, (char *)mod[i].cmdline, sizeof(cfile->file.name))) > + { > + free (cfile); > + continue; > + } > + dprintf (1, "assigned file name <%s>\n", cfile->file.name); > + cfile->file.size = cfile->rawsize = len; > + copy = malloc_tmp (len); > + memcpy(copy, (void *)mod[i].mod_start, len); > + cfile->file.copy = cbfs_copyfile; > + cfile->data = copy; > + romfile_add(&cfile->file); > + } > +} > + > struct cbfs_payload_segment { > u32 type; > u32 compression; > diff --git a/src/fw/csm.c b/src/fw/csm.c > index 7cdb398..9382aa4 100644 > --- a/src/fw/csm.c > +++ b/src/fw/csm.c > @@ -61,7 +61,7 @@ csm_return(struct bregs *regs) > static void > csm_maininit(struct bregs *regs) > { > - interface_init(); > + interface_init(NO_MULTIBOOT); > pci_probe_devices(); > > csm_compat_table.PnPInstallationCheckSegment = SEG_BIOS; > diff --git a/src/post.c b/src/post.c > index 9ea5620..5585340 100644 > --- a/src/post.c > +++ b/src/post.c > @@ -108,7 +108,7 @@ bda_init(void) > } > > void > -interface_init(void) > +interface_init(u32 mbptr) > { > // Running at new code address - do code relocation fixups > malloc_init(); > @@ -116,6 +116,7 @@ interface_init(void) > // Setup romfile items. > qemu_cfg_init(); > coreboot_cbfs_init(); > + coreboot_multiboot_init(mbptr); > > // Setup ivt/bda/ebda > ivt_init(); > @@ -208,10 +209,10 @@ startBoot(void) > > // Main setup code. > static void > -maininit(void) > +maininit(u32 mbptr) > { > // Initialize internal interfaces. > - interface_init(); > + interface_init(mbptr); > > // Setup platform devices. > platform_hardware_setup(); > @@ -302,7 +303,7 @@ reloc_preinit(void *f, void *arg) > > // Setup for code relocation and then relocate. > void VISIBLE32INIT > -dopost(void) > +dopost(u32 mbptr) > { > // Detect ram and setup internal malloc. > qemu_preinit(); > @@ -310,14 +311,14 @@ dopost(void) > malloc_preinit(); > > // Relocate initialization code and call maininit(). > - reloc_preinit(maininit, NULL); > + reloc_preinit(maininit, (void *) mbptr); > } > > // Entry point for Power On Self Test (POST) - the BIOS initilization > // phase. This function makes the memory at 0xc0000-0xfffff > // read/writable and then calls dopost(). > void VISIBLE32FLAT > -handle_post(void) > +handle_post(u32 mbptr) > { > if (!CONFIG_QEMU && !CONFIG_COREBOOT) > return; > @@ -332,5 +333,5 @@ handle_post(void) > make_bios_writable(); > > // Now that memory is read/writable - start post process. > - dopost(); > + dopost(mbptr); Instead of passing this variable all the way through these initialization functions, I suspect it would be much easier to just stash the value in a global variable in the assembler and then read it from that global in the coreboot.c code. > } > diff --git a/src/romlayout.S b/src/romlayout.S > index 93b6874..071f71b 100644 > --- a/src/romlayout.S > +++ b/src/romlayout.S > @@ -372,6 +372,7 @@ entry_bios32: > DECLFUNC entry_elf > .code32 > entry_elf: > + movl %eax, %ecx > cli > cld > lidtl (BUILD_BIOS_ADDR + pmode_IDT_info) > @@ -383,6 +384,19 @@ entry_elf: > movw %ax, %gs > movw %ax, %ss > movl $BUILD_STACK_ADDR, %esp > + movl $0x2BADB002, %eax > + cmpl %ecx, %eax > + je multiboot Why detect a multiboot entry in entry_elf - wouldn't it be much simpler to point the multiboot header to a new entry_multiboot assembler function? > + xorl %ebx, %ebx > + decl %ebx > +multiboot: > + /* When compiled with -mregparm=1 or higher first argument is in > + %eax, otherwise it's on stack. Support both. > + */ I don't understand this comment - seabios always uses -mregparam=3 and nearly all the assembler entry stubs rely on this. > + movl %ebx, %eax > + pushl %ebx > + /* Fake return address. */ > + pushl %ebx > ljmpl $SEG32_MODE32_CS, $_cfunc32flat_handle_post > .code16 > > diff --git a/src/util.h b/src/util.h > index 704ae0a..e65f0ae 100644 > --- a/src/util.h > +++ b/src/util.h > @@ -90,6 +90,7 @@ void coreboot_platform_setup(void); > void cbfs_payload_setup(void); > void coreboot_preinit(void); > void coreboot_cbfs_init(void); > +void coreboot_multiboot_init(u32 mbptr); > struct cb_header; > void *find_cb_subtable(struct cb_header *cbh, u32 tag); > struct cb_header *find_cb_table(void); > @@ -213,7 +214,8 @@ u16 get_pnp_offset(void); > void pnp_init(void); > > // post.c > -void interface_init(void); > +#define NO_MULTIBOOT 0xffffffff > +void interface_init(u32 mbptr); > void device_hardware_setup(void); > void prepareboot(void); > void startBoot(void); -Kevin

2 2

Re: [SeaBIOS] [PATCH 3/3] Accept file supplied as multiboot modules
by Paolo Bonzini 19 May '15

19 May '15

On 18/05/2015 22:07, Vladimir 'phcoder' Serbinenko wrote: > +void > +coreboot_multiboot_init(u32 mbptr) > +{ > + struct multiboot_info *mbi = (void *)mbptr; > + dprintf (1, "mbptr=0x%x\n", mbptr); > + if (mbptr == NO_MULTIBOOT) > + return; > + mbi = (void *)mbptr; > + dprintf (1, "flags=0x%x, mods=0x%x, mods_c=%d\n", mbi->flags, mbi->mods_addr, > + mbi->mods_count); > + if (!(mbi->flags & MULTIBOOT_INFO_MODS)) > + return; Can you make this dependent on a new Kconfig symbol? Thanks, Paolo

2 3

Re: [SeaBIOS] [PATCH 2/3] Remove fhdr member from cbfs
by Kevin O'Connor 19 May '15

19 May '15

On Mon, May 18, 2015 at 08:06:45PM +0000, Vladimir 'phcoder' Serbinenko wrote: > fhdr is used only to boot other payloads but it isn't actually necesarry > there. Remove it > diff --git a/src/boot.c b/src/boot.c > index d6b1fb7..31dfafd 100644 > --- a/src/boot.c > +++ b/src/boot.c > @@ -660,7 +660,7 @@ boot_cdrom(struct drive_s *drive_g) > > // Boot from a CBFS payload > static void > -boot_cbfs(struct cbfs_file *file) > +boot_cbfs(struct cbfs_romfile_s *file) > { > if (!CONFIG_COREBOOT_FLASH) > return; > diff --git a/src/fw/coreboot.c b/src/fw/coreboot.c > index 6610b3a..7815de4 100644 > --- a/src/fw/coreboot.c > +++ b/src/fw/coreboot.c > @@ -334,7 +334,6 @@ struct cbfs_file { > > struct cbfs_romfile_s { > struct romfile_s file; > - struct cbfs_file *fhdr; > void *data; > u32 rawsize, flags; > }; > @@ -445,7 +444,6 @@ coreboot_cbfs_init(void) > memset(cfile, 0, sizeof(*cfile)); > strtcpy(cfile->file.name, fhdr->filename, sizeof(cfile->file.name)); > cfile->file.size = cfile->rawsize = be32_to_cpu(fhdr->len); > - cfile->fhdr = fhdr; > cfile->file.copy = cbfs_copyfile; > cfile->data = (void*)fhdr + be32_to_cpu(fhdr->offset); > int len = strlen(cfile->file.name); > @@ -484,12 +482,12 @@ struct cbfs_payload { > }; > > void > -cbfs_run_payload(struct cbfs_file *fhdr) > +cbfs_run_payload(struct cbfs_romfile_s *cbfs) > { This is not correct. The 'struct cbfs_file' is allocated with malloc_tmp() - the contents of which are not valid once the post phase ends. More details are available at: http://seabios.org/Memory_Model -Kevin

2 1

[PATCH 3/3] Accept file supplied as multiboot modules
by Vladimir 'phcoder' Serbinenko 19 May '15

19 May '15

1 0

[PATCH 2/3] Remove fhdr member from cbfs
by Vladimir 'phcoder' Serbinenko 19 May '15

19 May '15

fhdr is used only to boot other payloads but it isn't actually necesarry there. Remove it

1 0

[PATCH 1/3] Add multiboot header to bios.bin.raw
by Vladimir 'phcoder' Serbinenko 19 May '15

19 May '15

1 0

[PATCH 0/3] Add multiboot support to SeaBIOS
by Vladimir 'phcoder' Serbinenko 19 May '15

19 May '15

Hello, all. I've been successfully using SeaBIOS as secondary bootloader. In more details I have GRUB2-as-payload in flash together with coreboot. SeaBIOS binary is on the HDD and loaded by GRUB when needed. This has an unfortunate consequence that I have to keep vga oprom in flash even if usually I boot without it. The following series of patches make bios.bin.raw multiboot executable with files passed as modules. Example: menuentry "SeaBIOS (mb)" --unrestricted { root=ahci0,2 multiboot /bios.bin.raw module /vgabios_x230.rom name=pci8086,0166.rom } the parameter name= specifies under which name SeaBIOS will see it.

1 0

Re: [SeaBIOS] Intend to flash a Toshiba PS460C-013PM to secure erase the locked Toshiba MK3018GAS HD
by Paul Dufresne 17 May '15

17 May '15

I pushed it just a bit farther. I downloaded dmidecode.exe from http://www.bttr-software.de/ports/ and added it to my FreeDOS floppy. It probably help that FreeDOS supports long file names because dmidecode is 9 characters (8 being the normal DOS limit). The message is the same on the laptop: Open DMI pipe failed! But on my P4 ICH4 desktop, it works now. Also, after reading: http://www.flashrom.org/Laptops I am less enclined to try. I did install latest BIOS with Toshiba flash program... the file being 512.25Kb, which suggest a 128 bytes header to study... not feeling like trying.

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS