SeaBIOS

seabios@seabios.org

2 participants
3799 discussions

[SEABIOS] [PATCH] usb.c: Fix devices using non-primary interface descriptor
by Matt DeVillier 25 Sep '20

25 Sep '20

From 38f63fcd9b646d6a4eac30f0476bbaee611211ce Mon Sep 17 00:00:00 2001 From: Matt DeVillier <matt.devillier(a)puri.sm> Date: Fri, 11 Sep 2020 12:54:21 -0500 Subject: [PATCH] usb.c: Fix devices using non-primary interface descriptor A fair number of USB devices (keyboards in particular) use an interface descriptor other than the first available, making them non-functional currently. To correct this, iterate through all available interface descriptors until one with the correct class/subclass is found, then proceed to set the configuration and setup the driver. Tested on an ultimate hacking keyboard (UHK 60) Signed-off-by: Matt DeVillier <matt.devillier(a)puri.sm> --- src/hw/usb.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/src/hw/usb.c b/src/hw/usb.c index 4f9a852..38a866a 100644 --- a/src/hw/usb.c +++ b/src/hw/usb.c @@ -248,14 +248,14 @@ get_device_config(struct usb_pipe *pipe) if (ret) return NULL; - void *config = malloc_tmphigh(cfg.wTotalLength); + struct usb_config_descriptor *config = malloc_tmphigh(cfg.wTotalLength); if (!config) { warn_noalloc(); return NULL; } req.wLength = cfg.wTotalLength; ret = usb_send_default_control(pipe, &req, config); - if (ret) { + if (ret || config->wTotalLength != cfg.wTotalLength) { free(config); return NULL; } @@ -367,13 +367,24 @@ configure_usb_device(struct usbdevice_s *usbdev) return 0; // Determine if a driver exists for this device - only look at the - // first interface of the first configuration. + // interfaces of the first configuration. + int num_iface = config->bNumInterfaces; + void *config_end = (void*)config + config->wTotalLength; struct usb_interface_descriptor *iface = (void*)(&config[1]); - if (iface->bInterfaceClass != USB_CLASS_HID - && iface->bInterfaceClass != USB_CLASS_MASS_STORAGE - && iface->bInterfaceClass != USB_CLASS_HUB) - // Not a supported device. - goto fail; + for (;;) { + if (!num_iface-- || (void*)iface + iface->bLength > config_end) + // Not a supported device. + goto fail; + if (iface->bDescriptorType == USB_DT_INTERFACE + && (iface->bInterfaceClass == USB_CLASS_HUB + || (iface->bInterfaceClass == USB_CLASS_MASS_STORAGE + && (iface->bInterfaceProtocol == US_PR_BULK + || iface->bInterfaceProtocol == US_PR_UAS)) + || (iface->bInterfaceClass == USB_CLASS_HID + && iface->bInterfaceSubClass == USB_INTERFACE_SUBCLASS_BOOT))) + break; + iface = (void*)iface + iface->bLength; + } // Set the configuration. ret = set_configuration(usbdev->defpipe, config->bConfigurationValue); -- 2.20.1

2 1

[PATCH] smbios: avoid integer overflow adding SMBIOS type 0 table
by Daniel P. Berrangé 25 Sep '20

25 Sep '20

SeaBIOS implements the SMBIOS 2.1 entry point which is limited to a maximum length of 0xffff. If the SMBIOS data received from QEMU is large enough, then adding the type 0 table will cause integer overflow. This results in fun behaviour such as a KVM crash, or hangs in SeaBIOS. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/fw/biostables.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/fw/biostables.c b/src/fw/biostables.c index 0c07833..794b5be 100644 --- a/src/fw/biostables.c +++ b/src/fw/biostables.c @@ -462,10 +462,16 @@ smbios_romfile_setup(void) /* common case: add our own type 0, with 3 strings and 4 '\0's */ u16 t0_len = sizeof(struct smbios_type_0) + strlen(BIOS_NAME) + strlen(VERSION) + strlen(BIOS_DATE) + 4; - ep.structure_table_length += t0_len; - if (t0_len > ep.max_structure_size) - ep.max_structure_size = t0_len; - ep.number_of_structures++; + if (t0_len > (0xffff - ep.structure_table_length)) { + dprintf(1, "Insufficient space (%d bytes) to add SMBIOS type 0 table (%d bytes)\n", + 0xffff - ep.structure_table_length, t0_len); + need_t0 = 0; + } else { + ep.structure_table_length += t0_len; + if (t0_len > ep.max_structure_size) + ep.max_structure_size = t0_len; + ep.number_of_structures++; + } } /* allocate final blob and record its address in the entry point */ -- 2.26.2

3 4

Regression with latest SeaBIOS booting multi-disk root LVs?
by Stefan Reiter 22 Sep '20

22 Sep '20

Hi list, since SeaBIOS 1.14.0 (QEMU 5.1) VMs with LVM root disks spanning more than one PV fail to boot, if only the first is set as bootable. I believe this is due to the changes in SeaBIOS only initializing drives marked as 'bootable' by QEMU. One fix is to mark all disks containing root data as bootable, but existing setups will still break on upgrade (where only the disk containing the bootloader is marked). This is not ideal. Discovered by a user in our bugtracker: https://bugzilla.proxmox.com/show_bug.cgi?id=3011 and verified by installing Ubuntu 20.04 w/ LVM and GRUB on virtio-scsi, then expanding the LV to a second disk. I found that just reverting SeaBIOS to 1.13.0 makes it work again, same guest install, even with QEMU 5.1. Is this intended behaviour? A bug in GRUB? Any fix or workaround? ~ Stefan

3 3

[SEABIOS] [PATCH] usb-hid: Fix keyboards using non-primary interface descriptor
by Matt DeVillier 07 Sep '20

07 Sep '20

From 9e408a5441330b120a477324c017c0525cb5b365 Mon Sep 17 00:00:00 2001 From: Matt DeVillier <matt.devillier(a)puri.sm> Date: Tue, 1 Sep 2020 01:21:23 -0500 Subject: [PATCH] usb-hid: Fix keyboards using non-primary interface descriptor A fair number of USB keyboards use an interface descriptor other than the first available, making them non-functional currently. To correct this, iterate through all available interface descriptors until one with the correct class/subclass is found, then call usb_hid_setup(). Tested on an ultimate hacking keyboard (UHK 60) Signed-off-by: Matt DeVillier <matt.devillier(a)puri.sm> --- src/hw/usb-hid.c | 9 ++------- src/hw/usb.c | 17 +++++++++++++++-- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/hw/usb-hid.c b/src/hw/usb-hid.c index a22765b..c1ceaba 100644 --- a/src/hw/usb-hid.c +++ b/src/hw/usb-hid.c @@ -138,11 +138,6 @@ usb_hid_setup(struct usbdevice_s *usbdev) return -1; dprintf(2, "usb_hid_setup %p\n", usbdev->defpipe); - struct usb_interface_descriptor *iface = usbdev->iface; - if (iface->bInterfaceSubClass != USB_INTERFACE_SUBCLASS_BOOT) - // Doesn't support boot protocol. - return -1; - // Find intr in endpoint. struct usb_endpoint_descriptor *epdesc = usb_find_desc( usbdev, USB_ENDPOINT_XFER_INT, USB_DIR_IN); @@ -151,9 +146,9 @@ usb_hid_setup(struct usbdevice_s *usbdev) return -1; } - if (iface->bInterfaceProtocol == USB_INTERFACE_PROTOCOL_KEYBOARD) + if (usbdev->iface->bInterfaceProtocol == USB_INTERFACE_PROTOCOL_KEYBOARD) return usb_kbd_setup(usbdev, epdesc); - if (iface->bInterfaceProtocol == USB_INTERFACE_PROTOCOL_MOUSE) + if (usbdev->iface->bInterfaceProtocol == USB_INTERFACE_PROTOCOL_MOUSE) return usb_mouse_setup(usbdev, epdesc); return -1; } diff --git a/src/hw/usb.c b/src/hw/usb.c index 4f9a852..aea70a5 100644 --- a/src/hw/usb.c +++ b/src/hw/usb.c @@ -391,8 +391,21 @@ configure_usb_device(struct usbdevice_s *usbdev) ret = usb_msc_setup(usbdev); if (iface->bInterfaceProtocol == US_PR_UAS) ret = usb_uas_setup(usbdev); - } else - ret = usb_hid_setup(usbdev); + } else { + // Some keyboards use an interface other than the first one + // so iterate through all available + for (int i=0; i<config->bNumInterfaces; i++) { + if (iface->bInterfaceClass == USB_CLASS_HID && + iface->bInterfaceSubClass == USB_INTERFACE_SUBCLASS_BOOT) { + usbdev->iface = iface; + ret = usb_hid_setup(usbdev); + break; + } else { + iface = (void*)iface + iface->bLength; + ret = -1; + } + } + } if (ret) goto fail; -- 2.20.1

2 8

[ANNOUNCE] SeaBIOS 1.14.0
by Kevin O'Connor 10 Aug '20

10 Aug '20

The 1.14.0 version of SeaBIOS has now been released. For more information on the release, please see: http://seabios.org/Releases New in this release: * New virtio MMIO support. Support for finding virtio MMIO devices via an ACPI DSDT parser. Support for handling a large number of virtio devices. * Improved handling of USB keyboards with non-standard packet size. * Improved KVM CPU frequency detection. * Support for PCI mmconfig support on QEMU. * Several bug fixes and code cleanups. For information on obtaining SeaBIOS, please see: http://seabios.org/Download ===== git shortlog -n rel-1.13.0..rel-1.14.0 ===== Gerd Hoffmann (25): boot: cache HALT priority virtio-scsi: skip initializing non-bootable devices nvme: skip initializing non-bootable devices timer: add tsctimer_setfreq() kvm: detect unconditionally kvm: add support for reading tsc frequency via cpuid. kvm: add support for reading tsc frequency from kvmclock sercon: vbe modeset is int 10h function 4f02 not 4f00 pci: factor out ioconfig_cmd() pci: add mmconfig support qemu: factor out qemu_cfg_detect() qemu: rework e820 detection qemu: check rtc presence before reading cpu count from cmos 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 rewrap Makefile lines. pci: fix mmconfig support vga: fix cirrus bios Kevin O'Connor (6): usb-hid: Improve max packet size checking Revert "ps2port: adjust init routine to fix PS/2 keyboard issues" boot: Fixup check for only one item in boot list vgabios: Fix preserve memory flag in handle_1000 ldnoexec: Add script to remove ET_EXEC flag from intermediate build objects docs: Note v1.14.0 release Paul Menzel (5): std/tcg: Replace zero-length array with flexible-array member boot: Extend `etc/show-boot-menu` to configure skipping boot menu with only one device boot: Log, if boot menu is skipped cdrom: Demote `scsi_is_ready` return print to debug level nvme: Increase `nvme_cmd_readwrite()` message log level from 3 to 5 Matt DeVillier (4): hw/usb-hid: Don't abort if setting key repeat rate fails Skip boot menu and timeout with only one boot device ps2port: adjust init routine to fix PS/2 keyboard issues boot: Fix logic for boot menu display Stefan Berger (3): tcgbios: Only write logs for PCRs that are in active PCR banks tcgbios: Fix the vendorInfoSize to be of type u8 tcgbios: Add support for SHA3 type of algorithms Alexey Kirillov (2): boot: Detect strict boot order (HALT record) in function virtio: Do not init non-bootable devices Christian Ehrhardt (1): build: use -fcf-protection=none when available Jason Andryuk (1): serialio: Preserve Xen DebugOutputPort Roman Bolshakov (1): timer: Handle decrements of PIT counter Stefan Reiter (1): virtio-scsi: fix boot prio detection by using correct lun

1 0

release planning
by Gerd Hoffmann 28 Jul '20

28 Jul '20

Hi, qemu 5.1 is coming closer, with freeze in a week and release in August. See https://wiki.qemu.org/Planning/5.1 We'll need a new seabios release for qemu 5.1, and the options we have are: (1) cherry-pick bugfixes (at least the cirrus vga fix, probably more) into 1.13-stable, tag a 1.13.1 stable release. (2) tag a 1.14 release from master branch. Given we have several useful changes in the master branch which I would not consider being bugfixes a 1.14 released would be nice. Freeze in a week and release in three weeks should work fine with the qemu release schedule. What do you think? take care, Gerd

3 7

[PATCH v2] virtio-scsi: fix boot prio detection by using correct lun
by Stefan Reiter 28 Jul '20

28 Jul '20

Commits d6bdb85eb0 virtio-scsi: skip initializing non-bootable devices f82e82a5ab2 virtio-mmio: add support for scsi devices. both use the lun value from tmpl_drv, which is always 0, instead of the correct one passed as a separate parameter. This causes systems where LUNs other than 0 are set as bootable, but 0 is not, to not boot. Reviewed-by: Paul Menzel <pmenzel(a)molgen.mpg.de> Signed-off-by: Stefan Reiter <s.reiter(a)proxmox.com> --- v2: * sep*a*rate :) * collect Paul's R-b src/hw/virtio-scsi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/hw/virtio-scsi.c b/src/hw/virtio-scsi.c index 59f1c65..369c981 100644 --- a/src/hw/virtio-scsi.c +++ b/src/hw/virtio-scsi.c @@ -126,14 +126,14 @@ virtio_scsi_add_lun(u32 lun, struct drive_s *tmpl_drv) int prio = -1; if (tmpl_vlun->pci) - prio = bootprio_find_scsi_device(tmpl_vlun->pci, tmpl_vlun->target, tmpl_vlun->lun); + prio = bootprio_find_scsi_device(tmpl_vlun->pci, tmpl_vlun->target, lun); if (tmpl_vlun->mmio) - prio = bootprio_find_scsi_mmio_device(tmpl_vlun->mmio, tmpl_vlun->target, tmpl_vlun->lun); + prio = bootprio_find_scsi_mmio_device(tmpl_vlun->mmio, tmpl_vlun->target, lun); if (skip_nonbootable && prio < 0) { dprintf(1, "skipping init of a non-bootable virtio-scsi dev at %s," " target %d, lun %d\n", - tmpl_vlun->name, tmpl_vlun->target, tmpl_vlun->lun); + tmpl_vlun->name, tmpl_vlun->target, lun); return -1; } -- 2.20.1

2 1

[PATCH] hw/nvme: Increase `nvme_cmd_readwrite()` message log level from 3 to 5
by Paul Menzel 28 Jul '20

28 Jul '20

Currently, setting SeaBIOS debug level to 3, the log is filled with messages like below. ns 1 read lba 11346288+8: 0 ns 1 read lba 11346296+4: 0 ns 1 read lba 11346300+4: 0 ns 1 read lba 11346304+8: 0 ns 1 read lba 11346312+8: 0 ns 1 read lba 11346320+8: 0 ns 1 read lba 11346328+8: 0 ns 1 read lba 11346336+8: 0 With SeaBIOS as coreboot payload, this fills up the CBMEM console buffer. So, increase the debug level to 5, so possible console buffer do not overflow. Signed-off-by: Paul Menzel <pmenzel(a)molgen.mpg.de> --- src/hw/nvme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hw/nvme.c b/src/hw/nvme.c index 41f3b76..6a01204 100644 --- a/src/hw/nvme.c +++ b/src/hw/nvme.c @@ -669,7 +669,7 @@ nvme_cmd_readwrite(struct nvme_namespace *ns, struct disk_op_s *op, int write) } res = nvme_io_readwrite(ns, op->lba + i, ns->dma_buffer, blocks, write); - dprintf(3, "ns %u %s lba %llu+%u: %d\n", ns->ns_id, write ? "write" + dprintf(5, "ns %u %s lba %llu+%u: %d\n", ns->ns_id, write ? "write" : "read", op->lba + i, blocks, res); -- 2.26.2

3 2

[PATCHv2] ldnoexec: Add script to remove ET_EXEC flag from intermediate build objects
by Kevin O'Connor 28 Jul '20

28 Jul '20

Add a script to remove the ET_EXEC flag from the 16bit and "32bit segmented" intermediate objects. This avoids build failures with some linkers that will not allow linking these objects again. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> -- v2: Use python instead of python2 in the script header --- Makefile | 9 +++++---- scripts/ldnoexec.py | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 4 deletions(-) create mode 100755 scripts/ldnoexec.py diff --git a/Makefile b/Makefile index c20be15..3d8943e 100644 --- a/Makefile +++ b/Makefile @@ -127,9 +127,10 @@ $(Q)printf '$(foreach i,$2,#include "$i"\n)' > $3.tmp.c $(Q)$(CC) -I. $1 $(CFLAGSWHOLE) -c $3.tmp.c -o $3 endef -%.strip.o: %.o +%.noexec.o: %.o @echo " Stripping $@" - $(Q)$(STRIP) $< -o $@ + $(Q)$(STRIP) $< -o $<.strip.o + $(Q)$(PYTHON) ./scripts/ldnoexec.py $<.strip.o $@ $(OUT)%.s: %.c @echo " Compiling to assembler $@" @@ -185,9 +186,9 @@ $(OUT)rom32seg.o: $(OUT)code32seg.o $(OUT)romlayout32seg.lds @echo " Linking $@" $(Q)$(LD) -T $(OUT)romlayout32seg.lds $< -o $@ -$(OUT)rom.o: $(OUT)rom16.strip.o $(OUT)rom32seg.strip.o $(OUT)code32flat.o $(OUT)romlayout32flat.lds +$(OUT)rom.o: $(OUT)rom16.noexec.o $(OUT)rom32seg.noexec.o $(OUT)code32flat.o $(OUT)romlayout32flat.lds @echo " Linking $@" - $(Q)$(LD) -N -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.noexec.o $(OUT)rom32seg.noexec.o $(OUT)code32flat.o -o $@ $(OUT)bios.bin.prep: $(OUT)rom.o scripts/checkrom.py @echo " Prepping $@" diff --git a/scripts/ldnoexec.py b/scripts/ldnoexec.py new file mode 100755 index 0000000..6d4e14b --- /dev/null +++ b/scripts/ldnoexec.py @@ -0,0 +1,32 @@ +#!/usr/bin/env python +# Script to remove EXEC flag from an ELF file +# +# Copyright (C) 2020 Kevin O'Connor <kevin(a)koconnor.net> +# +# This file may be distributed under the terms of the GNU GPLv3 license. +import os, optparse, sys + +FLAG_OFFSET = 16 + +def main(): + # Parse command-line arguments + usage = "%prog <input_file> <output_file>" + opts = optparse.OptionParser(usage) + options, args = opts.parse_args() + if len(args) != 2: + opts.error("Incorrect number of arguments") + infilename, outfilename = args + # Read input + f = open(infilename, "rb") + srcdata = f.read() + f.close() + # Update + outdata = bytearray(srcdata) + outdata[FLAG_OFFSET] = 0x01 # change ET_EXEC to ET_REL + # Write output + f = open(outfilename, "wb") + f.write(outdata) + f.close() + +if __name__ == '__main__': + main() -- 2.26.2

1 1

[PATCH] virtio-scsi: fix boot prio detection by using correct lun
by Stefan Reiter 27 Jul '20

27 Jul '20

Commits d6bdb85eb0 virtio-scsi: skip initializing non-bootable devices f82e82a5ab2 virtio-mmio: add support for scsi devices. both use the lun value from tmpl_drv, which is always 0, instead of the correct one passed as a seperate parameter. This causes systems where LUNs other than 0 are set as bootable, but 0 is not, to not boot. Signed-off-by: Stefan Reiter <s.reiter(a)proxmox.com> --- src/hw/virtio-scsi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/hw/virtio-scsi.c b/src/hw/virtio-scsi.c index 59f1c65..369c981 100644 --- a/src/hw/virtio-scsi.c +++ b/src/hw/virtio-scsi.c @@ -126,14 +126,14 @@ virtio_scsi_add_lun(u32 lun, struct drive_s *tmpl_drv) int prio = -1; if (tmpl_vlun->pci) - prio = bootprio_find_scsi_device(tmpl_vlun->pci, tmpl_vlun->target, tmpl_vlun->lun); + prio = bootprio_find_scsi_device(tmpl_vlun->pci, tmpl_vlun->target, lun); if (tmpl_vlun->mmio) - prio = bootprio_find_scsi_mmio_device(tmpl_vlun->mmio, tmpl_vlun->target, tmpl_vlun->lun); + prio = bootprio_find_scsi_mmio_device(tmpl_vlun->mmio, tmpl_vlun->target, lun); if (skip_nonbootable && prio < 0) { dprintf(1, "skipping init of a non-bootable virtio-scsi dev at %s," " target %d, lun %d\n", - tmpl_vlun->name, tmpl_vlun->target, tmpl_vlun->lun); + tmpl_vlun->name, tmpl_vlun->target, lun); return -1; } -- 2.20.1

2 1

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS