SeaBIOS May 2015

seabios@seabios.org

17 participants
36 discussions

Start a nNew thread

Jenkins build is back to normal : seabios #161
by Jenkins Build Host 22 May '15

22 May '15

See <http://jenkins.xeni.kraxel.org:8080/job/seabios/161/>

1 0

Build failed in Jenkins: seabios #160
by Jenkins Build Host 22 May '15

22 May '15

See <http://jenkins.xeni.kraxel.org:8080/job/seabios/160/changes> Changes: [kevin] ahci: Ignore max_ports. [kevin] Link rom.o with -N option. [kevin] Add an implementation of a TPM TIS driver [kevin] Implementation of the TCG BIOS extensions [kevin] Support for BIOS interrupt handler [kevin] make SeaBios compatible with Xen vTPM. ------------------------------------------ [...truncated 99 lines...] * * Restart config... * * * General Features * Build Target 1. Build for coreboot (COREBOOT) (NEW) > 2. Build for QEMU/Xen/KVM/Bochs (QEMU) 3. Build as Compatibilty Support Module for EFI BIOS (CSM) (NEW) choice[1-3]: Support Xen HVM (XEN) [N/y/?] n Parallelize hardware init (THREADS) [Y/n/?] (NEW) Copy init code to high memory (RELOCATE_INIT) [Y/n/?] (NEW) Bootmenu (BOOTMENU) [Y/n/?] (NEW) Graphical boot splash screen (BOOTSPLASH) [Y/n/?] (NEW) Boot ordering (BOOTORDER) [Y/n/?] (NEW) Use internal stack for 16bit interrupt entry points (ENTRY_EXTRASTACK) [Y/n/?] (NEW) Allocate memory that needs to be in first Meg above 0xc0000 (MALLOC_UPPERMEMORY) [Y/n/?] (NEW) ROM size (in KB) (ROM_SIZE) [128] 128 * * Hardware support * ATA controllers (ATA) [Y/n/?] (NEW) ATA DMA (ATA_DMA) [N/y/?] (NEW) ATA 32bit PIO (ATA_PIO32) [N/y/?] (NEW) AHCI controllers (AHCI) [Y/n/?] (NEW) SD controllers (SDCARD) [N/y/?] n virtio-blk controllers (VIRTIO_BLK) [Y/n/?] (NEW) virtio-scsi controllers (VIRTIO_SCSI) [Y/n/?] (NEW) PVSCSI controllers (PVSCSI) [Y/n/?] (NEW) AMD PCscsi controllers (ESP_SCSI) [Y/n/?] (NEW) lsi53c895a scsi controllers (LSI_SCSI) [Y/n/?] (NEW) LSI MegaRAID SAS controllers (MEGASAS) [Y/n/?] (NEW) Floppy controller (FLOPPY) [Y/n/?] (NEW) PS/2 port (PS2PORT) [Y/n/?] (NEW) USB (USB) [Y/n/?] (NEW) USB UHCI controllers (USB_UHCI) [Y/n/?] (NEW) USB OHCI controllers (USB_OHCI) [N/y/?] n USB EHCI controllers (USB_EHCI) [Y/n/?] (NEW) USB XHCI controllers (USB_XHCI) [N/y/?] n USB drives (USB_MSC) [Y/n/?] (NEW) UAS drives (USB_UAS) [N/y/?] n USB hubs (USB_HUB) [Y/n/?] (NEW) USB keyboards (USB_KEYBOARD) [Y/n/?] (NEW) USB mice (USB_MOUSE) [Y/n/?] (NEW) Serial port (SERIAL) [Y/n/?] (NEW) Parallel port (LPT) [Y/n/?] (NEW) System Management Mode (SMM) (USE_SMM) [Y/n/?] (NEW) Initialize MTRRs (MTRR_INIT) [Y/n/?] (NEW) Use ACPI timer (PMTIMER) [Y/n/?] (NEW) * * BIOS interfaces * Drive interface (DRIVES) [Y/n/?] (NEW) DVD/CDROM booting (CDROM_BOOT) [Y/n/?] (NEW) DVD/CDROM boot drive emulation (CDROM_EMU) [Y/n/?] (NEW) PCIBIOS interface (PCIBIOS) [Y/n/?] (NEW) APM interface (APMBIOS) [Y/n/?] (NEW) PnP BIOS interface (PNPBIOS) [Y/n/?] (NEW) Option ROMS (OPTIONROMS) [Y/n/?] (NEW) Option roms are already at 0xc0000-0xf0000 (OPTIONROMS_DEPLOYED) [N/y/?] (NEW) PMM interface (PMM) [Y/n/?] (NEW) Boot interface (BOOT) [Y/n/?] (NEW) Keyboard interface (KEYBOARD) [Y/n/?] (NEW) Keyboard hook interface (KBD_CALL_INT15_4F) [Y/n/?] (NEW) Mouse interface (MOUSE) [Y/n/?] (NEW) S3 resume (S3_RESUME) [Y/n/?] (NEW) Hardware specific VGA helpers (VGAHOOKS) [Y/n/?] (NEW) Disable A20 (DISABLE_A20) [N/y/?] (NEW) Make unused UMB memory read/writeable. (WRITABLE_UPPERMEMORY) [N/y/?] (NEW) TPM support and TCG BIOS extensions (TCGBIOS) [Y/n/?] (NEW) * * BIOS Tables * PIR table (PIRTABLE) [Y/n/?] (NEW) MPTable (MPTABLE) [Y/n/?] (NEW) SMBIOS (SMBIOS) [Y/n/?] (NEW) ACPI (ACPI) [Y/n/?] (NEW) Include default ACPI DSDT (ACPI_DSDT) [Y/n/?] (NEW) Load BIOS tables from ROM files (FW_ROMFILE_LOAD) [Y/n/?] (NEW) * * VGA ROM * VGA Hardware Type > 1. None (NO_VGABIOS) (NEW) 2. QEMU/Bochs Original IBM 256K VGA (VGA_STANDARD_VGA) (NEW) 3. QEMU/Bochs Cirrus SVGA (VGA_CIRRUS) (NEW) 4. QEMU/Bochs VBE SVGA (VGA_BOCHS) (NEW) 5. GeodeGX2 (VGA_GEODEGX2) (NEW) 6. GeodeLX (VGA_GEODELX) (NEW) choice[1-6]: Fixup assembler to work with broken emulators (VGA_FIXUP_ASM) [Y/n/?] (NEW) * * Debugging * Debug level (DEBUG_LEVEL) [1] (NEW) Serial port debugging (DEBUG_SERIAL) [N/y/?] (NEW) Special IO port debugging (DEBUG_IO) [Y/n/?] (NEW) # # configuration written to <http://jenkins.xeni.kraxel.org:8080/job/seabios/ws/rpmbuild/rpm/BUILD/seabi…> # + make Build Kconfig config file Compile checking out/src/misc.o Compile checking out/src/stacks.o Compile checking out/src/output.o Compile checking out/src/string.o Compile checking out/src/block.o Compile checking out/src/cdrom.o Compile checking out/src/disk.o Compile checking out/src/mouse.o Compile checking out/src/kbd.o Compile checking out/src/system.o Compile checking out/src/serial.o Compile checking out/src/clock.o Compile checking out/src/resume.o Compile checking out/src/pnpbios.o Compile checking out/src/vgahooks.o Compile checking out/src/pcibios.o Compile checking out/src/apm.o Compile checking out/src/hw/pci.o Compile checking out/src/hw/timer.o Compile checking out/src/hw/rtc.o Compile checking out/src/hw/dma.o Compile checking out/src/hw/pic.o Compile checking out/src/hw/ps2port.o Compile checking out/src/hw/serialio.o Compile checking out/src/hw/usb.o Compile checking out/src/hw/usb-uhci.o Compile checking out/src/hw/usb-ohci.o Compile checking out/src/hw/usb-ehci.o Compile checking out/src/hw/usb-hid.o Compile checking out/src/hw/usb-msc.o Compile checking out/src/hw/usb-uas.o Compile checking out/src/hw/blockcmd.o Compile checking out/src/hw/floppy.o Compile checking out/src/hw/ata.o Compile checking out/src/hw/ramdisk.o Compile checking out/src/hw/virtio-ring.o Compile checking out/src/hw/virtio-pci.o Compile checking out/src/hw/virtio-blk.o Compile checking out/src/hw/virtio-scsi.o Compile checking out/src/hw/lsi-scsi.o Compile checking out/src/hw/esp-scsi.o Compile checking out/src/hw/megasas.o Compile checking out/src/post.o Compile checking out/src/memmap.o Compile checking out/src/malloc.o Compile checking out/src/romfile.o Compile checking out/src/x86.o Compile checking out/src/optionroms.o Compile checking out/src/pmm.o Compile checking out/src/font.o Compile checking out/src/boot.o Compile checking out/src/bootsplash.o Compile checking out/src/jpeg.o Compile checking out/src/bmp.o Compile checking out/src/tcgbios.o Compile checking out/src/sha1.o Compile checking out/src/hw/ahci.o Compile checking out/src/hw/pvscsi.o Compile checking out/src/hw/usb-xhci.o Compile checking out/src/hw/usb-hub.o Compile checking out/src/hw/sdcard.o Compile checking out/src/fw/coreboot.o Compile checking out/src/fw/lzmadecode.o Compile checking out/src/fw/csm.o Compile checking out/src/fw/biostables.o Compile checking out/src/fw/paravirt.o Compile checking out/src/fw/shadow.o Compile checking out/src/fw/pciinit.o Compile checking out/src/fw/smm.o Compile checking out/src/fw/smp.o Compile checking out/src/fw/mtrr.o Compile checking out/src/fw/xen.o Compiling IASL out/src/fw/acpi-dsdt.hex ASL Input: out/src/fw/acpi-dsdt.dsl.i - 474 lines, 19153 bytes, 315 keywords AML Output: out/src/fw/acpi-dsdt.aml - 4405 bytes, 159 named objects, 156 executable opcodes Listing File: out/src/fw/acpi-dsdt.lst - 142998 bytes Hex Dump: out/src/fw/acpi-dsdt.hex - 41661 bytes Compilation complete. 0 Errors, 0 Warnings, 0 Remarks, 245 Optimizations Compiling IASL out/src/fw/ssdt-proc.hex ASL Input: out/src/fw/ssdt-proc.dsl.i - 35 lines, 762 bytes, 8 keywords AML Output: out/src/fw/ssdt-proc.aml - 120 bytes, 6 named objects, 2 executable opcodes Listing File: out/src/fw/ssdt-proc.lst - 2651 bytes Hex Dump: out/src/fw/ssdt-proc.hex - 1459 bytes Compilation complete. 0 Errors, 0 Warnings, 0 Remarks, 0 Optimizations Compiling IASL out/src/fw/ssdt-pcihp.hex ASL Input: out/src/fw/ssdt-pcihp.dsl.i - 36 lines, 758 bytes, 5 keywords AML Output: out/src/fw/ssdt-pcihp.aml - 87 bytes, 5 named objects, 0 executable opcodes Listing File: out/src/fw/ssdt-pcihp.lst - 2347 bytes Hex Dump: out/src/fw/ssdt-pcihp.hex - 1160 bytes Compilation complete. 0 Errors, 0 Warnings, 0 Remarks, 0 Optimizations Compiling IASL out/src/fw/ssdt-misc.hex ASL Input: out/src/fw/ssdt-misc.dsl.i - 101 lines, 2567 bytes, 35 keywords AML Output: out/src/fw/ssdt-misc.aml - 354 bytes, 24 named objects, 11 executable opcodes Listing File: out/src/fw/ssdt-misc.lst - 7656 bytes Hex Dump: out/src/fw/ssdt-misc.hex - 3710 bytes Compilation complete. 0 Errors, 0 Warnings, 0 Remarks, 2 Optimizations Compiling IASL out/src/fw/q35-acpi-dsdt.hex ASL Input: out/src/fw/q35-acpi-dsdt.dsl.i - 514 lines, 28284 bytes, 413 keywords AML Output: out/src/fw/q35-acpi-dsdt.aml - 7344 bytes, 239 named objects, 174 executable opcodes Listing File: out/src/fw/q35-acpi-dsdt.lst - 255960 bytes Hex Dump: out/src/fw/q35-acpi-dsdt.hex - 69190 bytes Compilation complete. 0 Errors, 0 Warnings, 0 Remarks, 445 Optimizations Compile checking out/src/fw/acpi.o Compile checking out/src/fw/mptable.o Compile checking out/src/fw/pirtable.o Compile checking out/src/fw/smbios.o Compile checking out/src/fw/romfile_loader.o Compile checking out/src/hw/tpm_drivers.o Compiling whole program out/ccode32flat.o Compiling whole program out/code32seg.o Compiling whole program out/ccode16.o Compiling to assembler out/src/asm-offsets.s Generating offset file out/asm-offsets.h Compiling (16bit) out/romlayout.o Building ld scripts Version: 1.8.0-32.b160.g6764395-20150522_120824-jenkins.xeni.kraxel.org Fixed space: 0xe05b-0x10000 total: 8101 slack: 13 Percent slack: 0.2% 16bit size: 35000 32bit segmented size: 2127 32bit flat size: 24905 32bit flat init size: 64304 Lowmem size: 2176 f-segment var size: 1200 Linking out/rom16.o Stripping out/rom16.strip.o Linking out/rom32seg.o Stripping out/rom32seg.strip.o Linking out/rom.o Prepping out/bios.bin.prep Error! ROM doesn't fit (133560 > 131072) You have to either increase the size (CONFIG_ROM_SIZE) or turn off some features (such as hardware support not needed) to make it fit. Trying a more recent gcc version might work too. make: *** [out/bios.bin.prep] Error 1 error: Bad exit status from /var/tmp/rpm-tmp.LzqBn6 (%build) RPM build errors: Bad exit status from /var/tmp/rpm-tmp.LzqBn6 (%build) Build step 'Execute shell' marked build as failure Archiving artifacts

1 0

USB/xHCI device detection issues
by Matt DeVillier 22 May '15

22 May '15

Greetings, my Haswell ChromeBox users are still reporting intermittent issues with USB device detection at boot on SeaBIOS 1.81, with both the stock/google firmware and my coreboot builds (the ChromeBox only has xHCI ports). The most common problem is that the USB device fails to be listed in the boot menu; far less common is the device being listed but failing to boot. Finally got one of them to provide a cbmem log, which I had done at level 7. Looks like the device (a Sandisk Cruser flash drive) reported 'medium not present', which to me doesn't make sense for a flash drive. Would appreciate any insight, the log is at http://pastebin.com/Ujj0WRwA cheers, Matt

2 2

Re: [SeaBIOS] [PATCH v10 3/6] Support for BIOS interrupt handler
by Stefan Berger 22 May '15

22 May '15

On 04/30/2015 09:21 AM, Xu, Quan wrote: > > Stefan, > Sorry to reply so late to you. I try to make it compatible with Xen vTPM by below patch > Against your serious of patch(https://github.com/KevinOConnor/seabios/tree/tcg-testing ). > Also I have tested this patch, which is working. Thanks. > > > ### >>> patch > commit 2c556064695b0a979adb4039f13db1b29a19d3cf > Author: Quan Xu <quan.xu(a)intel.com> > Date: Thu Apr 30 19:43:04 2015 -0400 > > make SeaBios compatible with Xen vTPM. > > Signed-off-by: Quan Xu <quan.xu(a)intel.com> > > diff --git a/src/tcgbios.c b/src/tcgbios.c > index c837ab6..4cda800 100644 > --- a/src/tcgbios.c > +++ b/src/tcgbios.c > @@ -23,7 +23,7 @@ > #include "std/acpi.h" // RSDP_SIGNATURE, rsdt_descriptor > #include "bregs.h" // struct bregs > #include "sha1.h" // sha1 > - > +#include "fw/paravirt.h" // runningOnXen > > static const u8 Startup_ST_CLEAR[2] = { 0x00, TPM_ST_CLEAR }; > static const u8 Startup_ST_STATE[2] = { 0x00, TPM_ST_STATE }; > @@ -494,6 +494,8 @@ tpm_start(void) > return 0; > > tpm_acpi_init(); > + if (runningOnXen()) > + return 0; > > return tpm_startup(); > } > > ### <<< patch > Kevin, I think this should be good to add after 3/6 ? Stefan

3 2

[PATCH v3 1/2] Link rom.o with -N option.
by Vladimir 'φ-coder/phcoder' Serbinenko 21 May '15

21 May '15

This option tells linker not to align sections in a way optimied for OS. ls -lh out/bios.bin.elf -rwxr-xr-x 1 phcoder phcoder 90K Mai 19 20:38 out/bios.bin.elf Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a4d945c..3ee61af 100644 --- a/Makefile +++ b/Makefile @@ -177,7 +177,7 @@ $(OUT)rom32seg.o: $(OUT)code32seg.o $(OUT)romlayout32seg.lds $(OUT)rom.o: $(OUT)rom16.strip.o $(OUT)rom32seg.strip.o $(OUT)code32flat.o $(OUT)romlayout32flat.lds @echo " Linking $@" - $(Q)$(LD) -T $(OUT)romlayout32flat.lds $(OUT)rom16.strip.o $(OUT)rom32seg.strip.o $(OUT)code32flat.o -o $@ + $(Q)$(LD) -N -T $(OUT)romlayout32flat.lds $(OUT)rom16.strip.o $(OUT)rom32seg.strip.o $(OUT)code32flat.o -o $@ $(OUT)bios.bin.prep: $(OUT)rom.o scripts/checkrom.py @echo " Prepping $@" -- 2.1.4

2 1

[PATCH] ahci: Ignore max_ports.
by Vladimir 'φ-coder/phcoder' Serbinenko 21 May '15

21 May '15

At least AHCI on Intel on some machines claim to support only 6 ports while in fact higher port numbers are present and work. This is needed to access CD-ROM on PackardBell MS2290. Both GRUB and Linux have a similar workaround. Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- src/hw/ahci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hw/ahci.c b/src/hw/ahci.c index ff5d5f9..3193d81 100644 --- a/src/hw/ahci.c +++ b/src/hw/ahci.c @@ -601,7 +601,7 @@ ahci_controller_setup(struct pci_device *pci) dprintf(2, "AHCI: cap 0x%x, ports_impl 0x%x\n", ctrl->caps, ctrl->ports); - max = ctrl->caps & 0x1f; + max = 0x1f; for (pnr = 0; pnr <= max; pnr++) { if (!(ctrl->ports & (1 << pnr))) continue; -- 2.1.4

2 1

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

19 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 19 May '15

19 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 19 May '15

19 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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS May 2015