SeaBIOS May 2020

seabios@seabios.org

9 participants
15 discussions

[PATCH 1/3] boot: Extend `etc/show-boot-menu` to configure skipping boot menu with only one device

by Paul Menzel

Concerns were raised, that skipping the boot menu, if only one device is present might make debugging issues more difficult. So, extend the current runtime configuration option `etc/show-boot-menu` by enabling this feature by setting it to 2. Fixes: 29ee1fb8 ("Skip boot menu and timeout with only one boot device") Signed-off-by: Paul Menzel <pmenzel(a)molgen.mpg.de> --- docs/Runtime_config.md | 2 +- src/boot.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/Runtime_config.md b/docs/Runtime_config.md index 6747e2a..5795382 100644 --- a/docs/Runtime_config.md +++ b/docs/Runtime_config.md @@ -173,7 +173,7 @@ There are several additional configuration options available in the | Filename | Description |---------------------|--------------------------------------------------- -| show-boot-menu | Controls the display of the boot menu. Set to 0 to disable the boot menu. +| show-boot-menu | Controls the display of the boot menu. Valid values are 0: Disable the boot menu, 1: Display boot menu unconditionally, 2: Skip boot menu if only one device is present. The default is 1. | boot-menu-message | Customize the text boot menu message. Normally, when in text mode SeaBIOS will report the string "\\nPress ESC for boot menu.\\n\\n". This field allows the string to be changed. (This is a string field, and is added as a file containing the raw string.) | boot-menu-key | Controls which key activates the boot menu. The value stored is the DOS scan code (eg, 0x86 for F12, 0x01 for Esc). If this field is set, be sure to also customize the **boot-menu-message** field above. | boot-menu-wait | Amount of time (in milliseconds) to wait at the boot menu prompt before selecting the default boot. diff --git a/src/boot.c b/src/boot.c index 4f12988..595cd77 100644 --- a/src/boot.c +++ b/src/boot.c @@ -666,12 +666,13 @@ void interactive_bootmenu(void) { // XXX - show available drives? + u64 show_boot_menu = romfile_loadint("etc/show-boot-menu", 1); - if (! CONFIG_BOOTMENU || !romfile_loadint("etc/show-boot-menu", 1)) + if (! CONFIG_BOOTMENU || show_boot_menu != 0) return; // skip menu if only one boot device and no TPM - if ((NULL == BootList.first->next) && !tpm_can_show_menu()) { + if ((show_boot_menu == 2) && (NULL == BootList.first->next) && !tpm_can_show_menu()) { printf("\n"); return; } -- 2.26.2

1 year, 2 months

[PATCH v3 0/9] virtio-mmio support and acpi dsdt parser

by Gerd Hoffmann

Hi, This series adds virtio-mmio support and an acpi dsdt parser (for device discovery) to seabios. v3: * one more parser tweak. v2: * various acpi parser tweaks. * move parser to separate src file. * reorganize virtio-mmio probing a bit. take care, Gerd Gerd Hoffmann (9): virtio-mmio: device probing and initialization. virtio-mmio: add support to vp_*() functions virtio-mmio: add support for scsi devices. virtio-mmio: add support for block devices. virtio-mmio: print device type acpi: add xsdt support acpi: add dsdt parser acpi: skip kbd init if not present acpi: find and register virtio-mmio devices Makefile | 4 +- src/hw/virtio-blk.h | 1 + src/hw/virtio-mmio.h | 77 +++++ src/hw/virtio-pci.h | 1 + src/hw/virtio-scsi.h | 1 + src/std/acpi.h | 11 + src/util.h | 13 + src/boot.c | 19 ++ src/fw/biostables.c | 49 +++- src/fw/dsdt_parser.c | 668 +++++++++++++++++++++++++++++++++++++++++++ src/fw/paravirt.c | 7 +- src/hw/ps2port.c | 4 + src/hw/virtio-blk.c | 71 +++++ src/hw/virtio-mmio.c | 97 +++++++ src/hw/virtio-pci.c | 68 ++++- src/hw/virtio-scsi.c | 73 ++++- src/Kconfig | 7 + 17 files changed, 1135 insertions(+), 36 deletions(-) create mode 100644 src/hw/virtio-mmio.h create mode 100644 src/fw/dsdt_parser.c create mode 100644 src/hw/virtio-mmio.c -- 2.18.2

1 year, 2 months

[PATCH 1/3] qemu: factor out qemu_cfg_detect()

by Gerd Hoffmann

Move qemu fw_cfg detection to separate function. No functional change. Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com> --- src/fw/paravirt.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/fw/paravirt.c b/src/fw/paravirt.c index 119280c574fd..b21f1aef1c7f 100644 --- a/src/fw/paravirt.c +++ b/src/fw/paravirt.c @@ -614,10 +614,10 @@ struct QemuCfgFile { char name[56]; }; -void qemu_cfg_init(void) +static int qemu_cfg_detect(void) { - if (!runningOnQEMU()) - return; + if (cfg_enabled) + return 1; // Detect fw_cfg interface. qemu_cfg_select(QEMU_CFG_SIGNATURE); @@ -625,7 +625,7 @@ void qemu_cfg_init(void) int i; for (i = 0; i < 4; i++) if (inb(PORT_QEMU_CFG_DATA) != sig[i]) - return; + return 0; dprintf(1, "Found QEMU fw_cfg\n"); cfg_enabled = 1; @@ -638,6 +638,16 @@ void qemu_cfg_init(void) dprintf(1, "QEMU fw_cfg DMA interface supported\n"); cfg_dma_enabled = 1; } + return 1; +} + +void qemu_cfg_init(void) +{ + if (!runningOnQEMU()) + return; + + if (!qemu_cfg_detect()) + return; // Populate romfiles for legacy fw_cfg entries qemu_cfg_legacy(); -- 2.18.4

1 year, 2 months

[PATCH v2] build: use -fcf-protection=none when available

by Christian Ehrhardt

Some hardened gcc v9 compilers (such as the one in Ubuntu) default this option which for seabios leads to emulation errors when running in KVM (does not trigger in TCG) on older intel chips of the Penryn generation (~2006-2008). The symptom appears as endbr32/endbr64 interpretation failures and in KVM it looks like: KVM internal error. Suberror: 1 emulation failure EAX=00000000 EBX=00000000 ECX=000086d4 EDX=00000000 ESI=00000000 EDI=00000000 EBP=000086d4 ESP=00006d7c EIP=00007acf EFL=00000002 [-------] CPL=0 II=0 A20=1 SMM=0 HLT=0 ES =0000 00000000 ffffffff 00809300 CS =f000 000f0000 ffffffff 00809b00 SS =0000 00000000 ffffffff 00809300 DS =0000 00000000 ffffffff 00809300 FS =0000 00000000 ffffffff 00809300 GS =0000 00000000 ffffffff 00809300 LDT=0000 00000000 0000ffff 00008200 TR =0000 00000000 0000ffff 00008b00 GDT= 000f6200 00000037 IDT= 00000000 000003ff CR0=00000010 CR2=00000000 CR3=00000000 CR4=00000000 DR0=0000000000000000 DR1=0000000000000000 DR2=0000000000000000 DR3=0000000000000000 DR6=00000000ffff0ff0 DR7=0000000000000400 EFER=0000000000000000 Code=b8 90 d9 00 00 66 e8 6b f7 ff ff 66 b8 0a 00 00 00 e9 61 f2 <f3> 0f 1e fb 66 57 66 56 66 53 66 53 66 89 c7 67 66 89 14 24 66 89 ce 66 e8 15 f8 ff ff 88 URL: https://bugs.launchpad.net/ubuntu/+source/qemu/+bug/1866870 Signed-off-by: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 5f7d5370..9e8188e5 100644 --- a/Makefile +++ b/Makefile @@ -69,6 +69,7 @@ COMMONCFLAGS += $(call cc-option,$(CC),-fno-stack-protector,) COMMONCFLAGS += $(call cc-option,$(CC),-fno-stack-protector-all,) COMMONCFLAGS += $(call cc-option,$(CC),-fstack-check=no,) COMMONCFLAGS += $(call cc-option,$(CC),-Wno-address-of-packed-member,) +COMMONCFLAGS += $(call cc-option,$(CC),-fcf-protection=none,) COMMA := , CFLAGS32FLAT := $(COMMONCFLAGS) -DMODE16=0 -DMODESEGMENT=0 -- 2.25.1

1 year, 2 months

[PATCH] vgaentry.S: Add missing SHF_ALLOC flag to .rom.header

by Fangrui Song

It does not make sense to reference a SHF_ALLOC section from a non-SHF_ALLOC section via R_386_PC16. Conceptually, even if a non-SHF_ALLOC is loaded as part of the memory image, the distance between it and a SHF_ALLOC section may not be a constant, so the linker cannot reasonably resolve the relocation. GNU ld allows it but lld will warn. Add the SHF_ALLOC flag. Signed-off-by: Fangrui Song <maskray(a)google.com> --- vgasrc/vgaentry.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vgasrc/vgaentry.S b/vgasrc/vgaentry.S index f9624fc..93f28f9 100644 --- a/vgasrc/vgaentry.S +++ b/vgasrc/vgaentry.S @@ -14,7 +14,7 @@ * Rom Header ****************************************************************/ - .section .rom.header + .section .rom.header,"a" .code16 .global _rom_header, _rom_header_size, _rom_header_checksum _rom_header: -- 2.26.2.526.g744177e7f7-goog

1 year, 2 months

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS May 2020