November 2017 - SeaBIOS - mail.coreboot.org

[PATCH] tpm: Add support for TPM2 ACPI table
by Stefan Berger Nov. 15, 2017

Nov. 15, 2017

Add support for the TPM2 ACPI table. If we find it and its of the appropriate size, we can get the log_area_start_address and log_area_minimum_size from it. The latest version of the spec can be found here: https://trustedcomputinggroup.org/tcg-acpi-specification/ Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- src/std/acpi.h | 13 +++++++++++++ src/tcgbios.c | 52 +++++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 54 insertions(+), 11 deletions(-) diff --git a/src/std/acpi.h b/src/std/acpi.h index c2ea707..c01fa7b 100644 --- a/src/std/acpi.h +++ b/src/std/acpi.h @@ -307,4 +307,17 @@ struct tcpa_descriptor_rev2 #define TCPA_ACPI_CLASS_CLIENT 0 #define TCPA_ACPI_CLASS_SERVER 1 +#define TPM2_SIGNATURE 0x324D5054 +struct tpm2_descriptor_rev2 +{ + ACPI_TABLE_HEADER_DEF + u16 platform_class; + u16 reserved; + u64 address_of_control_area; + u32 start_method; + u8 start_method_params[12]; + u32 log_area_minimum_length; + u64 log_area_start_address; +} PACKED; + #endif // acpi.h diff --git a/src/tcgbios.c b/src/tcgbios.c index 151707b..9348a23 100644 --- a/src/tcgbios.c +++ b/src/tcgbios.c @@ -48,15 +48,9 @@ struct { u8 * log_area_last_entry; } tpm_state VARLOW; -static int -tpm_tcpa_probe(void) +static int tpm_set_log_area(u8 *log_area_start_address, + u32 log_area_minimum_length) { - struct tcpa_descriptor_rev2 *tcpa = find_acpi_table(TCPA_SIGNATURE); - if (!tcpa) - return -1; - - u8 *log_area_start_address = (u8*)(long)tcpa->log_area_start_address; - u32 log_area_minimum_length = tcpa->log_area_minimum_length; if (!log_area_start_address || !log_area_minimum_length) return -1; @@ -69,6 +63,39 @@ tpm_tcpa_probe(void) return 0; } +static int +tpm_tcpa_probe(void) +{ + struct tcpa_descriptor_rev2 *tcpa = find_acpi_table(TCPA_SIGNATURE); + if (!tcpa) + return -1; + + dprintf(DEBUG_tcg, "TCGBIOS: TCPA: LASA = %p, LAML = %u\n", + (u8 *)(long)tcpa->log_area_start_address, + tcpa->log_area_minimum_length); + + return tpm_set_log_area((u8*)(long)tcpa->log_area_start_address, + tcpa->log_area_minimum_length); +} + +static int +tpm_tpm2_probe(void) +{ + struct tpm2_descriptor_rev2 *tpm2 = find_acpi_table(TPM2_SIGNATURE); + if (!tpm2) + return -1; + + if (tpm2->length < 76) + return -1; + + dprintf(DEBUG_tcg, "TCGBIOS: TPM2: LASA = %p, LAML = %u\n", + (u8 *)(long)tpm2->log_area_start_address, + tpm2->log_area_minimum_length); + + return tpm_set_log_area((u8*)(long)tpm2->log_area_start_address, + tpm2->log_area_minimum_length); +} + /* * Extend the ACPI log with the given entry by copying the * entry data into the log. @@ -949,9 +976,12 @@ tpm_setup(void) "TCGBIOS: Detected a TPM %s.\n", (TPM_version == TPM_VERSION_1_2) ? "1.2" : "2"); - int ret = tpm_tcpa_probe(); - if (ret) - return; + int ret = tpm_tpm2_probe(); + if (ret) { + ret = tpm_tcpa_probe(); + if (ret) + return; + } TPM_working = 1; -- 2.5.5

2 1

[RFC] paravirt: Only enable sercon in NOGRAPHIC mode if no other console specified
by Kevin O'Connor Nov. 15, 2017

Nov. 15, 2017

Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- I wonder if it would be better to only enable sercon with 0x3f8 in the nographic case if QEMU has neither specified a sercon-port and has not requested sgabios to be loaded. This is just an idea. -Kevin --- src/fw/paravirt.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/fw/paravirt.c b/src/fw/paravirt.c index 9674ab8..0770c47 100644 --- a/src/fw/paravirt.c +++ b/src/fw/paravirt.c @@ -513,12 +513,6 @@ qemu_cfg_legacy(void) qemu_romfile_add("etc/irq0-override", QEMU_CFG_IRQ0_OVERRIDE, 0, 1); qemu_romfile_add("etc/max-cpus", QEMU_CFG_MAX_CPUS, 0, 2); - // serial console - u16 nogfx = 0; - qemu_cfg_read_entry(&nogfx, QEMU_CFG_NOGRAPHIC, sizeof(nogfx)); - if (nogfx) - const_romfile_add_int("etc/sercon-port", PORT_SERIAL1); - // NUMA data u64 numacount; qemu_cfg_read_entry(&numacount, QEMU_CFG_NUMA, sizeof(numacount)); @@ -620,4 +614,11 @@ void qemu_cfg_init(void) acpi_pm_base = 0x0600; dprintf(1, "Moving pm_base to 0x%x\n", acpi_pm_base); } + + // serial console + u16 nogfx = 0; + qemu_cfg_read_entry(&nogfx, QEMU_CFG_NOGRAPHIC, sizeof(nogfx)); + if (nogfx && !romfile_find("etc/sercon-port") + && !romfile_find("vgaroms/sgabios.bin")) + const_romfile_add_int("etc/sercon-port", PORT_SERIAL1); } -- 2.9.5

2 2

Deprecating gcc older than v4.6
by Kevin O'Connor Nov. 10, 2017

Nov. 10, 2017

Hi, During the final v1.11.0 release tests I found that both gcc v3.4 and gcc v4.4 (at least as shipped with Fedora 13) will no longer successfully compile SeaBIOS. The two different gcc versions failed on two different errors. Instead of trying to keep the code compatible with these old compilers I went forward with the release as is. I don't think there is a compelling reason to continue to support these old versions of gcc. The gcc v4.6.0 (at least as shipped on Fedora 15) continues to build SeaBIOS successfully. -Kevin

1 0

[PATCH] docs: Add sercon-port to Runtime_config.md documentation
by Kevin O'Connor Nov. 10, 2017

Nov. 10, 2017

Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- docs/Runtime_config.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Runtime_config.md b/docs/Runtime_config.md index 5171296..6747e2a 100644 --- a/docs/Runtime_config.md +++ b/docs/Runtime_config.md @@ -185,6 +185,7 @@ There are several additional configuration options available in the | s3-resume-vga-init | Set this to a non-zero value to instruct SeaBIOS to run the vga rom on an S3 resume. | screen-and-debug | Set this to a zero value to instruct SeaBIOS to not write characters it sends to the screen to the debug ports. This can be useful when using sgabios. | advertise-serial-debug-port | If using a serial debug port, one can set this file to a zero value to prevent SeaBIOS from listing that serial port as available for operating system use. This can be useful when running old DOS programs that are known to reset the baud rate of all advertised serial ports. +| sercon-port | Set this to the IO address of a serial port to enable SeaBIOS' VGA adapter emulation on the given serial port. | floppy0 | Set this to the type of the first floppy drive in the system (only type 4 for 3.5 inch drives is supported). | floppy1 | The type of the second floppy drive in the system. See the description of **floppy0** for more info. | threads | By default, SeaBIOS will parallelize hardware initialization during bootup to reduce boot time. Multiple hardware devices can be initialized in parallel between vga initialization and option rom initialization. One can set this file to a value of zero to force hardware initialization to run serially. Alternatively, one can set this file to 2 to enable early hardware initialization that runs in parallel with vga, option rom initialization, and the boot menu. -- 2.9.5

1 0

[ANNOUNCE] SeaBIOS 1.11.0
by Kevin O'Connor Nov. 10, 2017

Nov. 10, 2017

The 1.11.0 version of SeaBIOS has now been released. For more information on the release, please see: http://seabios.org/Releases New in this release: * Initial support for NVME drives * Support for vga emulation over a serial port in SeaBIOS (sercon) * Support for serial debugging using MMIO based serial ports * Support for scsi devices with multiple LUNs * Support for boot-to-boot persistent coreboot cbmem logs * Improved coreboot vga (cbvga) mode setting compatibility * Several bug fixes and code cleanups For information on obtaining SeaBIOS, please see: http://seabios.org/Download ===== git shortlog -n rel-1.10.0..rel-1.11.0 ===== Kevin O'Connor (28): usb: Make usb_time_sigatt variable static tpm: Add comment banners to tcg.c separating major parts of spec tpm: Don't call tpm_set_failure() from tpm12_get_capability() tpm: Move code around in tcgbios.c to keep like code together acpi: Generalize find_fadt() and find_tcpa_by_rsdp() into find_acpi_table() tpm: Don't call tpm_build_and_send_cmd() from tpm20_stirrandom() tpm: Rework tpm_build_and_send_cmd() into tpm_simple_cmd() ps2port: Disable keyboard/mouse prior to resetting ps2 controller docs: Note release dates for 1.10.1 and 1.10.2 resume: Don't attempt to use generic reboot mechanisms on QEMU boot: Increase description size in boot menu src: Minor - remove tab characters that slipped into SeaBIOS C code NVMe: Allow NVMe to be enabled on real hardware smm: Backup and restore A20 on an SMI based mode switch stacks: Make sure to initialize Call16Data stacks: Don't update the A20 settings if they haven't changed stacks: There is no need to disable NMI if it is already disabled vga: Fix bug in stdvga_get_linesize() docs: Fix typos in Memory_Model.md tcgbios: Fix use of unitialized variable boot: Rename drive_g to drive disk: Don't require the 'struct drive_s' to be in the f-segment block: Rename disk_op_s->drive_gf to drive_fl virtio: Allocate drive_s storage in low memory xhci: Build TRBs directly in xhci_trb_queue() xhci: Verify the device is still present in xhci_cmd_submit() timer: Avoid integer overflows in usec and nsec calculations docs: Note v1.11.0 release Roman Kagan (11): blockcmd: accept only disks and CD-ROMs blockcmd: generic SCSI luns enumeration virtio-scsi: enumerate luns with REPORT LUNS esp-scsi: enumerate luns with REPORT LUNS usb-uas: enumerate luns with REPORT LUNS pvscsi: fix the comment about lun enumeration mpt-scsi: try to enumerate luns with REPORT LUNS lsi-scsi: reset in case of a serious problem lsi-scsi: try to enumerate luns with REPORT LUNS blockcmd: start REPORT_LUNS with the smallest buffer Revert "lsi-scsi: reset in case of a serious problem" Gerd Hoffmann (8): usb: add hub portmap usb-xhci: use hub portmap std: add cp437 to unicode map kbd: make enqueue_key public, add ascii_to_keycode romfile: add support for constant files. paravirt: serial console configuration. add serial console support sercon: Disable ScreenAndDebug in case both serial console and serial debug are active Ben Warren (5): QEMU DMA: Add DMA write capability romfile-loader: Switch to using named structs QEMU fw_cfg: Add command to write back address of file QEMU fw_cfg: Add functions for accessing files by key QEMU fw_cfg: Write fw_cfg back on S3 resume Daniel Verkamp (5): nvme: support NVMe 1.0 controllers nvme: extend command timeout to 5 seconds nvme: fix reversed loop condition in cmd_readwrite nvme: fix extraction of status code bits nvme: fix copy-paste mistake in comment Patrick Rudolph (4): SeaVGABios/cbvga: Advertise correct pixel format SeaVGABIOS/vbe: Query driver for scanline pitch v2 SeaVGABios/cbvga: Use active mode to clear screen SeaVGABios/cbvga: Advertise compatible VESA modes Aleksandr Bezzubikov (3): pci: refactor pci_find_capapibilty to get bdf as the first argument instead of the whole pci_device pci: add QEMU-specific PCI capability structure pci: enable RedHat PCI bridges to reserve additional resources on PCI init Julian Stecklina (2): block: add NVMe boot support nvme: fix out of memory behavior Filippo Sironi (1): nvme: Use the Maximum Queue Entries Supported (MQES) to initialize I/O queues Igor Mammedov (1): drop "etc/boot-cpus" fw_cfg file and reuse legacy QEMU_CFG_NB_CPUS Jason Wang (1): virtio: IOMMU support Julius Werner (1): coreboot: Adapt to upstream CBMEM console changes Ladi Prosek (1): ahci: Set upper 32-bit registers to zero Paul Menzel (1): vgasrc: Increase debug level Petr Berky (1): config: Add function to check if fw_cfg exists Ricardo Ribalda Delgado (1): serialio: Support for mmap serial ports Stefan Berger (1): tpm: Log TPM 2 digest structure in little endian format Youness Alaoui (1): nvme: Enable NVMe support for non-qemu hardware Zeh, Werner (1): ahci: Disable Native Command Queueing

1 0

[PATCH seabios 0/3] add kvmtool support
by Gerd Hoffmann Nov. 6, 2017

Nov. 6, 2017

Hi, The 1.11 seabios release which is just around the corner brings serial console support to seabios. Which is useful for kvmtool too. So I decided to undust my old kvmtool support patch series and check out where we stand. Patch #1 adds the config option, wires up everything and adds ram detection for kvmtool. Patches #2 and #3 tweak the seabios virtio drivers so they work with kvmtool. With that in place seabios works nicely. Loads grub from hard disk, allows to edit menu entries, loads and runs the linux kernel. But there are also some known issues: (1) ram detection is clumpsy (see patch #1) due to kvmtool not passing ram information to the firmware (on x86, seems other platforms use the device tree for that). (2) kvmtool virtio implementation seems to have some bugs. specifically handing over the virtio-blk devices from seabios to the linux kernel doesn't work (see patch #3). (3) when kernels are booted via seabios+grub all the command line args kvmtool adds to the kernel command line on direct kernel boot will not be passed to the kernel. Not sure how much of a problem that is in practice, due to (2) I didn't yet manage to boot a linux guest to the login prompt. cheers, Gerd Gerd Hoffmann (3): kvmtool: initial support kvmtool: allow mmio for legacy bar 0 kvmtool: support larger virtio queues Makefile | 1 + src/fw/paravirt.h | 3 +++ src/hw/virtio-ring.h | 2 +- src/fw/paravirt.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ src/hw/virtio-pci.c | 16 ++++++++++++---- src/post.c | 4 +++- src/sercon.c | 2 ++ src/Kconfig | 23 +++++++++++++++++++++-- 8 files changed, 91 insertions(+), 8 deletions(-) -- 2.9.3

2 7

seabios serial console vs. sgabios
by Gerd Hoffmann Nov. 6, 2017

Nov. 6, 2017

Hi, One problem we have with the serial console support in seabios and sgabios: It can happen that both are activated. We'll go fix that in qemu, but that'll work for new qemu versions only, not for the old already released ones. So I think it would be useful if seabios makes sure sgabios and serial console are not both active at the same time, i.e. in case we find "vgaroms/sgabios.bin" being present either turn off builtin serial console, or don't load sgabios (and possibly also enable builtin serial console). Comments? cheers, Gerd

5 7

[PATCH] Ignore sgabios rom in case sercon is enabled.
by Gerd Hoffmann Nov. 4, 2017

Nov. 4, 2017

We don't want them both be active. Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com> --- src/optionroms.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/optionroms.c b/src/optionroms.c index 092393a56c..a5ecd4cd11 100644 --- a/src/optionroms.c +++ b/src/optionroms.c @@ -193,6 +193,11 @@ run_file_roms(const char *prefix, int isvga, u64 *sources) file = romfile_findprefix(prefix, file); if (!file) break; + if (strcmp(file->name, "vgaroms/sgabios.bin") == 0 && + CONFIG_SERCON && romfile_loadint("etc/sercon-port", 0)) { + dprintf(1, "sercon: is enabled, not loading sgabios rom.\n"); + continue; + } struct rom_header *rom = deploy_romfile(file); if (rom) { setRomSource(sources, rom, (u32)file); -- 2.9.3

3 2

[PATCH] Disable ScreenAndDebug in case both serial console and serial debug are active
by Gerd Hoffmann Nov. 3, 2017

Nov. 3, 2017

Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com> --- src/sercon.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/sercon.c b/src/sercon.c index 0b7722ec08..72ebf82452 100644 --- a/src/sercon.c +++ b/src/sercon.c @@ -523,6 +523,10 @@ void sercon_setup(void) return; dprintf(1, "sercon: using ioport 0x%x\n", addr); + if (CONFIG_DEBUG_SERIAL) + if (addr == CONFIG_DEBUG_SERIAL_PORT) + ScreenAndDebug = 0; + vgabios = GET_IVT(0x10); seabios = FUNC16(entry_10); if (vgabios.seg != seabios.seg || -- 2.9.3

2 1

[PATCH] Increase precision of usec timer calculation
by Stefan Berger Nov. 2, 2017

Nov. 2, 2017

When timer_calc_usec() is used with large timeout falues, such as 60s, the function lacks precision and produces different results than when using timer_calc(time / 1000) for the same timeout. This patch fixes the precision issue by falling back to timer_calc(time / 1000) for usec values over one second. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- src/hw/timer.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/hw/timer.c b/src/hw/timer.c index 03d22b2..2f0c864 100644 --- a/src/hw/timer.c +++ b/src/hw/timer.c @@ -213,6 +213,8 @@ timer_calc(u32 msecs) u32 timer_calc_usec(u32 usecs) { + if (usecs > 1000000) + return timer_calc(usecs / 1000); return timer_read() + DIV_ROUND_UP(GET_GLOBAL(TimerKHz) * usecs, 1000); } -- 2.5.5

2 4