SeaBIOS

seabios@seabios.org

6 participants
3610 discussions

[PATCH] tcgbios: Fix details in log entries

by Stefan Berger

Fix two details of the logs: - Set the field 'SpecErrata' to 2 as required by specs. - Write the separator into the log entry's event field. Signed-off-by: Stefan Berger <stefanb(a)linux.ibm.com> --- src/tcgbios.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/tcgbios.c b/src/tcgbios.c index 82894f5..4150aa0 100644 --- a/src/tcgbios.c +++ b/src/tcgbios.c @@ -274,7 +274,7 @@ tpm20_write_EfiSpecIdEventStruct(void) .hdr.platformClass = TPM_TCPA_ACPI_CLASS_CLIENT, .hdr.specVersionMinor = 0, .hdr.specVersionMajor = 2, - .hdr.specErrata = 0, + .hdr.specErrata = 2, .hdr.uintnSize = 2, }; @@ -1016,7 +1016,8 @@ tpm_add_event_separators(void) u32 pcrIndex; for (pcrIndex = 0; pcrIndex <= 7; pcrIndex++) tpm_add_measurement_to_log(pcrIndex, EV_SEPARATOR, - NULL, 0, + (const char *)evt_separator, + sizeof(evt_separator), evt_separator, sizeof(evt_separator)); } -- 2.31.1

3 days, 6 hours

[PATCH v4 0/2] fix PS/2 keyboard initialization failures

by Volker Rümelin

Hi, I wrote a few patches for qemu [1] and patch 10/11 exposes a bug in seabios. Sometimes the PS/2 keyboard initialization fails and seabios doesn't detect the keyboard. This patch fixes the PS/2 keyboard initialization. I wouldn't be surprised if my patch also fixes PS/2 keyboard initialization problems on bare metal. A few bug reports look very similar to what I see on my computer with qemu. With best regards, Volker v2: Kevin suggested to call check_irqs() in run_thread(). v3: Add a new patch to fix the asm constraints in run_thread(). The changes are required for the next patch. Kevin suggested to call check_irqs() after the new thread ran in run_thread(). Fixed an error in the commit message. Call check_irqs() after switch_next() in yield(). v4: Drop the patch to fix the asm constraints in run_thread(). Rename cur to edx in the asm constraints in run_thread() to make it clear that edx is clobbered after the asm statement. Volker Rümelin (2): stacks: call check_irqs() in run_thread() stacks: call check_irqs() after switch_next() src/stacks.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) -- 2.26.2

3 days, 8 hours

[PATCH v3 0/3] fix PS/2 keyboard initialization failures

by Volker Rümelin

Hi, I wrote a few patches for qemu [1] and patch 10/11 exposes a bug in seabios. Sometimes the PS/2 keyboard initialization fails and seabios doesn't detect the keyboard. This patch fixes the PS/2 keyboard initialization. I wouldn't be surprised if my patch also fixes PS/2 keyboard initialization problems on bare metal. A few bug reports look very similar to what I see on my computer with qemu. With best regards, Volker v2: Kevin suggested to call check_irqs() in run_thread(). v3: Add a new patch to fix the asm constraints in run_thread(). The changes are required for the next patch. Kevin suggested to call check_irqs() after the new thread ran in run_thread(). Fixed an error in the commit message. Call check_irqs() after switch_next() in yield(). [1]https://lists.nongnu.org/archive/html/qemu-devel/2021-05/msg02152.html Volker Rümelin (3): stacks: fix asm constraints in run_thread() stacks: call check_irqs() in run_thread() stacks: call check_irqs() after switch_next() src/stacks.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) -- 2.26.2

1 week, 1 day

[PATCH v3] Increate BUILD_MIN_BIOSTABLE for large roms

by Gerd Hoffmann

BUILD_MIN_BIOSTABLE reserves space in the f-segment. Some data structures -- for example disk drives known to seabios -- must be stored there, so the space available here limits the number of devices seabios is able to manage. This patch sets BUILD_MIN_BIOSTABLE to 8k for bios images being 256k or larger in size. 32bit code is moved off in that case, so we have more room in the f-segment then. Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com> --- scripts/layoutrom.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/layoutrom.py b/scripts/layoutrom.py index 6616721d1b58..abebf0211fa9 100755 --- a/scripts/layoutrom.py +++ b/scripts/layoutrom.py @@ -651,6 +651,10 @@ def main(): # Read kconfig config file config = scanconfig(cfgfile) + # larger roms have more room in the f-segment due to moving out 32bit code + if config.get('CONFIG_ROM_SIZE') >= 256: + BUILD_MIN_BIOSTABLE = 8192 + # Figure out which sections to keep. allsections = info16[0] + info32seg[0] + info32flat[0] symbols = {'16': info16[1], '32seg': info32seg[1], '32flat': info32flat[1]} -- 2.31.1

1 week, 1 day

[PATCH 0/1] stacks: disable NMIs during state restore on call32_post()

by Heitor Alves de Siqueira

Hi all, We've had reports of users hitting KVM emulation failures in certain workloads and were able to track down a missing NMI_DISABLE_BIT in call32_post() when accessing CMOS ports. This patch disables NMIs on state restore, following other accesses to CMOS_PORT_INDEX throughout the seabios code. Heitor Alves de Siqueira (1): stacks: fix missing NMI_DISABLE_BIT on call32_post() src/stacks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.31.1

1 week, 4 days

[PATCH 0/2] nvme fixes

by Gerd Hoffmann

Gerd Hoffmann (2): nvme: improve namespace allocation nvme: drive desc should not include the newline src/hw/nvme-int.h | 1 - src/hw/nvme.c | 44 ++++++++++++++++++-------------------------- 2 files changed, 18 insertions(+), 27 deletions(-) -- 2.31.1

1 week, 4 days

[PATCH v2] make BUILD_MIN_BIOSTABLE configurable

by Gerd Hoffmann

BUILD_MIN_BIOSTABLE reserves space in the f-segment. Some data structures -- for example disk drives known to seabios -- must be stored there, so the space available here limits the number of devices seabios is able to manage. This patch adds an config option for BUILD_MIN_BIOSTABLE so the size of the reservation can be configured at build time. Default is 8k for bios images being 256k or larger in size (32bit code is moved off then so we have more room in the f-segment), 2k (current value) otherwise. Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com> --- Makefile | 2 +- scripts/layoutrom.py | 3 ++- src/Kconfig | 7 +++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3d8943ef5f25..ddcd1dff399d 100644 --- a/Makefile +++ b/Makefile @@ -172,7 +172,7 @@ $(OUT)romlayout16.lds: $(OUT)ccode32flat.o $(OUT)code32seg.o $(OUT)ccode16.o $(O $(Q)$(OBJDUMP) -thr $(OUT)code32flat.o > $(OUT)code32flat.o.objdump $(Q)$(OBJDUMP) -thr $(OUT)code32seg.o > $(OUT)code32seg.o.objdump $(Q)$(OBJDUMP) -thr $(OUT)code16.o > $(OUT)code16.o.objdump - $(Q)$(PYTHON) ./scripts/layoutrom.py $(OUT)code16.o.objdump $(OUT)code32seg.o.objdump $(OUT)code32flat.o.objdump $(OUT)$(KCONFIG_AUTOHEADER) $(OUT)romlayout16.lds $(OUT)romlayout32seg.lds $(OUT)romlayout32flat.lds + $(Q)$(PYTHON) ./scripts/layoutrom.py $(OUT)code16.o.objdump $(OUT)code32seg.o.objdump $(OUT)code32flat.o.objdump $(OUT)$(KCONFIG_AUTOHEADER) $(OUT)romlayout16.lds $(OUT)romlayout32seg.lds $(OUT)romlayout32flat.lds $(CONFIG_MIN_BIOSTABLE) # These are actually built by scripts/layoutrom.py above, but by pulling them # into an extra rule we prevent make -j from spawning layoutrom.py 4 times. diff --git a/scripts/layoutrom.py b/scripts/layoutrom.py index 6616721d1b58..94deca9fcc85 100755 --- a/scripts/layoutrom.py +++ b/scripts/layoutrom.py @@ -636,7 +636,8 @@ def scanconfig(file): def main(): # Get output name - in16, in32seg, in32flat, cfgfile, out16, out32seg, out32flat = sys.argv[1:] + in16, in32seg, in32flat, cfgfile, out16, out32seg, out32flat, biostable = sys.argv[1:] + BUILD_MIN_BIOSTABLE = biostable * 1024 # Read in the objdump information infile16 = open(in16, 'r') diff --git a/src/Kconfig b/src/Kconfig index 3a8ffa15fded..95519fc50fa3 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -140,6 +140,13 @@ endchoice it into 128 KB (which was big enouth for a long time) you'll probably have to disable some featues such as xhci support. + config MIN_BIOSTABLE + int "biostable size (in KB)" + default 8 if ROM_SIZE >= 256 + default 2 + help + Memory space for BIOS tables in f-segment. + endmenu menu "Hardware support" -- 2.31.1

2 weeks, 2 days

[PATCH v2 0/1] fix PS/2 keyboard initialization failures

by Volker Rümelin

2 weeks, 3 days

[PATCH] vgasrc/vgalayout.lds.S: ignore .node.gnu.property (binutils-2.36 support)

by Sergei Trofimovich

From: Sergei Trofimovich <slyfox(a)gentoo.org> Modern binutils unconditionally tracks x86_64 ISA levels in intermediate files in .note.gnu.property. Custom liker script does not handle the section and complains about it: ld --gc-sections -T out/vgasrc/vgalayout.lds out/vgaccode16.o \ out/vgaentry.o out/vgaversion.o -o out/vgarom.o ld: section .note.gnu.property LMA [0000000000000000,0000000000000027] \ overlaps section .text LMA [0000000000000000,00000000000098af] The change ignores .note.gnu.property section. Signed-off-by: Sergei Trofimovich <slyfox(a)gentoo.org> --- vgasrc/vgalayout.lds.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vgasrc/vgalayout.lds.S b/vgasrc/vgalayout.lds.S index 533734d..e17d89e 100644 --- a/vgasrc/vgalayout.lds.S +++ b/vgasrc/vgalayout.lds.S @@ -19,5 +19,5 @@ SECTIONS // Discard regular data sections to force a link error if // 16bit code attempts to access data not marked with VAR16. - /DISCARD/ : { *(.text*) *(.rodata*) *(.data*) *(.bss*) *(COMMON) } + /DISCARD/ : { *(.text*) *(.rodata*) *(.data*) *(.bss*) *(COMMON) *(.note.gnu.property) } } -- 2.31.1

2 weeks, 3 days

[PATCH] fw/coreboot.c: Use coreboot table to find cbfs

by Arthur Heymans

The "cbfs master header" cbfs file is considered a legacy feature in coreboot and is planned for removal in the master branch. Since 2015 the coreboot tables have exported info about the active cbfs. This change uses the cbfs information in the coreboot tables instead of following the cbfs master header pointer in the bootblock to find cbfs. This change makes it possible to access CBFS fmap regions that don't feature a "cbfs master header", which is the case with Googles VBOOT solution. This breaks compatibility with very old coreboot build (build before fb5d5b16 "2015-07-14, cbtable: describe boot media"). Keeping backward compatibility with the "cbfs master header" would complicate the code. Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz> diff --git a/src/Kconfig b/src/Kconfig index 3a8ffa1..51ba827 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -93,15 +93,6 @@ endchoice help Support CBFS files compressed using the lzma decompression algorithm. - config CBFS_LOCATION - depends on COREBOOT_FLASH - hex "CBFS memory end location" - default 0 - help - Memory address of where the CBFS data ends. This should - be zero for normal builds. It may be a non-zero value if - the CBFS filesystem is at a non-standard location (eg, - 0xffe00000 if CBFS ends 2Meg below the end of flash). config MULTIBOOT depends on COREBOOT diff --git a/src/fw/coreboot.c b/src/fw/coreboot.c index 7c0954b..8a35c1d 100644 --- a/src/fw/coreboot.c +++ b/src/fw/coreboot.c @@ -88,6 +88,18 @@ struct cbmem_console { #define CBMC_OVERFLOW (1 << 31) static struct cbmem_console *cbcon = NULL; +#define CB_TAG_BOOT_MEDIA_PARAMS 0x30 + +struct cb_boot_media_params { + u32 tag; + u32 size; + /* offsets are relative to start of boot media */ + u64 fmap_offset; + u64 cbfs_offset; + u64 cbfs_size; + u64 boot_media_size; +}; + static u16 ipchksum(char *buf, int count) { @@ -146,7 +158,12 @@ find_cb_subtable(struct cb_header *cbh, u32 tag) struct cb_header * find_cb_table(void) { - struct cb_header *cbh = find_cb_header(0, 0x1000); + static struct cb_header *cbh; + + if (cbh) + return cbh; + + cbh= find_cb_header(0, 0x1000); if (!cbh) return NULL; struct cb_forward *cbf = find_cb_subtable(cbh, CB_TAG_FORWARD); @@ -317,20 +334,8 @@ ulzma(u8 *dst, u32 maxlen, const u8 *src, u32 srclen) * Coreboot flash format ****************************************************************/ -#define CBFS_HEADER_MAGIC 0x4F524243 -#define CBFS_VERSION1 0x31313131 - -struct cbfs_header { - u32 magic; - u32 version; - u32 romsize; - u32 bootblocksize; - u32 align; - u32 offset; - u32 pad[2]; -} PACKED; - #define CBFS_FILE_MAGIC 0x455649484352414cLL // LARCHIVE +#define CBFS_ALIGNMENT 64 struct cbfs_file { u64 magic; @@ -429,30 +434,50 @@ coreboot_cbfs_init(void) if (!CONFIG_COREBOOT_FLASH) return; - struct cbfs_header *hdr = *(void **)(CONFIG_CBFS_LOCATION - 4); - if ((u32)hdr & 0x03) { - dprintf(1, "Invalid CBFS pointer %p\n", hdr); + dprintf(3, "Attempting to initialize coreboot cbfs\n"); + + struct cb_header *cbh = find_cb_table(); + if (!cbh) { + dprintf(1, "cbfs_init: unable to find cb table\n"); return; } - if (CONFIG_CBFS_LOCATION && (u32)hdr > CONFIG_CBFS_LOCATION) - // Looks like the pointer is relative to CONFIG_CBFS_LOCATION - hdr = (void*)hdr + CONFIG_CBFS_LOCATION; - if (hdr->magic != cpu_to_be32(CBFS_HEADER_MAGIC)) { - dprintf(1, "Unable to find CBFS (ptr=%p; got %x not %x)\n" - , hdr, hdr->magic, cpu_to_be32(CBFS_HEADER_MAGIC)); + + struct cb_boot_media_params *cbbmp = + find_cb_subtable(cbh, CB_TAG_BOOT_MEDIA_PARAMS); + + if (!cbbmp) { + dprintf(1, "cbfs_init: unable to find boot media params\n"); return; } - dprintf(1, "Found CBFS header at %p\n", hdr); - u32 romsize = be32_to_cpu(hdr->romsize); - u32 romstart = CONFIG_CBFS_LOCATION - romsize; - struct cbfs_file *fhdr = (void*)romstart + be32_to_cpu(hdr->offset); + const u32 romsize = cbbmp->boot_media_size; + const u32 cbfs_start = cbbmp->cbfs_offset - romsize; + const u32 cbfs_end = cbfs_start + cbbmp->cbfs_size - 1; + + dprintf(3, "cbfs_init: cbfs_start=0x%08x, cbfs_end=0x%08x\n", cbfs_start, + cbfs_end); + + u32 offset = cbfs_start; + for (;;) { - if ((u32)fhdr - romstart > romsize) - break; - u64 magic = fhdr->magic; - if (magic != CBFS_FILE_MAGIC) + if (offset > cbfs_end || offset < cbfs_start) break; + + struct cbfs_file *fhdr = (void*)offset; + + if (fhdr->magic != CBFS_FILE_MAGIC) { + offset++; + offset = ALIGN(offset, CBFS_ALIGNMENT); + continue; + } + + /* Skip empty space */ + if (strcmp(fhdr->filename, "") == 0) { + offset += ALIGN(be32_to_cpu(fhdr->offset) + be32_to_cpu(fhdr->len) + , CBFS_ALIGNMENT); + continue; + } + struct cbfs_romfile_s *cfile = malloc_tmp(sizeof(*cfile)); if (!cfile) { warn_noalloc(); @@ -473,8 +498,8 @@ coreboot_cbfs_init(void) } romfile_add(&cfile->file); - fhdr = (void*)ALIGN((u32)cfile->data + cfile->rawsize - , be32_to_cpu(hdr->align)); + offset = ALIGN((u32)cfile->data + cfile->rawsize + , CBFS_ALIGNMENT); } process_links_file(); -- 2.30.2

2 weeks, 3 days

Jump to page:

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS